[FFmpeg-devel,v3,2/2] cmdutils: add show_help_protocol for get protocol options

Submitted by Steven Liu on Nov. 27, 2019, 5:57 a.m.

Details

Message ID 20191127055702.20238-1-lq@chinaffmpeg.org
State New
Headers show

Commit Message

Steven Liu Nov. 27, 2019, 5:57 a.m.
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
---
 fftools/cmdutils.c   | 14 ++++++++++++++
 fftools/ffmpeg_opt.c |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

Comments

Michael Niedermayer Nov. 27, 2019, 9:24 p.m.
On Wed, Nov 27, 2019 at 01:57:02PM +0800, Steven Liu wrote:
> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
> ---
>  fftools/cmdutils.c   | 14 ++++++++++++++
>  fftools/ffmpeg_opt.c |  2 +-
>  2 files changed, 15 insertions(+), 1 deletion(-)

i think the patchset looks good, but maybe wait a bit before applying
as it involves public API and others may have comments too

Thanks

[...]

Patch hide | download patch | download mbox

diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c
index 84f98b7c04..0e1bb4dbb6 100644
--- a/fftools/cmdutils.c
+++ b/fftools/cmdutils.c
@@ -1870,6 +1870,18 @@  static void show_help_demuxer(const char *name)
         show_help_children(fmt->priv_class, AV_OPT_FLAG_DECODING_PARAM);
 }
 
+static void show_help_protocol(const char *name)
+{
+    const AVClass *proto_class = avio_protocol_get_class(name);
+
+    if (!proto_class) {
+        av_log(NULL, AV_LOG_ERROR, "Unknown protocol '%s'.\n", name);
+        return;
+    }
+
+    show_help_children(proto_class, AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_ENCODING_PARAM);
+}
+
 static void show_help_muxer(const char *name)
 {
     const AVCodecDescriptor *desc;
@@ -2000,6 +2012,8 @@  int show_help(void *optctx, const char *opt, const char *arg)
         show_help_demuxer(par);
     } else if (!strcmp(topic, "muxer")) {
         show_help_muxer(par);
+    } else if (!strcmp(topic, "protocol")) {
+        show_help_protocol(par);
 #if CONFIG_AVFILTER
     } else if (!strcmp(topic, "filter")) {
         show_help_filter(par);
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
index 71063cc443..8d73fa8a78 100644
--- a/fftools/ffmpeg_opt.c
+++ b/fftools/ffmpeg_opt.c
@@ -3194,7 +3194,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/bsf\n"
+           "    -h type=name -- print all options for the named decoder/encoder/demuxer/muxer/filter/bsf/protocol\n"
            "    See man %s for detailed description of the options.\n"
            "\n", program_name);