From patchwork Mon Apr 8 12:57:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47928 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp2457433pzd; Mon, 8 Apr 2024 06:02:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX6tW9VOheqjT6idmUH5bj090ZWfrsiH144nlOPw8eRm7ByySKIaodrUxxkoTezsL84ml6U7C3XGyw5tOB8LFHyJxl16lTXR6cNng== X-Google-Smtp-Source: AGHT+IEluDjQxzEowvF9SxZ9ZAFRfC5yCSHgYgxkFelzbutqwqDH9+kSSIS9/5yEMQZke677l6Oh X-Received: by 2002:a50:ccc3:0:b0:56e:309b:d6fc with SMTP id b3-20020a50ccc3000000b0056e309bd6fcmr6495365edj.10.1712581378604; Mon, 08 Apr 2024 06:02:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712581378; cv=none; d=google.com; s=arc-20160816; b=aOBSs+rMxRG0D01gLRB3ki5/BIZYuaX72aJw/IWPH60cueA9vChs2deyDMV3hiiOSW q02a0WsPwjFzWn3JZ9LBLf6O6XVEAGAYSYBnrG0UOZA/SFOCpjcQaoN5yImwJ9G9mpFL /U8K4QXLrGYOgicJ/qv8DkYJHi1kph+ki1IoeEP6eMOHt5Y/t4EDP6CMyK8tuZ9+9UGM mbJm4nUNolWoCW1gtBfg0rduyVq9k71lSJs9sZxkffxevX6kY1DD/DC/IJZ2XOZzFGr3 xDOhlcvKF3dE6FLnDizOdxVfrp67a6dDMaxsVziavF3AFYLJJjo8W8cANd/a003nKAYo zlhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=bz8zWnpIvrYN0CWqMM01fuu8l1RiLum0WczWARUgSfM=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=ZVrinRl5UfifN6iPAB6TCnjK+x9a/cNp+4oki5Qwo+/01lTmZGbHsnevyreRTvECj5 IU6Ye0GUeUgw5xdmLURXLvR7JBNUJN7tkp0THesDfE9E3huU9BY3qAHl022+dXQ/yuru WAd2QKRF3nd411W+tMefWl1ObKzR3svj7upscSYD+yAYs31gNtE5DbJlmYuJuGciNL+D WjlODQmrcWmcYrSg4mLGxqH7botQSduKd/nDahn2Ez2R85CpnXXiWDcgbEPWMlRI1IFf PaqY2z9ebDVJIiHLRJVu229usxEctF3/+pGt3E7GPybIidrrPgWxgcUXaJ42zjs3Bjqh 7N6g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=RDNIW1BP; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z62-20020a509e44000000b0056e218c2ce2si3515080ede.253.2024.04.08.06.02.58; Mon, 08 Apr 2024 06:02:58 -0700 (PDT) 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=@haasn.xyz header.s=mail header.b=RDNIW1BP; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9F28768D33F; Mon, 8 Apr 2024 16:00:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6A46868D255 for ; Mon, 8 Apr 2024 15:59:58 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1712581194; bh=Nf9wmgMdLqxV3c3TSnXhA8ivyH4/3UMKyI0yf+oRm7k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RDNIW1BPKcxLO6JvRcnhBv7n+6UIENnScZ/o18KIlqjtq/iu+jbxBjvVci/Iha0YD ezh1Nl5gaD0mttRg0GSaAFwKXJk5qPJciU2xHUauqqW7/pvnjrtbSciviaWEXcnrQp Aey/9za1KXNcCkCLhImNtuQ2JoFiOez6++3ogG4g= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 96E1B4721D; Mon, 8 Apr 2024 14:59:54 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Apr 2024 14:57:14 +0200 Message-ID: <20240408125950.53472-11-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408125950.53472-1-ffmpeg@haasn.xyz> References: <20240408125950.53472-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 10/17] 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 Cc: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: q7Y9yxye8jJz 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, and to also print the channel layout using an AVBPrint to avoid hard-coding the assumption that the length is less than 128 characters. --- fftools/opt_common.c | 92 +++++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 43 deletions(-) diff --git a/fftools/opt_common.c b/fftools/opt_common.c index 947a226d8d1..c4d71fbe3c7 100644 --- a/fftools/opt_common.c +++ b/fftools/opt_common.c @@ -262,22 +262,35 @@ 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 const char *get_channel_layout_desc(const AVChannelLayout *layout, AVBPrint *bp) +{ + int ret; + av_bprint_clear(bp); + ret = av_channel_layout_describe_bprint(layout, bp); + if (!av_bprint_is_complete(bp) || ret < 0) + return "unknown/invalid"; + return bp->str; +} static void print_codec(const AVCodec *c) { int encoder = av_codec_is_encoder(c); + AVBPrint desc; printf("%s %s [%s]:\n", encoder ? "Encoder" : "Decoder", c->name, c->long_name ? c->long_name : ""); @@ -343,35 +356,22 @@ 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)); + + av_bprint_init(&desc, 0, 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)); + av_bprint_finalize(&desc, NULL); if (c->priv_class) { show_help_children(c->priv_class, @@ -566,8 +566,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); }