mirrors/librempeg
1
0
Fork 0
mirror of https://github.com/librempeg/librempeg synced 2024-11-22 17:54:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

lavfi/af_aap: 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.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Anton Khirnov 2024-08-29 09:10:01 +02:00 committed by Paul B Mahol
parent 71a8d3e9a9
commit 86b58ea4b7
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_aap.c
View File

@ -95,9 +95,11 @@ static const AVOption aap_options[] = {
AVFILTER_DEFINE_CLASS(aap); AVFILTER_DEFINE_CLASS(aap);
static int query_formats(AVFilterContext *ctx) static int query_formats(const AVFilterContext *ctx,
AVFilterFormatsConfig **cfg_in,
AVFilterFormatsConfig **cfg_out)
{ {
AudioAPContext *s = ctx->priv; const AudioAPContext *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 },
@ -105,13 +107,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 int activate(AVFilterContext *ctx) static int activate(AVFilterContext *ctx)
@ -325,7 +325,7 @@ const AVFilter ff_af_aap = {
.activate = activate, .activate = activate,
FILTER_INPUTS(inputs), FILTER_INPUTS(inputs),
FILTER_OUTPUTS(outputs), FILTER_OUTPUTS(outputs),
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,