From patchwork Tue Oct 11 13:17:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 38690 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp860795pzb; Tue, 11 Oct 2022 06:18:12 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6CsmRTgHE98mRMZ0/LsATlCzQ2FddU68UPkaxzVIhbe29Yyg5RGIhxpsJqTezCaeXs/60M X-Received: by 2002:aa7:c643:0:b0:458:d2be:6b9b with SMTP id z3-20020aa7c643000000b00458d2be6b9bmr22541423edr.397.1665494292260; Tue, 11 Oct 2022 06:18:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665494292; cv=none; d=google.com; s=arc-20160816; b=avZqDYPtc9KhGMfVzZox7+rD3O+LyoMNI5WzFR3Q1VHY9O5Np2/fgpt2Vv3RIywdck NJGyVNcqyTeHY7drxKrdjSA2GVIUvlqFOnCEUYzZZVII8mWOV+UdXMu/9OMl68nw8oek DRC5ZJlfNTMAYLMrJy4Ut0jvzfG9BLQ6sP8u4DOYIGo7PeujELklWJ20xLuDU3ebQjOP IhuwccWBKse+l4AdHVIqbF4Ux+0TTdtZJvfssB+2RyZOdtlFrI7f2XZpQkzlC/CR+1co wUFIly4MuCdur0hzu7SSAAQ5vj9myzk8IZZqQLWpYGnb+ib5ONSzx69nkXm54K8bHo9n DSHA== 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:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=IboMsmgR0J8BpLJSqlgXhLas0lgBRuZgsC3zqxEpR80=; b=XJlZuadg4YKr+qwqPUlV3PhvBHM737kAvpM/lCRwG7AZ1x4pd4J/Q71z71vo9ZuUKb 2cscAUCfffDHYniW1aQnFGW5JfffWs3NuANr64UpyvLLRQMI85Sm32ZvdFGESrgIT8qO 6pNot+uxsPO2HPgeDEDHK9xtOFIVHdK/n/ALKhTCLT9GtPzdMy7lSqsaSLiP+gs30IJ8 DFVnVzELAEVLINMWqzZsRzGtn6Mz6mPbh7WMTOhUgFY3qvKTYdIuG/BXZYk2kY2shkk4 Jgf65LQewccrlYw+4uRzeizTAto4uTnGNHwfRxI9k9v4cdw/9mKdJfLwMeWdEyDr0djy 798Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=HLK7gKLn; 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 y21-20020a056402359500b0045a7e1c8ffasi12801949edc.269.2022.10.11.06.18.11; Tue, 11 Oct 2022 06:18:12 -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=HLK7gKLn; 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 5701868BCF2; Tue, 11 Oct 2022 16:18:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7670A68BC01 for ; Tue, 11 Oct 2022 16:17:55 +0300 (EEST) Received: by mail-pj1-f54.google.com with SMTP id t10-20020a17090a4e4a00b0020af4bcae10so13148799pjl.3 for ; Tue, 11 Oct 2022 06:17:55 -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 :references:in-reply-to:message-id:from:from:to:cc:subject:date :message-id:reply-to; bh=k8uPByShacNIXP14ykYAxOWCpdhcJ9CZrDJiM32dpOg=; b=HLK7gKLnqM5KJ8o1VJnCaBj/7vS1BLH73p0DTnJz3w2BX0tiPXuLF2AUhZg/a1hhyZ VUHFsRCnNygIlZu684sok/ELddpfn3ILBSqPGD9r0+XAl2s4b8ojZJhdSiXOAPE7haln ao19Ewb7bGEcvlzEQtFW1k59mZRC8SMrkSf/k3TidRKBf5DBWni/A5wTEhgYd7g3d1w1 n/joSS6NFoEpwmw7bIsF9DlKRQdg8LdO/Tt9LL9Zgc+lIJJkLq+SQLz2/kdjGjteaC7Y pEn6hPoaa69VoJ5/krTqvPwhEOxfCexd+XLR/tXg1bZaYsbfMshZQ71rKJDKFaCG/8p1 ntzg== 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 :references:in-reply-to:message-id:from:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=k8uPByShacNIXP14ykYAxOWCpdhcJ9CZrDJiM32dpOg=; b=q1u9cWGAChg5nH9J/+eUsphGQjZrHd7qphl0anmcp38e9JWD8KEgHhejCjw3Knr9G9 9E72Mmc5u+Q7XEyiNm9D6q3DE1lvHpQg3ZlZcD7s7b6W9mbU+ojkZ0blOTiYWtAI7nc8 l3UN3HeEEmcSubABb3OrWBfjhaWU6NhGWstN5xCiyiL3Lgcw/bbM6ej5BPq1olqdIz8c /XW1aGGpLp/RDupMZGBRzcw62GQPbD4VgftHVi9HP1uzv1uYXzorfuU69vlTKtC07lqi wBENuNMqpNm35ioYo5FZmlx8lcHsp3gjFHytg/Jx81ksjROF5VZa/NRiTf9xbkM41kg0 ZPCA== X-Gm-Message-State: ACrzQf1fAwX1fekzHS/c4H6phOgvvoGskR0nUZupgjIti9UyGAffhi0U 5HrKqwgDMyAzSScuy06YFTruWTSoQTU= X-Received: by 2002:a17:902:db0a:b0:178:2636:b6de with SMTP id m10-20020a170902db0a00b001782636b6demr24286592plx.58.1665494273865; Tue, 11 Oct 2022 06:17:53 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id w24-20020aa79558000000b005625d6d2999sm8902512pfq.187.2022.10.11.06.17.53 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Oct 2022 06:17:53 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: In-Reply-To: References: Date: Tue, 11 Oct 2022 13:17:51 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 2/2] ftools/opt_common: 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: U0UwILkEmZxU From: softworkz Exmaple command: ffmpeg -h filters=overlay Output: 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: [...] Signed-off-by: softworkz --- fftools/opt_common.c | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/fftools/opt_common.c b/fftools/opt_common.c index 8a06df82df..cb9de897a3 100644 --- a/fftools/opt_common.c +++ b/fftools/opt_common.c @@ -504,7 +504,8 @@ 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; if (!name) { av_log(NULL, AV_LOG_ERROR, "No filter name specified.\n"); @@ -514,40 +515,54 @@ static void show_help_filter(const char *name) return; } - printf("Filter %s\n", f->name); + av_bprint_init(&bp, 0, AV_BPRINT_SIZE_UNLIMITED); + av_log_set_callback(NULL); + + av_bprintf(&bp, "Filter %s\n", f->name); if (f->description) - printf(" %s\n", f->description); + av_bprintf(&bp, " %s\n", f->description); if (f->flags & AVFILTER_FLAG_SLICE_THREADS) - printf(" slice threading supported\n"); + av_bprintf(&bp, " slice threading supported\n"); - printf(" Inputs:\n"); + av_bprintf(&bp, " Inputs:\n"); count = avfilter_filter_pad_count(f, 0); for (i = 0; i < count; i++) { - printf(" #%d: %s (%s)\n", i, avfilter_pad_get_name(f->inputs, i), + av_bprintf(&bp, " #%d: %s (%s), Formats: ", i, avfilter_pad_get_name(f->inputs, i), av_get_media_type_string(avfilter_pad_get_type(f->inputs, i))); + + avfilter_print_config_formats(&bp, f, 0, i); + av_bprintf(&bp, "\n"); } if (f->flags & AVFILTER_FLAG_DYNAMIC_INPUTS) - printf(" dynamic (depending on the options)\n"); + av_bprintf(&bp, " dynamic (depending on the options)\n"); else if (!count) - printf(" none (source filter)\n"); + av_bprintf(&bp, " none (source filter)\n"); - printf(" Outputs:\n"); + av_bprintf(&bp, " Outputs:\n"); count = avfilter_filter_pad_count(f, 1); for (i = 0; i < count; i++) { - printf(" #%d: %s (%s)\n", i, avfilter_pad_get_name(f->outputs, i), + av_bprintf(&bp, " #%d: %s (%s), Formats: ", i, avfilter_pad_get_name(f->outputs, i), av_get_media_type_string(avfilter_pad_get_type(f->outputs, i))); + + avfilter_print_config_formats(&bp, f, 1, i); + av_bprintf(&bp, "\n"); } if (f->flags & AVFILTER_FLAG_DYNAMIC_OUTPUTS) - printf(" dynamic (depending on the options)\n"); + av_bprintf(&bp, " dynamic (depending on the options)\n"); else if (!count) - printf(" none (sink filter)\n"); + av_bprintf(&bp, " none (sink filter)\n"); + + av_log_set_callback(log_callback_help); + printf("%s\n", bp.str); if (f->priv_class) show_help_children(f->priv_class, AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_AUDIO_PARAM); if (f->flags & AVFILTER_FLAG_SUPPORT_TIMELINE) printf("This filter has support for timeline through the 'enable' option.\n"); + + av_bprint_finalize(&bp, NULL); #else av_log(NULL, AV_LOG_ERROR, "Build without libavfilter; " "can not to satisfy request\n");