From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id E42EC40122 for ; Thu, 3 Nov 2022 09:58:23 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E018568BF12; Thu, 3 Nov 2022 11:58:19 +0200 (EET) Received: from mail-vs1-f52.google.com (mail-vs1-f52.google.com [209.85.217.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F403068BE3B for ; Thu, 3 Nov 2022 11:58:12 +0200 (EET) Received: by mail-vs1-f52.google.com with SMTP id l190so1370451vsc.10 for ; Thu, 03 Nov 2022 02:58:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=b+zO0jEc11OhWvMDV+f+hzO7wotRfpqUTuEKfH+jVWI=; b=BQqcarL/T0lj6v/4JeE71CmpO07f3+dxJ6CpUxCrYaWX8v8QlzHj469pPnyaqNP2kr j7xWLEO4G2OykZp0FRejB6u5ywx4A9qWdF4AIWxZw4la7xlC5+uO6yO3r/xZ+WDKvaag FrSlS7Vn16IbDbg+OLciRVf2zonUkTEflxhW2JG3tUSjXjY+cdDX5uAWDBnej9npkKAE aXZCRPWVm9qjQ7XXgt3RjcKlCkj1LsAhzXCMzOlFqZrQYghJHyCZhn1zKB2yBODTK9ld kg33IBKYpzyyI9tpo3Rw3skWoPI+WO/rD+Yv7rwTQSoaM86PYhgh0uHrqvc8kckJXwiC LeLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=b+zO0jEc11OhWvMDV+f+hzO7wotRfpqUTuEKfH+jVWI=; b=RWvCG4droud3wJAI2O7afpKTwPug9othZc6lphufQ2M4htDQdy5YsKmEr12yuZjfaJ TLjfaxXZ1gtKGbYovy/xoYijIO/R8TvZn34bOWSAUguNRohb13ylanW0ji5r6y2ROOhm kLF3xinqa2A95siBm8OtcPWnWUXbpxpS5h/Ejbr4S5ngMW11Z0CSLk5z0M4KtHmIDQOo EIYRD3R0LPPhUREXK10SGhbzYM41ONKY8GCiC6L3ovgrQdUy1jJu8yMYwE9Z/0crAL9l QnPYvGnUqqGvJC3I+GRIHTujpv3vJkTl2hbAFPAqNlqjsjVBaQAcFqFUd4gXVEBUiPMv pdbA== X-Gm-Message-State: ACrzQf3D8FejS+0vyqV/45M3D8sMDFngb8SpVyY4eFmlozwCzREFLdCa /uzFUxzm3bZ6xic3VZlWLFQdpg6DPAa39cpPUk7IQFNo X-Google-Smtp-Source: AMsMyM4J4VMx7lziKLzY39dUcyCwjAO7+NDIk8z2//xKxGsqF479haarFy1sxBXGnCumxZ4iMiqTLrndFZjpwEfKDw0= X-Received: by 2002:a67:d50c:0:b0:3aa:3ebf:6b73 with SMTP id l12-20020a67d50c000000b003aa3ebf6b73mr16035836vsj.15.1667469491473; Thu, 03 Nov 2022 02:58:11 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a05:612c:612:b0:314:ac6a:1eb7 with HTTP; Thu, 3 Nov 2022 02:58:10 -0700 (PDT) In-Reply-To: References: From: Paul B Mahol Date: Thu, 3 Nov 2022 10:58:10 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 10/11/22, softworkz wrote: > 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, > \ > -- > ffmpeg-codebot > LGTM > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".