From patchwork Thu Mar 8 08:42:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 7863 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.181.170 with SMTP id m39csp544401jaj; Thu, 8 Mar 2018 00:42:45 -0800 (PST) X-Google-Smtp-Source: AG47ELtzlft31HtF2J6omlsAXVPDOe0uGVOMC8iERnnhS+2fNQtaex99H0wy/vXOVgGy+bTesv01 X-Received: by 10.28.168.86 with SMTP id r83mr6479798wme.37.1520498565548; Thu, 08 Mar 2018 00:42:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520498565; cv=none; d=google.com; s=arc-20160816; b=i0QVSzodQN/5VdFujkL97w3nP9EJKJi0Q3Im0jVIhzJZmRgW2tGzrDcRe90anIth69 4dVpqWLgWeV7sHZ3vwubJZ2+taEtHLVEdkyVDRlEqegG07ugVPgJvK5iaiY9+XAwqsca kXCPPUpbZmNpRIvf5SyAqwVHcrqk3Uc4baUZoF3XdBULm58JdHTT2Az8z7fzuOoMq9J4 9F3xPXV4kxGNdWgoY78NjhnTMyAsSAtsqgos1h1wjZa3WS5ki0IEHLUuh80+bgXyZXy3 uCmPM/B/Y4aAFmNJXXaPMpF3SAKx2IWtWUNjQDet2bN6+tRIKIC65BJ8Nue/Khx087ZO VSOA== 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=5XsNMPN3WG0tG+TbKowMLqmI+1hRz7OljjhOFZmnTHY=; b=mXvmkfUasey3izVUPwo9m9abaK1i90cLWmOTKnsuMMwalfmf1cVfp9AeOFPhPIhzBo UDvVaJSs9cYSYdgeYfBsz9aBZSBKd6VoYp9/qIFauI600VMr5YQ4cHQDuOqWK5TW5LR6 0/bleeLOdTI/wJ9zWPPAXGt2Yi7FSTITTbkM7M6Mk+bRbYjMvV0d6lRsxR7JgEZU7Da9 mHQGI3IUz7FqK1GTTOrlF7eaC49xx3xv/ji+Dn8K2R2gSfVUVs0CMvHF4NN1jdWS93Zm wnTA4nKQfV9lPQT5ABxhq4mhKNQ56pYIkMAkAJet/M+dpP7eeWvzSaFyrNj9f0m46LzV 7y2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=AYRpQq3e; 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 j5si1578769wrd.190.2018.03.08.00.42.45; Thu, 08 Mar 2018 00:42:45 -0800 (PST) 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=AYRpQq3e; 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 B002C68A634; Thu, 8 Mar 2018 10:42:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f50.google.com (mail-pl0-f50.google.com [209.85.160.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2181E689C78 for ; Thu, 8 Mar 2018 10:42:29 +0200 (EET) Received: by mail-pl0-f50.google.com with SMTP id u13-v6so2981050plq.1 for ; Thu, 08 Mar 2018 00:42:37 -0800 (PST) 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=xULD22HtW3dMXM9m6WobeAZmOikOdvEyVpP2N9HYjIw=; b=AYRpQq3eBLN/Osx+CS4kz8oFFNOurfPKKB5kpQW+VA+AiNyiQA5R1BlNUu+VUImAt3 AX7A4ziQIiqYxBYlRfxPgCy6gaHQZyoWYsxtBF5M/glfdMAQjyAhnHizNGliIIWs3o13 d2oJKrxNrk7hRtYlGuBS70mb6BnDN9QDqdVCZhOKbE8rq7u/g1ZMZSbiVNgD3mpWlW/G uoq+uZjf3TcIpT8FAbtKbNPZvl3oU+Cie58KLIqfUjn6jTT7g68BrR+7Iy5xweA/AAjO xrkYXfYGojnhebvdL5yvtqHQ/k9gyMrXEYNtDCv443leuZf+SRbtv2YNyGn2+ePhbRHX MgZA== 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=xULD22HtW3dMXM9m6WobeAZmOikOdvEyVpP2N9HYjIw=; b=CgF165KnBlb1khw+x+0WIM8IT4I/w1GmIFoRVRi8fLBgb3H2VaAtek0uhwykvz71KN zN8uQ8VLhoDvNNgTKB+EY0Obf4dyorNtVCDh6SQvA5tQKAI8R2L0+aJOcpvonrR/cN8e jyXctcTnrcjQK4dWNGxbAoDbf0g6fbv7ucDtHLmak+B0qb2Tl6GL6kbRC0Et2Lafc31T 1DfmGwB1zSV9cqMEnu312tXCf+yg5g9N3SfxWQsUP17Lf+HEGEQCyhagtNileMMegqql KKzz3ArmQ8In4nNehEYuCtlN6RoIYy7ahaXQ3652D/V2PV9M2fqAe2Au0rna707kWtyl gXbQ== X-Gm-Message-State: APf1xPALPUuBAGzBjYJ1jolBweYgyNfFpGBfyHUAZGmrfpi8wQ4Krf7D eyygPctksx8fHfsGL/rPr85mIt7C X-Received: by 2002:a17:902:7404:: with SMTP id g4-v6mr23106815pll.235.1520498556425; Thu, 08 Mar 2018 00:42:36 -0800 (PST) Received: from [10.67.68.27] ([192.55.54.40]) by smtp.gmail.com with ESMTPSA id q76sm39646843pfj.149.2018.03.08.00.42.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Mar 2018 00:42:35 -0800 (PST) To: FFmpeg development discussions and patches , Michael Niedermayer From: Jun Zhao Message-ID: <18ee8955-3080-fba5-4c50-e44aa2b08173@gmail.com> Date: Thu, 8 Mar 2018 16:42:32 +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 02/10] 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 c058a02677f7cbba65443db260b21b9acfa79796 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Thu, 8 Mar 2018 13:50:31 +0800 Subject: [PATCH 02/10] 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); } }