ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-16 19:43:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

lavfi/af_agate: convert to query_func2()

Browse Source 
Drop redundant ff_set_common_all_channel_counts() /
ff_set_common_all_samplerates() calls, since those happen implicitly in
generic code.
This commit is contained in:
Anton Khirnov 2024-08-29 09:10:01 +02:00
parent d9f594209f
commit f143723095
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavfilter/af_agate.c
View File

@ -310,26 +310,28 @@ static int activate(AVFilterContext *ctx)
return 0;
}
static int scquery_formats(AVFilterContext *ctx)
static int scquery_formats(const AVFilterContext *ctx,
AVFilterFormatsConfig **cfg_in,
AVFilterFormatsConfig **cfg_out)
{
static const enum AVSampleFormat sample_fmts[] = {
AV_SAMPLE_FMT_DBL,
AV_SAMPLE_FMT_NONE
};
int ret = ff_channel_layouts_ref(ff_all_channel_counts(),
&ctx->inputs[1]->outcfg.channel_layouts);
int ret;
/* Generic code will link the channel properties of the main input and the
* output; it won't touch the second input as its channel_layouts is already
* set. */
ret = ff_channel_layouts_ref(ff_all_channel_counts(),
&cfg_in[1]->channel_layouts);
if (ret < 0)
return ret;
/* This will link the channel properties of the main input and the output;
* it won't touch the second input as its channel_layouts is already set. */
if ((ret = ff_set_common_all_channel_counts(ctx)) < 0)
if ((ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, sample_fmts)) < 0)
return ret;
if ((ret = ff_set_common_formats_from_list(ctx, sample_fmts)) < 0)
return ret;
return ff_set_common_all_samplerates(ctx);
return 0;
}
static int scconfig_output(AVFilterLink *outlink)
@ -385,7 +387,7 @@ const AVFilter ff_af_sidechaingate = {
.uninit = uninit,
FILTER_INPUTS(sidechaingate_inputs),
FILTER_OUTPUTS(sidechaingate_outputs),
FILTER_QUERY_FUNC(scquery_formats),
FILTER_QUERY_FUNC2(scquery_formats),
.process_command = ff_filter_process_command,
.flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL,
};