From patchwork Tue Oct 11 13:17:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 38691 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp860920pzb; Tue, 11 Oct 2022 06:18:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4P0tZ/7iVsIQQl/L/7dsIUY7S989IigIr3+HeXJgjEH+d0VlQ2SB3CYK/OQ1SKUnGixzVV X-Received: by 2002:a05:6402:2756:b0:443:4a6d:f05a with SMTP id z22-20020a056402275600b004434a6df05amr22871040edd.396.1665494307228; Tue, 11 Oct 2022 06:18:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665494307; cv=none; d=google.com; s=arc-20160816; b=n3C9rJi0smaCi5A7sFLCN0Q6KGZlUkwyS9IyKvxG7T7OW8fkQJaGUDzhblgbadtMao SkCEoQvIU7ANS/JjtGsuQbIBpJPEhiSOi2mbxREmmea3iSJrEcEA6iXRtG7eGShTSXiy d8WNScdeDVvKfS85Q/vfb12bziuv1RMlEFDlrXMf6eGkBAYE3NOnZk7G8C00smS2wjwC eB1uOJFdHvynv9bEQaBZFo8POFes8FR5uDkJhQLzXBaWlIiGvLXoHNU9TOmjCpX8fdW0 x3BsA6+QDqyO+zEymhPi2RO9yIYWZOZLTjKuaL3KhaMVXFJNgPY6XLVYjrasbtTHEd4S Jixg== 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=qZlyY95/M/Cp1Oe419u7NRpEOuC/sf3wsyg4DVbj3VM=; b=juNOyCcJEW6X/GuTbpv5M1nHP3Cg0xaKHai1mKIhIZAkfSiYoDpRBGQc7AB/cRjnpv gT58RlfmpgOsN2Akv+WBT9pspfXTsB1HXJris3IcXT6rB6Em5G5nXKLmiPOiuziHZne7 8QMwyVuHiDxFtPbLDxqntkrDI2LF32qGk84PSuUPzEDPfQbmnNmig1TK2rkV0cQnylhV lOTm+qgHEED9kfFkWPAmKMCGZM4y8dJDSa/8O/x3ee04TSqiqgmkhiUnqmVdTf7sQGl1 9TyrdezJdE5aRosc25RLj5kANNWgWBln+Nm3uCXauoSnhJAuQKbHMrd865m20SUBB2vy tDUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=j1QUQEDE; 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 y20-20020a056402171400b00443088b40b7si11306674edu.123.2022.10.11.06.18.20; Tue, 11 Oct 2022 06:18:27 -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=j1QUQEDE; 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 3DACE68BD07; Tue, 11 Oct 2022 16:18:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 763BB68BBD2 for ; Tue, 11 Oct 2022 16:17:55 +0300 (EEST) Received: by mail-pf1-f176.google.com with SMTP id w2so13544292pfb.0 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=xilpvWpWMuBmDLFya8dkyTm5C1Dn+7AuIXB7rt46ip0=; b=j1QUQEDE4wq7GhkYsc2AMGJ55Y4XtNK+40ZT5+qqRD7s5zLz4vqo7LYD9N55WYOkx4 Qd/YJOI6yGBvqBE82xHwqqMly37BfWfDJrhWfU2Ie5z9yEct14i7ceaL2jDbUL9nnilg SRW8ftGfp+IJUFIa3yjvNr4GrxVITDu5v8w/6YJIV9Ddddk4TlOksl1OoCby2TWgJx36 ErJ03ROrMAuND7Sp4fxbz2ZEYPmpKsn06OID2pjadUAHi+tGaducur2plpo7A5Bb+MMn Kra3In4cVFG1XrAUc0Zz7Z/gbaFYzETPC1JeITS5juI9DCG/G8Jxx4OQ02prQH13/tQp 31SA== 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=xilpvWpWMuBmDLFya8dkyTm5C1Dn+7AuIXB7rt46ip0=; b=KpTpZ1EuCKlTgBhu1Z8wcYM52xEsGZ7ASLnSu2TNGXq8XPqxmz+GRZe6d+F2bHQ0oH adNhf76hslUdVII0EM9a669WLkKgt8eJJsrtdnnNCb//uNy5l4DBtQBQ5Jpmp/vmv0SR /bJzJpJAxuN0sFoSIkp4o3Zcbm970luCd9UoK5rx4L0RXm43CHwS1aW5cdncqwNlk/Cn 3VUiXzSPMCrnYYX2rfrWXuc+ls0OX9ARFasmOha0BGDdntRrDhrQyWSnsBcrwIWiC7kt u9rGnhcqbbkh++LHCds1OpkjWPJ/ETQ1zZ+Z+3GITaK2Z3G+2g+3uej69ONDmd4a39Qx 3UbQ== X-Gm-Message-State: ACrzQf2plOseMqKaXq0mEsPCIaO6AbkZl9zLK/f5wKP0Cre6pXcErLlK yH1QMGZYzJyu1zhcqEoIIsCrBikSxzA= X-Received: by 2002:a63:2318:0:b0:452:598a:92de with SMTP id j24-20020a632318000000b00452598a92demr21476937pgj.73.1665494273147; 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 b16-20020a170903229000b0017680faa1a8sm8695765plh.112.2022.10.11.06.17.52 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Oct 2022 06:17:52 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: In-Reply-To: References: Date: Tue, 11 Oct 2022 13:17:50 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 1/2] avfilter/avfilter: add avfilter_print_config_formats() 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: mn2uwJbIVHl9 From: softworkz Prints the following to AVBPrint: 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 (example): "Dynamic, Defaults: [yuv420p, yuvj420p, yuva420p, nv12, nv21]" For all other filters (example): "[s16p, s32p, fltp, dblp]" Except in case when the number of formats equals the number of available formats: "All" Signed-off-by: softworkz --- doc/APIchanges | 3 ++ libavfilter/avfilter.c | 102 +++++++++++++++++++++++++++++++++++- libavfilter/avfilter.h | 12 +++++ libavfilter/avfiltergraph.c | 14 +++-- libavfilter/internal.h | 9 ++++ libavfilter/version.h | 4 +- 6 files changed, 136 insertions(+), 8 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index cbb579612e..6e2a528b04 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,9 @@ libavutil: 2021-04-27 API changes, most recent first: +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. diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index cc5505e65b..8cc665e19c 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -196,6 +196,104 @@ void avfilter_link_free(AVFilterLink **link) av_freep(link); } +static unsigned get_nb_pix_fmts() +{ + unsigned i = 0; + while (av_pix_fmt_desc_get(i++)) {} + return i - 1; +} + +static unsigned get_nb_sample_fmts() +{ + unsigned i = 0; + while (av_get_sample_fmt_name(i++)) {} + return i - 1; +} + +int avfilter_print_config_formats(AVBPrint *bp, const struct AVFilter *filter, int for_output, unsigned pad_index) +{ + AVFilterGraph *graph; + AVFilterContext *filter_context; + AVFilterFormatsConfig *config; + enum AVMediaType media_type; + int ret = 0; + + if (filter->formats_state == FF_FILTER_FORMATS_PASSTHROUGH) { + av_bprintf(bp, "All (passthrough)"); + return 0; + } + + graph = avfilter_graph_alloc(); + if (!graph) { + av_log(NULL, AV_LOG_ERROR, "Failed to create filtergraph\n"); + ret = AVERROR(ENOMEM); + goto cleanup; + } + + filter_context = avfilter_graph_alloc_filter(graph, filter, "filter"); + if (!filter_context) { + av_log(NULL, AV_LOG_ERROR, "Failed to create filter\n"); + ret = AVERROR(ENOMEM); + goto cleanup; + } + + avfilter_init_str(filter_context, NULL); + + if (filter->formats_state == FF_FILTER_FORMATS_QUERY_FUNC) + av_bprintf(bp, "Dynamic"); + + if (!for_output && pad_index >= filter_context->nb_inputs + || for_output && pad_index >= filter_context->nb_outputs) + goto cleanup; + + avfilter_graph_config(graph, graph); + + for (unsigned i = 0; i < filter_context->nb_inputs; i++) + filter_context->inputs[i] = (AVFilterLink *)av_mallocz(sizeof(AVFilterLink)); + + for (unsigned i = 0; i < filter_context->nb_outputs; i++) + filter_context->outputs[i] = (AVFilterLink *)av_mallocz(sizeof(AVFilterLink)); + + ff_filter_query_formats(filter_context); + + config = for_output ? &filter_context->outputs[pad_index]->incfg : &filter_context->inputs[pad_index]->outcfg; + + if (!config || !config->formats) + goto cleanup; + + media_type= for_output ? filter->outputs[pad_index].type : filter->inputs[pad_index].type; + + if (filter->formats_state == FF_FILTER_FORMATS_QUERY_FUNC) { + if (config->formats && config->formats->nb_formats) + av_bprintf(bp, ", Default: "); + } + + if (config->formats == NULL) + av_bprintf(bp, "unknown"); + else if (media_type == AVMEDIA_TYPE_VIDEO && config->formats->nb_formats == get_nb_pix_fmts() || + media_type == AVMEDIA_TYPE_AUDIO && config->formats->nb_formats == get_nb_sample_fmts()) + av_bprintf(bp, "All"); + else { + for (unsigned i = 0; i < config->formats->nb_formats; i++) { + if (i == 0) + av_bprintf(bp, "["); + + if (media_type == AVMEDIA_TYPE_VIDEO) + av_bprintf(bp, "%s", av_get_pix_fmt_name(config->formats->formats[i])); + else if (media_type == AVMEDIA_TYPE_AUDIO) + av_bprintf(bp, "%s", av_get_sample_fmt_name(config->formats->formats[i])); + + if (i < config->formats->nb_formats - 1) + av_bprintf(bp, ", "); + else + av_bprintf(bp, "]"); } + } + +cleanup: + avfilter_graph_free(&graph); + return ret; +} + void ff_filter_set_ready(AVFilterContext *filter, unsigned priority) { filter->ready = FFMAX(filter->ready, priority); @@ -759,12 +857,12 @@ void avfilter_free(AVFilterContext *filter) for (i = 0; i < filter->nb_inputs; i++) { free_link(filter->inputs[i]); - if (filter->input_pads[i].flags & AVFILTERPAD_FLAG_FREE_NAME) + if (filter->input_pads && filter->input_pads[i].flags & AVFILTERPAD_FLAG_FREE_NAME) av_freep(&filter->input_pads[i].name); } for (i = 0; i < filter->nb_outputs; i++) { free_link(filter->outputs[i]); - if (filter->output_pads[i].flags & AVFILTERPAD_FLAG_FREE_NAME) + if (filter->output_pads && filter->output_pads[i].flags & AVFILTERPAD_FLAG_FREE_NAME) av_freep(&filter->output_pads[i].name); } diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 2e8197c9a6..705dabe53c 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -41,6 +41,7 @@ #include "libavutil/avutil.h" #include "libavutil/buffer.h" #include "libavutil/dict.h" +#include "libavutil/bprint.h" #include "libavutil/frame.h" #include "libavutil/log.h" #include "libavutil/samplefmt.h" @@ -738,6 +739,17 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad, */ void avfilter_link_free(AVFilterLink **link); +/** + * Gets the formats from an AVFilterFormatsConfig. + * + * @param bp an instance of AVBPrint + * @param filter the AVFilter + * @param for_output set to 1 for filter outputs + * @param pad_index the index of the input or output + * @return zero on success + */ +int avfilter_print_config_formats(AVBPrint *bp, const AVFilter *filter, int for_output, unsigned pad_index); + /** * Negotiate the media format, dimensions, etc of all inputs to a filter. * diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 53f468494d..9118a44e1f 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -416,10 +416,7 @@ static int query_formats(AVFilterGraph *graph, void *log_ctx) AVFilterContext *f = graph->filters[i]; if (formats_declared(f)) continue; - if (f->filter->formats_state == FF_FILTER_FORMATS_QUERY_FUNC) - 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; /* note: EAGAIN could indicate a partial success, not counted yet */ @@ -1351,3 +1348,12 @@ int ff_filter_graph_run_once(AVFilterGraph *graph) return AVERROR(EAGAIN); return ff_filter_activate(filter); } + +int ff_filter_query_formats(AVFilterContext *filter) +{ + if (filter->filter->formats_state == FF_FILTER_FORMATS_QUERY_FUNC) + return filter_query_formats(filter); + + return ff_default_query_formats(filter); +} + diff --git a/libavfilter/internal.h b/libavfilter/internal.h index aaf2c6c584..446d2a45f8 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -374,6 +374,15 @@ void ff_filter_graph_remove_filter(AVFilterGraph *graph, AVFilterContext *filter */ int ff_filter_graph_run_once(AVFilterGraph *graph); +/** + * Query the formats of a filter. + * + * @param filter the filter context + * + * @return 0 on success + */ +int ff_filter_query_formats(AVFilterContext *filter); + /** * Get number of threads for current filter instance. * This number is always same or less than graph->nb_threads. diff --git a/libavfilter/version.h b/libavfilter/version.h index 4ccbf5641c..436c2b8b17 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -31,8 +31,8 @@ #include "version_major.h" -#define LIBAVFILTER_VERSION_MINOR 49 -#define LIBAVFILTER_VERSION_MICRO 101 +#define LIBAVFILTER_VERSION_MINOR 50 +#define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \