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 6C2F54A770 for ; Fri, 5 Apr 2024 19:36:44 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A326C68D0E9; Fri, 5 Apr 2024 22:36:41 +0300 (EEST) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9E12768CA4D for ; Fri, 5 Apr 2024 22:36:35 +0300 (EEST) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1e2bbc2048eso18829365ad.3 for ; Fri, 05 Apr 2024 12:36:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712345792; x=1712950592; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=wDuujH3eSGz8KIJmUlBGPusnDBqRDavlheQJ9v9Btzk=; b=kJpM1bgYpPiPgNj3vqP7b2sIaqzxHlT9jWbY0x+T3Fll6kkhpRx5vdpWxtwcVz39JI XvP7H6O/ne2CBoKvRpGRRx+6DwB85nujoYqb1005RiNtYGqHf48cDEeXUkAykkWx7B4+ RNGYn1+6LbjiS/mf179+77HZFgOhDr6+JGP7dRRS85P3bsxqf0GBuagEWJIkMJVaN6mp MGftW0dMgRrXDRNbeHhMq9WdNUpiDhbMY22I2YDK8nvnyvutMXhkV6mtcxBqCDW6LWEA X8hroKYoTvE1bIKZ413xpAArlu1EPW9Rp3DNTwADC5W9X1x7CWR9WCuc+ncDebcjX2SB AJew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712345792; x=1712950592; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=wDuujH3eSGz8KIJmUlBGPusnDBqRDavlheQJ9v9Btzk=; b=Q81iz3/Vvd6Pth5NzEdg7GAk/1S3k1PEt6iT2vKn6F9/yg26bbtLXHosWwCD3+Pstg TMpiXb95bws/v9W8zGxxLcW0t95T9sZOvuCgnWMkgQMfNQ0lqLAnYms22dQWFf09oyTd Mzc9ESk8z5Anr6G8I9XPuxAOu2nrsFlyflDrJUFh85ttKdLoK8ZE5skHkW4nJ8VyORN/ sUQJRDHblrx9HyKLSnUb7F4sJ41QrIqMZPpfP/0hN066+TiCPR8bTPZxpWKjuZLuybtj 1GBAIRREiPrl5hfkHJ5J2YA0LoDTI1lE6C4ACeJ6AIV8mzFjHtUsn4eoME+/3xZbBCjd UwPw== X-Gm-Message-State: AOJu0YxVb631erQsylugpAI2TsL0oRR4t2U8Uy505Qw7aQcBb/nMZG0S u4y0a1S/ACqsK0AfoQFo+ln2CufbyqO1nwoxSufAtgEs9nKIvAnkmRQ9YT8G X-Google-Smtp-Source: AGHT+IGGGV5uH7qxphecd/iApqSQtpAvPY2BTEQ4wCDfNx+j2iamuP7kJwghwZucMcscIeQcLIA8ag== X-Received: by 2002:a17:902:e547:b0:1dd:b728:b8d8 with SMTP id n7-20020a170902e54700b001ddb728b8d8mr2305024plf.45.1712345792251; Fri, 05 Apr 2024 12:36:32 -0700 (PDT) Received: from [192.168.0.15] ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id v10-20020a170902f0ca00b001def175bbbfsm1969369pla.251.2024.04.05.12.36.31 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 05 Apr 2024 12:36:31 -0700 (PDT) Message-ID: <3de40d76-d1eb-481b-bee0-7b69d398e289@gmail.com> Date: Fri, 5 Apr 2024 16:36:50 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240405185721.111072-1-ffmpeg@haasn.xyz> <20240405185721.111072-8-ffmpeg@haasn.xyz> Content-Language: en-US From: James Almer In-Reply-To: <20240405185721.111072-8-ffmpeg@haasn.xyz> 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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. > > 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".