From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id A83244A779 for ; Sat, 6 Apr 2024 11:39:06 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E393768D07E; Sat, 6 Apr 2024 14:39:03 +0300 (EEST) Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 12AD068CB2B for ; Sat, 6 Apr 2024 14:38:58 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1712403537; bh=VKh4C4Y3xlT15Pv8Ycmh0GNegAAHUz1ZYX26CpcmfEI=; h=Date:From:To:Subject:In-Reply-To:References:From; b=TQptJOpHmbOT3vFkDb5BsMz9cuL9PIC8xudSqAqyYqBk6HqWOmZhEr7JrSmUD2mIY UhXxVioil9QGrTDhnPloFHZwoVKK7+bD3zOOuUnBgXMqvlzESpZEU4pE8atrRykVBC jgabujucte8HiKic4GL56OyzJhjQjI8vqUAeYVDE= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id B8A134105D for ; Sat, 6 Apr 2024 13:38:57 +0200 (CEST) Date: Sat, 6 Apr 2024 13:38:57 +0200 Message-ID: <20240406133857.GB33922@haasn.xyz> From: Niklas Haas To: ffmpeg-devel@ffmpeg.org In-Reply-To: <3de40d76-d1eb-481b-bee0-7b69d398e289@gmail.com> References: <20240405185721.111072-1-ffmpeg@haasn.xyz> <20240405185721.111072-8-ffmpeg@haasn.xyz> <3de40d76-d1eb-481b-bee0-7b69d398e289@gmail.com> MIME-Version: 1.0 Content-Disposition: inline Subject: Re: [FFmpeg-devel] [PATCH 08/11] fftools/opt_common: switch to avcodec_get_supported_config() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Fri, 05 Apr 2024 16:36:50 -0300 James Almer wrote: > On 4/5/2024 3:57 PM, Niklas Haas wrote: > > From: Niklas Haas > > > > 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. I implemented something like this initially, but it is IMO premature optimization as there is no multi-threading going on in this code, so no risk of colliding printf() calls. printf() already internally buffers data, so we are not gaining anything by buffering it inside an AVBPrint a second time. That said, using an AVBPrint instead of a fixed size buffer is a good idea for the channel layout specifically, something like this: diff --git a/fftools/opt_common.c b/fftools/opt_common.c index 1bf66580192..fae68949f89 100644 --- a/fftools/opt_common.c +++ b/fftools/opt_common.c @@ -277,17 +277,17 @@ int show_buildconf(void *optctx, const char *opt, const char *arg) } \ } while (0) -static char *get_channel_layout_desc(const AVChannelLayout *layout, - char desc[], int desc_size) +static char *get_channel_layout_desc(const AVChannelLayout *layout, AVBPrint *bp) { - av_channel_layout_describe(layout, desc, desc_size); - return desc; + av_bprint_clear(bp); + av_channel_layout_describe_bprintf(layout, bp); + return bp->str; } static void print_codec(const AVCodec *c) { int encoder = av_codec_is_encoder(c); - char desc[128]; + AVBPrint desc; printf("%s %s [%s]:\n", encoder ? "Encoder" : "Decoder", c->name, c->long_name ? c->long_name : ""); @@ -363,9 +363,12 @@ static void print_codec(const AVCodec *c) 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)); + + av_bprint_init(&desc, AV_BPRINT_SIZE_AUTOMATIC); 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))); + "%s", get_channel_layout_desc(layout, &desc)); + av_bprint_finalize(&desc, NULL); if (c->priv_class) { show_help_children(c->priv_class, > > > > > 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". _______________________________________________ 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".