RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavfi/af_afir: 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.
This commit is contained in:
Anton Khirnov 2024-08-29 09:10:01 +02:00
parent 584be51334
commit dc488d832c
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavfilter/af_afir.c
View File

@ -539,9 +539,11 @@ static int activate(AVFilterContext *ctx)
return FFERROR_NOT_READY; return FFERROR_NOT_READY;
} }
static int query_formats(AVFilterContext *ctx) static int query_formats(const AVFilterContext *ctx,
AVFilterFormatsConfig **cfg_in,
AVFilterFormatsConfig **cfg_out)
{ {
AudioFIRContext *s = ctx->priv; const AudioFIRContext *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 },
@ -549,32 +551,29 @@ static int query_formats(AVFilterContext *ctx)
}; };
int ret; int ret;
if (s->ir_format) { if (!s->ir_format) {
ret = ff_set_common_all_channel_counts(ctx);
if (ret < 0)
return ret;
} else {
AVFilterChannelLayouts *mono = NULL; AVFilterChannelLayouts *mono = NULL;
AVFilterChannelLayouts *layouts = ff_all_channel_counts(); AVFilterChannelLayouts *layouts = ff_all_channel_counts();
if ((ret = ff_channel_layouts_ref(layouts, &ctx->inputs[0]->outcfg.channel_layouts)) < 0) if ((ret = ff_channel_layouts_ref(layouts, &cfg_in[0]->channel_layouts)) < 0)
return ret; return ret;
if ((ret = ff_channel_layouts_ref(layouts, &ctx->outputs[0]->incfg.channel_layouts)) < 0) if ((ret = ff_channel_layouts_ref(layouts, &cfg_out[0]->channel_layouts)) < 0)
return ret; return ret;
ret = ff_add_channel_layout(&mono, &(AVChannelLayout)AV_CHANNEL_LAYOUT_MONO); ret = ff_add_channel_layout(&mono, &(AVChannelLayout)AV_CHANNEL_LAYOUT_MONO);
if (ret) if (ret)
return ret; return ret;
for (int i = 1; i < ctx->nb_inputs; i++) { for (int i = 1; i < ctx->nb_inputs; i++) {
if ((ret = ff_channel_layouts_ref(mono, &ctx->inputs[i]->outcfg.channel_layouts)) < 0) if ((ret = ff_channel_layouts_ref(mono, &cfg_in[i]->channel_layouts)) < 0)
return ret; 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 ret;
return ff_set_common_all_samplerates(ctx); return 0;
} }
static int config_output(AVFilterLink *outlink) static int config_output(AVFilterLink *outlink)
@ -783,7 +782,7 @@ const AVFilter ff_af_afir = {
.description = NULL_IF_CONFIG_SMALL("Apply Finite Impulse Response filter with supplied coefficients in additional stream(s)."), .description = NULL_IF_CONFIG_SMALL("Apply Finite Impulse Response filter with supplied coefficients in additional stream(s)."),
.priv_size = sizeof(AudioFIRContext), .priv_size = sizeof(AudioFIRContext),
.priv_class = &afir_class, .priv_class = &afir_class,
FILTER_QUERY_FUNC(query_formats), FILTER_QUERY_FUNC2(query_formats),
FILTER_OUTPUTS(outputs), FILTER_OUTPUTS(outputs),
.init = init, .init = init,
.activate = activate, .activate = activate,