lavfi/af_agate: convert to query_func2()

Drop redundant ff_set_common_all_channel_counts() /
ff_set_common_all_samplerates() calls, since those happen implicitly in
generic code.
release/7.1
Anton Khirnov 5 months ago
parent d9f594209f
commit f143723095
  1. 24
      libavfilter/af_agate.c

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

Loading…
Cancel
Save