From: James Almer <jamrial@gmail.com> To: ffmpeg-devel@ffmpeg.org Subject: Re: [FFmpeg-devel] [PATCH 08/11] fftools/opt_common: switch to avcodec_get_supported_config() Date: Fri, 5 Apr 2024 16:36:50 -0300 Message-ID: <3de40d76-d1eb-481b-bee0-7b69d398e289@gmail.com> (raw) In-Reply-To: <20240405185721.111072-8-ffmpeg@haasn.xyz> On 4/5/2024 3:57 PM, Niklas Haas wrote: > From: Niklas Haas <git@haasn.dev> > > While rewriting this macro, I decided to make it a bit more flexible so > it can work for all of the fields (including future fields) in a more > generic way. > --- > fftools/opt_common.c | 86 ++++++++++++++++++++++---------------------- > 1 file changed, 43 insertions(+), 43 deletions(-) > > diff --git a/fftools/opt_common.c b/fftools/opt_common.c > index 947a226d8d1..1bf66580192 100644 > --- a/fftools/opt_common.c > +++ b/fftools/opt_common.c > @@ -262,22 +262,32 @@ int show_buildconf(void *optctx, const char *opt, const char *arg) > return 0; > } > > -#define PRINT_CODEC_SUPPORTED(codec, field, type, list_name, term, get_name) \ > - if (codec->field) { \ > - const type *p = codec->field; \ > - \ > - printf(" Supported " list_name ":"); \ > - while (*p != term) { \ > - get_name(*p); \ > - printf(" %s", name); \ > - p++; \ > - } \ > - printf("\n"); \ > - } \ > +#define PRINT_CODEC_SUPPORTED(codec, config, type, name, elem, cond, fmt, ...) \ > + do { \ > + const type *elem = NULL; \ > + avcodec_get_supported_config(NULL, codec, config, 0, \ > + (const void **) &elem); \ > + if (elem) { \ > + printf(" Supported " name ":"); \ > + while (cond) { \ > + printf(" " fmt, __VA_ARGS__); \ > + elem++; \ > + } \ > + printf("\n"); \ > + } \ > + } while (0) > + > +static char *get_channel_layout_desc(const AVChannelLayout *layout, > + char desc[], int desc_size) > +{ > + av_channel_layout_describe(layout, desc, desc_size); > + return desc; > +} > > static void print_codec(const AVCodec *c) > { > int encoder = av_codec_is_encoder(c); > + char desc[128]; > > printf("%s %s [%s]:\n", encoder ? "Encoder" : "Decoder", c->name, > c->long_name ? c->long_name : ""); > @@ -343,35 +353,19 @@ static void print_codec(const AVCodec *c) > printf("\n"); > } > > - if (c->supported_framerates) { > - const AVRational *fps = c->supported_framerates; > - > - printf(" Supported framerates:"); > - while (fps->num) { > - printf(" %d/%d", fps->num, fps->den); > - fps++; > - } > - printf("\n"); > - } > - PRINT_CODEC_SUPPORTED(c, pix_fmts, enum AVPixelFormat, "pixel formats", > - AV_PIX_FMT_NONE, GET_PIX_FMT_NAME); > - PRINT_CODEC_SUPPORTED(c, supported_samplerates, int, "sample rates", 0, > - GET_SAMPLE_RATE_NAME); > - PRINT_CODEC_SUPPORTED(c, sample_fmts, enum AVSampleFormat, "sample formats", > - AV_SAMPLE_FMT_NONE, GET_SAMPLE_FMT_NAME); > - > - if (c->ch_layouts) { > - const AVChannelLayout *p = c->ch_layouts; > - > - printf(" Supported channel layouts:"); > - while (p->nb_channels) { > - char name[128]; > - av_channel_layout_describe(p, name, sizeof(name)); > - printf(" %s", name); > - p++; > - } > - printf("\n"); > - } > + PRINT_CODEC_SUPPORTED(c, AV_CODEC_CONFIG_FRAME_RATE, AVRational, "framerates", > + fps, fps->num, "%d/%d", fps->num, fps->den); > + PRINT_CODEC_SUPPORTED(c, AV_CODEC_CONFIG_PIX_FORMAT, enum AVPixelFormat, > + "pixel formats", fmt, *fmt != AV_PIX_FMT_NONE, > + "%s", av_get_pix_fmt_name(*fmt)); > + PRINT_CODEC_SUPPORTED(c, AV_CODEC_CONFIG_SAMPLE_RATE, int, "sample rates", > + rate, *rate != 0, "%d", *rate); > + PRINT_CODEC_SUPPORTED(c, AV_CODEC_CONFIG_SAMPLE_FORMAT, enum AVSampleFormat, > + "sample formats", fmt, *fmt != AV_SAMPLE_FMT_NONE, > + "%s", av_get_sample_fmt_name(*fmt)); > + PRINT_CODEC_SUPPORTED(c, AV_CODEC_CONFIG_CHANNEL_LAYOUT, AVChannelLayout, > + "channel layouts", layout, layout->nb_channels, > + "%s", get_channel_layout_desc(layout, desc, sizeof(desc))); Since you're rewriting everything, might as well go and port this to AVBprint, so we're not limited to 128 bytes for the channel layout. You can use av_bprintf() to write to the buffer using the different specifiers, then printf() the final bprint buffer to stdout. > > if (c->priv_class) { > show_help_children(c->priv_class, > @@ -566,8 +560,14 @@ static void show_help_bsf(const char *name) > } > > printf("Bit stream filter %s\n", bsf->name); > - PRINT_CODEC_SUPPORTED(bsf, codec_ids, enum AVCodecID, "codecs", > - AV_CODEC_ID_NONE, GET_CODEC_NAME); > + if (bsf->codec_ids) { > + const enum AVCodecID *id = bsf->codec_ids; > + printf(" Supported codecs:"); > + while (*id != AV_CODEC_ID_NONE) { > + printf(" %s", avcodec_descriptor_get(*id)->name); > + id++; > + } > + } > if (bsf->priv_class) > show_help_children(bsf->priv_class, AV_OPT_FLAG_BSF_PARAM); > } _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2024-04-05 19:36 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-04-05 18:57 [FFmpeg-devel] [PATCH 01/11] avcodec: add avcodec_get_supported_config() Niklas Haas 2024-04-05 18:57 ` [FFmpeg-devel] [PATCH 02/11] avcodec/encode: switch to avcodec_get_supported_config() Niklas Haas 2024-04-05 18:57 ` [FFmpeg-devel] [PATCH 03/11] avcodec/allcodecs: add backcompat for new config API Niklas Haas 2024-04-05 18:57 ` [FFmpeg-devel] [PATCH 04/11] avcodec/libx265: switch to get_supported_config() Niklas Haas 2024-04-05 18:57 ` [FFmpeg-devel] [PATCH 05/11] avcodec/libvpxenc: " Niklas Haas 2024-04-05 18:57 ` [FFmpeg-devel] [PATCH 06/11] avcodec/libaomenc: " Niklas Haas 2024-04-05 18:57 ` [FFmpeg-devel] [PATCH 07/11] avcodec/codec_internal: nuke init_static_data() Niklas Haas 2024-04-05 18:57 ` [FFmpeg-devel] [PATCH 08/11] fftools/opt_common: switch to avcodec_get_supported_config() Niklas Haas 2024-04-05 19:36 ` James Almer [this message] 2024-04-06 11:38 ` Niklas Haas 2024-04-07 0:10 ` James Almer 2024-04-08 11:15 ` Niklas Haas 2024-04-05 18:57 ` [FFmpeg-devel] [PATCH 09/11] fftools: drop unused/hacky macros Niklas Haas 2024-04-05 18:57 ` [FFmpeg-devel] [PATCH 10/11] fftools/ffmpeg_mux_init: switch to avcodec_get_supported_config() Niklas Haas 2024-04-05 18:57 ` [FFmpeg-devel] [PATCH 11/11] fftools/ffmpeg_filter: " Niklas Haas 2024-04-05 19:01 ` [FFmpeg-devel] [PATCH 01/11] avcodec: add avcodec_get_supported_config() Niklas Haas 2024-04-06 23:16 ` Michael Niedermayer 2024-04-07 11:47 ` Anton Khirnov 2024-04-08 11:15 ` Niklas Haas 2024-04-08 20:18 ` Michael Niedermayer 2024-04-08 20:23 ` Michael Niedermayer 2024-04-08 21:55 ` Niklas Haas 2024-04-10 22:09 ` Michael Niedermayer 2024-05-02 10:16 ` Niklas Haas
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=3de40d76-d1eb-481b-bee0-7b69d398e289@gmail.com \ --to=jamrial@gmail.com \ --cc=ffmpeg-devel@ffmpeg.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git