aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2024-08-29 09:10:01 +0200
committerAnton Khirnov <anton@khirnov.net>2024-09-02 11:55:22 +0200
commit584be5133492ad39d279df1bb076871411c9bd55 (patch)
tree4101dfd27d9588ab08507ba129deb7ea241d561a
parent079834e64591b89ec9e14945bded745257dee4e7 (diff)
downloadffmpeg-584be5133492ad39d279df1bb076871411c9bd55.tar.gz
lavfi/af_adynamicequalizer: 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.
-rw-r--r--libavfilter/af_adynamicequalizer.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/libavfilter/af_adynamicequalizer.c b/libavfilter/af_adynamicequalizer.c
index 7a102cad22..ba03faff60 100644
--- a/libavfilter/af_adynamicequalizer.c
+++ b/libavfilter/af_adynamicequalizer.c
@@ -110,9 +110,11 @@ typedef struct AudioDynamicEqualizerContext {
ChannelContext *cc;
} AudioDynamicEqualizerContext;
-static int query_formats(AVFilterContext *ctx)
+static int query_formats(const AVFilterContext *ctx,
+ AVFilterFormatsConfig **cfg_in,
+ AVFilterFormatsConfig **cfg_out)
{
- AudioDynamicEqualizerContext *s = ctx->priv;
+ const AudioDynamicEqualizerContext *s = ctx->priv;
static const enum AVSampleFormat sample_fmts[3][3] = {
{ AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP, AV_SAMPLE_FMT_NONE },
{ AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE },
@@ -120,13 +122,11 @@ static int query_formats(AVFilterContext *ctx)
};
int ret;
- if ((ret = ff_set_common_all_channel_counts(ctx)) < 0)
- return ret;
-
- if ((ret = ff_set_common_formats_from_list(ctx, sample_fmts[s->precision])) < 0)
+ if ((ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
+ sample_fmts[s->precision])) < 0)
return ret;
- return ff_set_common_all_samplerates(ctx);
+ return 0;
}
static double get_coef(double x, double sr)
@@ -281,7 +281,7 @@ const AVFilter ff_af_adynamicequalizer = {
.uninit = uninit,
FILTER_INPUTS(inputs),
FILTER_OUTPUTS(ff_audio_default_filterpad),
- FILTER_QUERY_FUNC(query_formats),
+ FILTER_QUERY_FUNC2(query_formats),
.flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL |
AVFILTER_FLAG_SLICE_THREADS,
.process_command = ff_filter_process_command,