Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

lavfi/af_adynamicequalizer: 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 079834e645
commit 584be51334
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libavfilter/af_adynamicequalizer.c
View file

@ -110,9 +110,11 @@ typedef struct AudioDynamicEqualizerContext {
ChannelContext *cc; ChannelContext *cc;
} AudioDynamicEqualizerContext; } 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] = { 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_DBLP, AV_SAMPLE_FMT_NONE },
{ AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE },
@ -120,13 +122,11 @@ static int query_formats(AVFilterContext *ctx)
}; };
int ret; int ret;
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[s->precision])) < 0)
return ret; return ret;
if ((ret = ff_set_common_formats_from_list(ctx, sample_fmts[s->precision])) < 0) return 0;
return ret;
return ff_set_common_all_samplerates(ctx);
} }
static double get_coef(double x, double sr) static double get_coef(double x, double sr)
@ -281,7 +281,7 @@ const AVFilter ff_af_adynamicequalizer = {
.uninit = uninit, .uninit = uninit,
FILTER_INPUTS(inputs), FILTER_INPUTS(inputs),
FILTER_OUTPUTS(ff_audio_default_filterpad), FILTER_OUTPUTS(ff_audio_default_filterpad),
FILTER_QUERY_FUNC(query_formats), FILTER_QUERY_FUNC2(query_formats),
.flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL |
AVFILTER_FLAG_SLICE_THREADS, AVFILTER_FLAG_SLICE_THREADS,
.process_command = ff_filter_process_command, .process_command = ff_filter_process_command,