From patchwork Fri Apr 5 18:57:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47868 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp1158050pzd; Fri, 5 Apr 2024 11:58:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXBbABwsQgkNRXl9PDPJ3aH5V8RljBGXB95UxbiDvGDh9DLCfNguJeyvAgBedVeUmlWNLMnKIPa5P72uKScYyiO2i/F+oyw19fAnA== X-Google-Smtp-Source: AGHT+IEIU7tRLHWlQBgGgbMq4xil8Ibr2VXCXaWBEhaUluEjpgIKeIFNyuay1B7ysput7019DoS5 X-Received: by 2002:a19:9108:0:b0:515:d60d:bbb with SMTP id t8-20020a199108000000b00515d60d0bbbmr1504925lfd.0.1712343527520; Fri, 05 Apr 2024 11:58:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712343527; cv=none; d=google.com; s=arc-20160816; b=k41WhwlO+uqBA1kiiF2jk301gPdauGYUOfjdO+ost1XUL+Ic4Vg1oHbxug4Z3c7wY0 UhoA+nCm0Mp6ncGOy7tZs1OX8ZlnBqB8222GjXCqU+rX91Ptkie1qLtjIcpLjTb2U+hS zVxKsq91X7yWIwI1dw2S9oIbNLmzbxsTF7aXTEy854gOOIEst23Rv+jb7iT0mbNGChB/ a/crrUpLapqNyToNvpKtcsEyjNkOzcKJUP9gne6nAznBhLX9hWE7ntn1Oxpq+2cFbhTW byA8zAgvi9VHITb64z6o5QaplMb6vR9yPh5jSgDc7Jqvfu5XOuRFeyxKQ3ezp5InJzgd 2KGQ== 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=pPHZZs+nLamE/eaYxT8tKd0OZCmc1P2eNIqPutokZ6Q=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=j1ubDYz+1yIMsxA4dpF9yingw0WxL2LpO2Z4X8eAad9lqH5y/SiVCzverZ4dmT1ea0 6/rCBUxSCOFzzhhp8wm85IztWSPQGyd3G13DQgPk1yOb0VVUOSgck+gP5NAIY2ztXWyB XsqskkXFUd4u6XXZ2UmdIU2SbgxTygYUKew/D3R0QJF6P6N6WbsI2UpkknoFO3HmEvSc f6OP/NubIIoSzucg8ujV+QjuBOmXLlmWzZm9CEu4IFxHpKtT8WFmHrT/3ptKLZtxDBLz rmmWw+0fX+1KEa3gCmBuLts/g1Qtlrn/XdrcRjJqoZ0BuKOWT1XQxK+nQACoPzrZewao 3hFw==; 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=r29jSxdZ; 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 b97-20020a509f6a000000b0056e2e99b24asi905760edf.506.2024.04.05.11.58.47; Fri, 05 Apr 2024 11:58:47 -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=r29jSxdZ; 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 A308D68D20C; Fri, 5 Apr 2024 21:57:41 +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 9AA5D68D1BE for ; Fri, 5 Apr 2024 21:57:31 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1712343447; bh=SJNvqas+6SyHfK+3VkIYknIWBqNBEqM7lAwZuTFTbD4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r29jSxdZg2MuzhD0Uo4kYLYAFZc4nsr1wzXTx+YeHA2topg3MUUkcAwjrL6TjUgMj gOe7q61SJbB4mLETn/OY2obVsYcNmP6QrDjvneDQMynp8tOYaMKL3hxI3lxrjazrvi zC5ZjEWNapRh6UIeaDWG5CRIlFI9QROz1GH5kxfw= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 6757A4344E; Fri, 5 Apr 2024 20:57:27 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 20:57:18 +0200 Message-ID: <20240405185721.111072-8-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240405185721.111072-1-ffmpeg@haasn.xyz> References: <20240405185721.111072-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [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 Cc: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: hPaSBGbknHM6 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))); 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); }