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

Anton Khirnov committed 2 years ago

Commit edf53e11 parent 0f004a01 file · +8 −8Browse files

Showing the changes to libavfilter (1 of 1 file). Show all

Unified · Split

@@ -95,9 +95,11 @@ static const AVOption aap_options[] = { · 94 unmodified lines
95	95
96	96	AVFILTER_DEFINE_CLASS(aap);
97	97
98		−static int query_formats(AVFilterContext *ctx)
	98	+static int query_formats(const AVFilterContext *ctx,
	99	+ AVFilterFormatsConfig **cfg_in,
	100	+ AVFilterFormatsConfig **cfg_out)
99	101	{
100		− AudioAPContext *s = ctx->priv;
	102	+ const AudioAPContext *s = ctx->priv;
101	103	static const enum AVSampleFormat sample_fmts[3][3] = {
102	104	{ AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP, AV_SAMPLE_FMT_NONE },
103	105	{ AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE },
@@ -105,13 +107,11 @@ static int query_formats(AVFilterContext *ctx) · 1 unmodified line
105	107	};
106	108	int ret;
107	109
108		− if ((ret = ff_set_common_all_channel_counts(ctx)) < 0)
109		− return ret;
110		−
111		− if ((ret = ff_set_common_formats_from_list(ctx, sample_fmts[s->precision])) < 0)
	110	+ if ((ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
	111	+ sample_fmts[s->precision])) < 0)
112	112	return ret;
113	113
114		− return ff_set_common_all_samplerates(ctx);
	114	+ return 0;
115	115	}
116	116
117	117	static int activate(AVFilterContext *ctx)
@@ -325,7 +325,7 @@ const AVFilter ff_af_aap = { · 207 unmodified lines
325	325	.activate = activate,
326	326	FILTER_INPUTS(inputs),
327	327	FILTER_OUTPUTS(outputs),
328		− FILTER_QUERY_FUNC(query_formats),
	328	+ FILTER_QUERY_FUNC2(query_formats),
329	329	.flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL \|
330	330	AVFILTER_FLAG_SLICE_THREADS,
331	331	.process_command = ff_filter_process_command,

Keyboard shortcuts