From patchwork Wed Mar 14 05:41:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 7967 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1604968jad; Tue, 13 Mar 2018 22:42:04 -0700 (PDT) X-Google-Smtp-Source: AG47ELtdFp4tuSKt8lr7oaede4zMvkFjYMD5AHoQ2ZWverFUJKxvpW922qpXnFQAPgvnMToEua8I X-Received: by 10.223.195.142 with SMTP id p14mr575025wrf.263.1521006123999; Tue, 13 Mar 2018 22:42:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521006123; cv=none; d=google.com; s=arc-20160816; b=KivP1fkH/as2sS2eDFgTQTbpPAG7arUNxqInYLA1HGa5ZOjgAM2mCvYPRGKgynZdng g44BAQHyYBYF900T2FPKo9iD21zyeh5XEfO7k/CzquiDzzrMlI4lSrJr8It4FgK6scYW L6/3Li8yFIuuzgzBQW3YALhiOtCwntcpLbDVZeQrFONCZS+ERFKxZuWfhsGYl63nk8C/ kHY69Q7TAPhooXc5ZpsGFzOZp8bqhx8gDlt2IBm7LkLdq/XBdM56pjY+dMRsAW+P3xfv yhTEmuutiSrbKbv74xSaiZRB0Gmmr1po6swqrhuhKBy7+9u1fLhMrzki3FQe8wg6ana1 zVYA== 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=FHCYWvTQN4yrwiOI1qb+M1u9yoWcOooqS2xGCGDpNiE=; b=rjr49GigztdqpP0SnvABnnpa9Ag15ael4RsOoiTiWevq9YRL4ocNqw2MpADn0B/Sky 1l/DH+nz5JnqWGmrJUfpjhUFkatkd9E0gTz1/icmaf6FgtUC8xyC8P/5i1CgSJtSWtX7 cUuG7Nk4ZSSLBcnUXbOjjDQxeMZqPuVKEDhEtD/HqUpIIkjbOyrm9MDxvnQ4U5xavUwo yP0Nt04XdxFfV26N9ICYuLHaEEGXL1OaXlm5KYXijPLuX0GsvvUOtphc2UV/J7rpvCn1 McXq76kXviskuvB2E0xyeVt0IKpaOSv1/zJJnGngOzDgjbabkivDAWbcY59FjPVsmVGQ Jmag== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=jbZpPP8n; 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 y27si1248072wrd.117.2018.03.13.22.42.03; Tue, 13 Mar 2018 22:42:03 -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=jbZpPP8n; 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 1839668A036; Wed, 14 Mar 2018 07:41:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f45.google.com (mail-pl0-f45.google.com [209.85.160.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 14396689BC3 for ; Wed, 14 Mar 2018 07:41:45 +0200 (EET) Received: by mail-pl0-f45.google.com with SMTP id v9-v6so1161878plp.12 for ; Tue, 13 Mar 2018 22:41:56 -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=qnY5orgeN6S632lANiin/XPja0LWaWbUcXjIabvDCiw=; b=jbZpPP8nbbxczXBFFHFXo2uN5pgemATlSwSoJor1SK1rpogZRIBAydrJTJmBNl1wij 5bSUr7FOIrSuwd2/ZSw/c2IHWLkW4Ih1Bv7IUPl8SAZZhXYDzTxlj0gw5VOVXyFxcjyL Kr4Wj5ApLG/MU67nm+03goPp5tx6MrPTlCiQz+HP40PjY6XoeAUGoOAyxX9jD++H2kJ2 WGSrTtDa4wkMkot0gXkzlLc0BaHShABZdTBhFx6l2fDU59Fg6Ux7vdv5bignF6rnclHB 0V0SJ9LChWya/IhDcwCPJCmpXcdwHiGW5xlekNwERfwOn1Fio95jQppA5gUeQM+HXVfZ QLhA== 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=qnY5orgeN6S632lANiin/XPja0LWaWbUcXjIabvDCiw=; b=NaWvUm3p+HwY2kexJYyBDw5ON7ItLyOBtviTpKniUcgZ2jJkwMq5w+hiXsTPVb3185 LjVofDtTZUdOwXNH1NdSE8CBU/iAoZZzKdUhWPcvScYeIvtGOesyCiSgOucYwMqGCfXL rRCAjR6Qm8RDrIY0oHis75GHQRxIE2pRzSABqeD31VOkD+4LvhCvQPtLmM86K2Kv2azy G8Ewu9MYBUNtRWGPYIQLRxM+wGA7zncurGrb5wfg4rkGcjDwNZlmunvkG0/fj0dWMwFM dzMPvFOakB83UKMSi5d8TaRgMHfPZlbxil17JH7TarRcJX94IncxUMGWKqGcLoqRH8LJ W9pg== X-Gm-Message-State: AElRT7FaJfr/h2hY3X2cgVlEQgSzEL0vdGFCq20eYNjM+MqUEeH1qf25 rYMeI8hligfe9WW6fW3hbws= X-Received: by 2002:a17:902:ab88:: with SMTP id f8-v6mr2890989plr.325.1521006115082; Tue, 13 Mar 2018 22:41:55 -0700 (PDT) Received: from [10.67.68.21] ([192.55.54.42]) by smtp.gmail.com with ESMTPSA id w88sm3332375pfa.50.2018.03.13.22.41.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Mar 2018 22:41:54 -0700 (PDT) To: FFmpeg development discussions and patches , Michael Niedermayer From: Jun Zhao Message-ID: Date: Wed, 14 Mar 2018 13:41:52 +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 V3 03/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 6b8f199d0028afb3f0a6a10275e4055ddce91a6a Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Thu, 8 Mar 2018 13:50:31 +0800 Subject: [PATCH V3 03/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); } }