From patchwork Mon Mar 12 01:23:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 7928 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1070384jad; Sun, 11 Mar 2018 18:23:26 -0700 (PDT) X-Google-Smtp-Source: AG47ELssbKBy15mfwkgJbyxiFVEj8HMzsgrqRJJM4tkxgGSL6oItXpu3tHpNnirDfqDyOj464WSQ X-Received: by 10.223.138.203 with SMTP id z11mr4574815wrz.199.1520817806544; Sun, 11 Mar 2018 18:23:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520817806; cv=none; d=google.com; s=arc-20160816; b=J934q8KxcExPFFn+Xg98YuYzHV0evMGHHa8bmstiKGbIqQh+2QMzCj2y0CMDVTdpAI EUMDTnu1SdsrQksO75LmSo7l8ss/BOGwyfCAWahG1rVoN1MNGxEUXR4suTfSAEjIDSAP XG1PTV1Wc6DduWyNYcvMs0TVwGCbg9nOG5bRs8D48CazuOFuG+RnqZknWJfuWgyJurEP sSZBshRvTEVn4nPgVUuYokUkjUF6fgHGWoX70tpr+QER7tUYR4PBHHIGLGr6crlRf1dB 1GQiWyGopyW3YVChmKH33l3nhTZeCsUNwzRguOSnU8sBOgwQDKIVGR5Tlm8/wAC4QwUr bXMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:mime-version:user-agent:date:message-id:from:to :dkim-signature:delivered-to:arc-authentication-results; bh=I1h7H9DKYX6Hk5dIX7u4FipPNfNVIJTyPuM0K+T4Ycg=; b=Q5mGm1CVJqPKNH57rzk+rfh548tWemismQbFo8NrPgxCsqRE1vsMSEABS5I+zb6wLd BawgdRIFXjl8USyObjqReZqih0Tg0m1ECQlcJsPW87msX8KrEwUewLRiAkwKMlE7yZlN yqr7Jm128ZEnXQWOGMoHmk9HbpNmpHXNWoW4Fzz8CObcuTJlWb+sY8oweD9QXsGWyU0P WLgOZd0Be0ssXJDrsqjWTv0IcQfqQbrJf5v90k4Om3qGhVEmpx2brvGIGyotoYuJMWmO JPxeYvCt5/xDZVLNwRfC3HRUcETPhLDaq3NcXsWgkiect8ymFCNdBXWVizvwNDXR2CFy Paig== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=CQx3A22t; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l11si4643904wrf.365.2018.03.11.18.23.26; Sun, 11 Mar 2018 18:23:26 -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=@gmail.com header.s=20161025 header.b=CQx3A22t; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DE32068A3AB; Mon, 12 Mar 2018 03:23:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f41.google.com (mail-pl0-f41.google.com [209.85.160.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 289A868A1D8 for ; Mon, 12 Mar 2018 03:23:07 +0200 (EET) Received: by mail-pl0-f41.google.com with SMTP id w12-v6so8447059plp.4 for ; Sun, 11 Mar 2018 18:23:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=rdR1sCbC/T2zYpzi1PDdGX2SGSCNx64CpVjUhrAxJqg=; b=CQx3A22tTsg6SVIuf6f3SUVwEdZyyZC/EjbduIHYFWRtAEPNUM1kDQGgQzCS23kCYt 2Rp3yjfoLWFjHSXuos+vN6U3umyns3YrpyDyEbU+yvg0MYtyRwdLmaDMPw++K2nBfeH8 aJBfGvWED5f8l7yvGtLSgVl4HLkUvGaVcxgJDdADId6XWe+ouNwrpGRf6nStDC0tjPsq UkS65MpEm7+NDsKaKlxLoKCTk4VbstYBL4Dzf9IcybjFwbiUUbMK1hDqH+56mlvSDjw/ ohWPyPZQetJjC/1/cnHPQdLoYs8NO6pvT/0ihigmmPvs53qFeB8Dw46UUpnHU3b3MUAZ lNdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=rdR1sCbC/T2zYpzi1PDdGX2SGSCNx64CpVjUhrAxJqg=; b=LDr1QYuHqwUqrOJcoAFYHgazKBQiHFIJY3KbloFEeugo6v5AgmqgTzbdIRw/Eqiybg m3Tkbsph4cDVKx/uKEfMQPanhs+B2UoWRWX/LxFdn2/XWoC4MUpOYPmwBEq1woW24FRf 28dK+CZdJDONyrnhmEsyoBjroDb2bJs8kfh7F5buk1n+zum9L0pXL/8QF9qS6rYwjkHn yPGnv2QqwZ4Ss+xJ+4hcLO0PugwwTGo4CiproTNnThFHoVl0nhfI23lVhhEzX1XNhlwH bY5ZTBur0SHEiKErLOZfpHVpwR4V9ymAsxx04p541Mx5m1NglFCRIITva9fuUgjRvqR3 T5Eg== X-Gm-Message-State: AElRT7EhYWnHRTa5YLQ0qFtI7qx26B7hLhnsH6OWhR/oNRcObtnjWpdu rJH75qBczhw51UohHRsUtN4= X-Received: by 2002:a17:902:8d87:: with SMTP id v7-v6mr6346403plo.146.1520817796047; Sun, 11 Mar 2018 18:23:16 -0700 (PDT) Received: from [10.67.68.25] ([192.55.54.44]) by smtp.gmail.com with ESMTPSA id 7sm13949751pft.84.2018.03.11.18.23.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Mar 2018 18:23:15 -0700 (PDT) To: FFmpeg development discussions and patches , Michael Niedermayer From: Jun Zhao Message-ID: <2d7a8bd9-9eb5-76bf-0d85-96754de07b88@gmail.com> Date: Mon, 12 Mar 2018 09:23:13 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH V2 02/11] ffmpeg: support dump bit stream filter options. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From 32486e2c95683e1a215f5a4cbec3d4fc01a71e87 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Thu, 8 Mar 2018 13:50:31 +0800 Subject: [PATCH V2 02/11] ffmpeg: support dump bit stream filter options. Support dump bit stream filter option in ffmpeg -h full and ffmpeg -h bsf=FooBar. Signed-off-by: Jun Zhao --- fftools/cmdutils.c | 17 +++++++++++++++++ fftools/ffmpeg_opt.c | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 0c7d13c27a..f9d87f6724 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -1897,6 +1897,21 @@ static void show_help_filter(const char *name) } #endif +static void show_help_bsf(const char *name) +{ + const AVBitStreamFilter *bsf = av_bsf_get_by_name(name); + + if (!bsf) { + av_log(NULL, AV_LOG_ERROR, "Unknown bit stream filter '%s'.\n", name); + return; + } + + printf("Bit stream filter %s\n", bsf->name); + if (bsf->priv_class) + show_help_children(bsf->priv_class, AV_OPT_FLAG_BSF_PARAM); + printf("\n"); +} + int show_help(void *optctx, const char *opt, const char *arg) { char *topic, *par; @@ -1923,6 +1938,8 @@ int show_help(void *optctx, const char *opt, const char *arg) } else if (!strcmp(topic, "filter")) { show_help_filter(par); #endif + } else if (!strcmp(topic, "bsf")) { + show_help_bsf(par); } else { show_help_default(topic, par); } diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 1b591d9695..d7a7eb0662 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -3114,7 +3114,7 @@ void show_help_default(const char *opt, const char *arg) " -h -- print basic options\n" " -h long -- print more options\n" " -h full -- print all options (including all format and codec specific options, very long)\n" - " -h type=name -- print all options for the named decoder/encoder/demuxer/muxer/filter\n" + " -h type=name -- print all options for the named decoder/encoder/demuxer/muxer/filter/bsf\n" " See man %s for detailed description of the options.\n" "\n", program_name); @@ -3159,6 +3159,7 @@ void show_help_default(const char *opt, const char *arg) #endif show_help_children(swr_get_class(), AV_OPT_FLAG_AUDIO_PARAM); show_help_children(avfilter_get_class(), AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_FILTERING_PARAM); + show_help_children(av_bsf_get_class(), AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_BSF_PARAM); } }