diff options
| author | Anton Khirnov <anton@khirnov.net> | 2024-09-04 15:11:22 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2024-09-09 17:26:18 +0200 |
| commit | 2ee4625d4bac1991c715a95a6fea042071c6a795 (patch) | |
| tree | 9dba28847396f3c54781eac9f23e3f95137dc46b /libavfilter | |
| parent | 7887d00ee6e29100b6d65be75fe17e183d402e89 (diff) | |
| download | ffmpeg-2ee4625d4bac1991c715a95a6fea042071c6a795.tar.gz | |
lavfi/af_virtualbass: convert to query_func2()
Also, drop redundant calls that also happen implicitly in generic code.
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/af_virtualbass.c | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/libavfilter/af_virtualbass.c b/libavfilter/af_virtualbass.c index 232e5fe48a..d2f28ab1a1 100644 --- a/libavfilter/af_virtualbass.c +++ b/libavfilter/af_virtualbass.c @@ -48,21 +48,29 @@ static const AVOption virtualbass_options[] = { AVFILTER_DEFINE_CLASS(virtualbass); -static int query_formats(AVFilterContext *ctx) +static int query_formats(const AVFilterContext *ctx, + AVFilterFormatsConfig **cfg_in, + AVFilterFormatsConfig **cfg_out) { + static const enum AVSampleFormat formats[] = { + AV_SAMPLE_FMT_DBLP, + AV_SAMPLE_FMT_NONE, + }; + AVFilterChannelLayouts *in_layout = NULL, *out_layout = NULL; - AVFilterFormats *formats = NULL; int ret; - if ((ret = ff_add_format (&formats, AV_SAMPLE_FMT_DBLP )) < 0 || - (ret = ff_set_common_formats (ctx, formats )) < 0 || - (ret = ff_add_channel_layout (&in_layout, &(AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO)) < 0 || - (ret = ff_channel_layouts_ref(in_layout, &ctx->inputs[0]->outcfg.channel_layouts)) < 0 || + ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, formats); + if (ret < 0) + return ret; + + if ((ret = ff_add_channel_layout (&in_layout, &(AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO)) < 0 || + (ret = ff_channel_layouts_ref(in_layout, &cfg_in[0]->channel_layouts)) < 0 || (ret = ff_add_channel_layout (&out_layout, &(AVChannelLayout)AV_CHANNEL_LAYOUT_2POINT1)) < 0 || - (ret = ff_channel_layouts_ref(out_layout, &ctx->outputs[0]->incfg.channel_layouts)) < 0) + (ret = ff_channel_layouts_ref(out_layout, &cfg_out[0]->channel_layouts)) < 0) return ret; - return ff_set_common_all_samplerates(ctx); + return 0; } static int config_input(AVFilterLink *inlink) @@ -170,7 +178,7 @@ const AVFilter ff_af_virtualbass = { .priv_class = &virtualbass_class, 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, .process_command = ff_filter_process_command, }; |