From patchwork Wed Jul 18 18:57:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 9752 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp869160jad; Wed, 18 Jul 2018 11:57:48 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdqOQMPu2aMi6TgqvdVv6QLmkGB12dRmiTpsG72vsXO3Q9lyMD3SAjVfltMvCbQlMDSb4PX X-Received: by 2002:a1c:838a:: with SMTP id f132-v6mr2402990wmd.127.1531940268303; Wed, 18 Jul 2018 11:57:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531940268; cv=none; d=google.com; s=arc-20160816; b=A4VxOriGVf3fnSYX/0/ctUwglTiLdMVepraQOW7BoRqfpogvGGFXrffwKrEPH93mPr 2csT0Gi2jwV6t178pC0sFtOvOKug4qMeTFc9oVdRBPDBY9Zs35D2YkD6nhlE7SMnXcQQ D4UHIglaSm1moJozatpkgUfRxU9XQIvDSJWVM0/lW2I5IvmZQ+bG5Z4jgvcksA0Dr1mk oZXOgR81KOLMD6fijJCIN+DbvPJAO/Gyhs2wv9FW8v5xOJfO0tbWxu+6RY0odVDEOB8k PZnim2tEK1hRxnJp4st+gdaU5gwi88hct/VHq3PwOJIlxVdQfYYvpTILEBTrDG4POBy0 9JZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=nBIXk4HEm8dUcb2Ko/+Pdq8mZWcSQIaUw8b3eAPWlAQ=; b=PrbqHt+JHQusWsoVWqWbaMVdnc4+mLHv6qJWIp4EsY3zViUEzzJ9O9YtUXgYdZEG+i NsNzOP50tCdcE0W1k1T+MDmuQXO1zGTbE0s0ZXtyvexFOss/Ml7fYoAsQLR+COAVIDxM 0gUCf1uXx8YB9diFERTub6ADvYblAGLpqOMzzd4EvuOjqxSwuIajPbW8o54Bw0Hp6XDM Ayc0V/UiJe+e+qDNGXQhuhgpSASNrmh2k1sO8tSoCss0iowRAU+jOFeyC9YaUX5G6WTD BKMSOA3K3nt5ODrxUxqfP7jkDK6z3UEVLO5LZI8Z/WzdhFvoI6amdZ+CSCwvjN+mLWUH iH9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=xQt8dWXW; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c18-v6si1878699wmb.117.2018.07.18.11.57.47; Wed, 18 Jul 2018 11:57:48 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=xQt8dWXW; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D76436879A0; Wed, 18 Jul 2018 21:57:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E2CEA680494 for ; Wed, 18 Jul 2018 21:57:29 +0300 (EEST) Received: by mail-pg1-f178.google.com with SMTP id g2-v6so2409506pgs.6 for ; Wed, 18 Jul 2018 11:57:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id; bh=aFYa9Lz6HqB570Oo9KC85Yfh2P+dPjb6elwgd3ottHg=; b=xQt8dWXWSUVAo+zwwZviP4hTabGL4NYT+S2vtq2iYWH2/7y5PEvDl/ce3PnylVHYsJ uRbGTax/j7oBAk9J5DHO9TeSvlg6ZCs+6kUS0BiZVHgnolkN13WGpHSsXPwhGtocL1Sf +9ELoGt0lxuNo7zKDIi6iyunFOkSdZOpR7tE9QEOIX96G1FiqVoXBC/tvF+qYR7cTq3s ewp0V3OOM67pF7nACNYny5tAJC+uhOZ5pYpUhK2JcOOQvfuMBmf0qmp9ow42yfcz+m0y V0R4DhV/AOgPh0xPOo0VlnxjYa87MGvL/wo0WRuJELFvIn0N3EMDG/47PDfZyWOOFae3 nfnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=aFYa9Lz6HqB570Oo9KC85Yfh2P+dPjb6elwgd3ottHg=; b=toHkjiG2artSNB4ec7HHz6gEY9DE6KhTH0h1cLBWQXKHPZQJfsrYjOrQM6s/vFK6ZL 7rQmy0MV6Lonf52URyhE+92/BD2v76ii/RZgT5IDG+TqAA4H/oV4L/EYsXH1rZMAUg2O cg6SGfkx4RjWNyabvseWjKmB+AR9ShxDpMeeMnq1Nc36p+q4qQQbaFnvL6yqkyHY7A8p WJbR2P3SHjpHLU/hGnVZnTaEI9nO7vnhcyRqYBzcoOZ8YyQ1dSxwcm1L377MncmjRK5q gqBmgC+HXYZqBNc0E1D8YUeqocb58E6FvCrBPPgiukGdaoZG7Wv4bK0nesU5ll/Jj4xy ryUA== X-Gm-Message-State: AOUpUlG2jIxfcX21YvzcxDFpijB15v0ggICw0tVLaNQ1fuD+hU3gVuDJ V68zvqdnJGFB3fWGaLvn0SY4Mu7l X-Received: by 2002:a62:11c4:: with SMTP id 65-v6mr6402136pfr.54.1531940259162; Wed, 18 Jul 2018 11:57:39 -0700 (PDT) Received: from localhost.localdomain (c-69-181-54-242.hsd1.ca.comcast.net. [69.181.54.242]) by smtp.gmail.com with ESMTPSA id t63-v6sm6237854pgt.57.2018.07.18.11.57.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Jul 2018 11:57:38 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 Jul 2018 11:57:24 -0700 Message-Id: <20180718185724.10578-1-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.14.2 Subject: [FFmpeg-devel] [PATCH] avcodec: parse options from AVCodec.bsfs X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Aman Gupta MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta Fixes a bug that would prevent using multiple comma-separated filters, and allows options to be passed to each filter. Based on similar loop in ffmpeg_opt.c's new_output_stream(). Signed-off-by: Aman Gupta --- libavcodec/decode.c | 47 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 6a3a4df179..67b7443b9d 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -36,6 +36,7 @@ #include "libavutil/imgutils.h" #include "libavutil/internal.h" #include "libavutil/intmath.h" +#include "libavutil/opt.h" #include "avcodec.h" #include "bytestream.h" @@ -195,27 +196,33 @@ static int bsfs_init(AVCodecContext *avctx) while (bsfs_str && *bsfs_str) { AVBSFContext **tmp; const AVBitStreamFilter *filter; - char *bsf; + char *bsf, *bsf_options_str, *bsf_name; bsf = av_get_token(&bsfs_str, ","); if (!bsf) { ret = AVERROR(ENOMEM); goto fail; } + bsf_name = av_strtok(bsf, "=", &bsf_options_str); + if (!bsf_name) { + av_freep(&bsf); + ret = AVERROR(ENOMEM); + goto fail; + } - filter = av_bsf_get_by_name(bsf); + filter = av_bsf_get_by_name(bsf_name); if (!filter) { av_log(avctx, AV_LOG_ERROR, "A non-existing bitstream filter %s " "requested by a decoder. This is a bug, please report it.\n", - bsf); - ret = AVERROR_BUG; + bsf_name); av_freep(&bsf); + ret = AVERROR_BUG; goto fail; } - av_freep(&bsf); tmp = av_realloc_array(s->bsfs, s->nb_bsfs + 1, sizeof(*s->bsfs)); if (!tmp) { + av_freep(&bsf); ret = AVERROR(ENOMEM); goto fail; } @@ -223,8 +230,10 @@ static int bsfs_init(AVCodecContext *avctx) s->nb_bsfs++; ret = av_bsf_alloc(filter, &s->bsfs[s->nb_bsfs - 1]); - if (ret < 0) + if (ret < 0) { + av_freep(&bsf); goto fail; + } if (s->nb_bsfs == 1) { /* We do not currently have an API for passing the input timebase into decoders, @@ -238,12 +247,36 @@ static int bsfs_init(AVCodecContext *avctx) ret = avcodec_parameters_copy(s->bsfs[s->nb_bsfs - 1]->par_in, s->bsfs[s->nb_bsfs - 2]->par_out); } - if (ret < 0) + if (ret < 0) { + av_freep(&bsf); goto fail; + } + + if (bsf_options_str && filter->priv_class) { + const AVOption *opt = av_opt_next(s->bsfs[s->nb_bsfs - 1]->priv_data, NULL); + const char * shorthand[2] = {NULL}; + + if (opt) + shorthand[0] = opt->name; + + ret = av_opt_set_from_string(s->bsfs[s->nb_bsfs - 1]->priv_data, bsf_options_str, shorthand, "=", ":"); + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid options for bitstream filter %s " + "requested by the decoder. This is a bug, please report it.\n", + bsf_name); + av_freep(&bsf); + ret = AVERROR_BUG; + goto fail; + } + } + av_freep(&bsf); ret = av_bsf_init(s->bsfs[s->nb_bsfs - 1]); if (ret < 0) goto fail; + + if (*bsfs_str) + bsfs_str++; } return 0;