From patchwork Tue Oct 11 21:38:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 34836 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1072747pzb; Tue, 11 Oct 2022 14:38:35 -0700 (PDT) X-Google-Smtp-Source: AMsMyM78NZPoI+SM2qO8eCZJm3ud+uJ8kWc+dtQNVBx2SAgLUl4FoH5qWy++Xqga0QJkZy/m52Kx X-Received: by 2002:a17:907:1689:b0:78d:e460:1d98 with SMTP id hc9-20020a170907168900b0078de4601d98mr3318197ejc.451.1665524315350; Tue, 11 Oct 2022 14:38:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665524315; cv=none; d=google.com; s=arc-20160816; b=RpYImqOQK0IoWDYWk5hztXaC9nexRr9jSTAQQAcDWg+ZSp2YN4sBPPya1Q7M3gEmVD 8crSYl6dup6mdIA0FzwiycKL2zhHZBQj4xKTp54nZepMBdHrVIOZ7/eGR/uJvL1Pbyqt IBv9RNdXYfeuqtuFuKNIBdbHxkU9Fao3wMda7ZU5eKFEWpTeqmglJV/EzzBMGn4UEYUK mPfQONcJ73u06ytZmTVwHpYXV2hkPH7jTBuAjWxvyDpsaP/zfDxX0P3k3mlQ+wcg7Ecp rCh2SNSlJNk79H7cqE61lUdXQDSHB9udxyHQ17Fvb48w74oyQrQDsFfawoHvAYBMrQPV sU9w== 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:to:mime-version:fcc:date:from:references :in-reply-to:message-id:dkim-signature:delivered-to; bh=TEqgdFAfIPl/h3OftxOMyBxc1hHvNOrcgRZNJiQEEKU=; b=d5R55y3g/YsYca+nL95FAizhQGcdoy7VVZmH3/WNr7g6bYiCgMXgJsqqH19wl9CPwo hkAUddzRX2r4kujJfeTUevyLQMkP4Wn9dsmOZmip/2vmlRYPoL/O6UmY0+oeQaoDAvex 4BXGwFA44P6IZhhTGJLuKJyrNidSVoFuqmDaxif5X+dnTA4zIq7Z4uP7TofGgvzLtZu8 S8/gnFKpHOMLcVNw74FXA/dnQhZ8KZlhtrkgvujDzGAcaH2i9QVkuuqj3h7BXKls4vCC Z6IlGAtCAhvBz0O6f1f/TaXc0VcVbS8Iva/c8CWfWxOUotqxAZHCpM0Z/p+Ax47Nowhm WooQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=X0KgPM7v; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b4-20020a50ccc4000000b004544518b7dasi12543864edj.148.2022.10.11.14.38.34; Tue, 11 Oct 2022 14:38:35 -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=@gmail.com header.s=20210112 header.b=X0KgPM7v; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 243C668BCAC; Wed, 12 Oct 2022 00:38:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7DB1668BB35 for ; Wed, 12 Oct 2022 00:38:24 +0300 (EEST) Received: by mail-pl1-f176.google.com with SMTP id z20so14426902plb.10 for ; Tue, 11 Oct 2022 14:38:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=CmwAKrzIXDzSx9DlZVhVvic08RSsBGpVmn2qNRvvzXU=; b=X0KgPM7vEfvzSFE/YmZ4R2ZgWizYo0lZ3XrRSL3jZ0uN0Fz6tlIf4hoP6pyBM49XlN SGF4ylHc8jKHi5PE/i6s7dsdWbfE8RPTW7GGBe1B//UAtXR8Qf3blnK8HcVn3qAgMPDk nAM37Ij+vl2/VR+rm3B0S+Q0USqeDvoopgPRSwJWb7V75lPeUPx4bxu5aIcTejdxG9NA cs+C4X5s7iHaBGk6GYYzo++MlfpVcl2TZ4ODw8g+OFk9z3b04g1WLt63uCPjkJFAkrQX EF3nsmXkmmGBFtSSUCELHSc/EIMaG3NAmQcpBA/BjTds6PP1fYurGfP/hCBYFVDgXOkO WtuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CmwAKrzIXDzSx9DlZVhVvic08RSsBGpVmn2qNRvvzXU=; b=xuRRIZdgqKQQ99nOHcMisljtVXedra1sbAVnrJGc66Mkncdk3wc9EejUeoiQp6NSH6 4PGPTjC8ipObXOKVtp8OvjpTJnfgnthC1DixBd6SOmtKAyZAZVPf9Kjklr1H6dGBj07e SZtZIOoFu31jXhjX+yx8WTMKIbViDqJ08VFSpnFuZB50eDX9FTL7v8vc9Y6Bk8jgSpFV MMp7EIIyTdT8SF4syu9g/y8SQLb+sAu0eD+XrF+dfLUIo+d0pSFFGm1VOJoIoDNnT5nu oZGMeVfaDPiDKMcODCJr2WkEgPUrELDzpuqFIXR9ZS8+QvxFEhg+AXOcb/G+TsCOqFgo 6WDA== X-Gm-Message-State: ACrzQf3KJ6UC+8TpfD2omckIFytNia9pJsdeXt903sLk76/gD7iF/Dbe 5Ce/FFxkFJmjEsKh/qQbcNk2JKwg6vw= X-Received: by 2002:a17:90b:2741:b0:20a:ebc3:6513 with SMTP id qi1-20020a17090b274100b0020aebc36513mr1366853pjb.29.1665524302531; Tue, 11 Oct 2022 14:38:22 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id ik7-20020a170902ab0700b0016f8e8032c4sm9060141plb.129.2022.10.11.14.38.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Oct 2022 14:38:21 -0700 (PDT) Message-Id: In-Reply-To: References: From: ffmpegagent Date: Tue, 11 Oct 2022 21:38:18 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2 0/2] Print filter input/output formats in help output 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: softworkz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: sJs5YpDmqJcc Example output for command: ffmpeg -h filters=overlay Filter overlay Overlay a video source on top of the input. slice threading supported Inputs: #0: main (video), Formats: Dynamic, Default: [yuv420p, yuvj420p, yuva420p, nv12, nv21] #1: overlay (video), Formats: Dynamic, Default: [yuva420p] Outputs: #0: default (video), Formats: Dynamic, Default: [yuv420p, yuvj420p, yuva420p, nv12, nv21] overlay AVOptions: [...] Examples for what it prints in various cases ============================================ For pass-through filter links "All (passthrough)" For filters using query_formats "Dynamic" For filters using query_formats where a call to query_formats succeeds "Dynamic, Default: [yuv420p, yuvj420p, yuva420p, nv12, nv21]" For all other cases "[s16p, s32p, fltp, dblp]" Except when all formats are supported (number of formats equals number of available formats) "All" ---------------------------------------------------------------------------- v2: rebase and fix compiler warnings softworkz (2): avfilter/avfilter: add avfilter_print_config_formats() ftools/opt_common: Print filter input/output formats in help output doc/APIchanges | 3 ++ fftools/opt_common.c | 37 +++++++++---- libavfilter/avfilter.c | 102 +++++++++++++++++++++++++++++++++++- libavfilter/avfilter.h | 12 +++++ libavfilter/avfiltergraph.c | 15 ++++-- libavfilter/internal.h | 9 ++++ libavfilter/version.h | 4 +- 7 files changed, 163 insertions(+), 19 deletions(-) base-commit: 479747645f795b6f4f376578ea1556409f943c31 Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging-43%2Fsoftworkz%2Fsubmit_print_formats-v2 Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-43/softworkz/submit_print_formats-v2 Pull-Request: https://github.com/ffstaging/FFmpeg/pull/43 Range-diff vs v1: 1: c9496ca671 ! 1: 5ae347e40c avfilter/avfilter: add avfilter_print_config_formats() @@ doc/APIchanges: libavutil: 2021-04-27 +2022-10-11 - xxxxxxxxxx - lavf 59.50.100 - avfilter.h + Add add avfilter_print_config_formats(). -+ - 2022-10-05 - 37d5ddc317 - lavu 57.39.100 - cpu.h - Add AV_CPU_FLAG_RVB_BASIC. ++ + 2022-10-11 - xxxxxxxxxx - lavu 57.39.101 - pixfmt.h + Add AV_PIX_FMT_RGBF32 and AV_PIX_FMT_RGBAF32. ## libavfilter/avfilter.c ## @@ libavfilter/avfilter.c: void avfilter_link_free(AVFilterLink **link) av_freep(link); } -+static unsigned get_nb_pix_fmts() ++static unsigned get_nb_pix_fmts(void) +{ + unsigned i = 0; + while (av_pix_fmt_desc_get(i++)) {} + return i - 1; +} + -+static unsigned get_nb_sample_fmts() ++static unsigned get_nb_sample_fmts(void) +{ + unsigned i = 0; + while (av_get_sample_fmt_name(i++)) {} @@ libavfilter/avfiltergraph.c: static int query_formats(AVFilterGraph *graph, void - ret = filter_query_formats(f); - else - ret = ff_default_query_formats(f); ++ + ret = ff_filter_query_formats(f); if (ret < 0 && ret != AVERROR(EAGAIN)) return ret; 2: c99d278881 ! 2: 29389422a9 ftools/opt_common: Print filter input/output formats in help output @@ fftools/opt_common.c: static void show_help_filter(const char *name) { #if CONFIG_AVFILTER const AVFilter *f = avfilter_get_by_name(name); -- int i, count; + AVBPrint bp; -+ int i, count, ret; + int i, count; if (!name) { - av_log(NULL, AV_LOG_ERROR, "No filter name specified.\n"); @@ fftools/opt_common.c: static void show_help_filter(const char *name) return; }