lavfi/af_acrossover: 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 079834e1 parent edf53e11 file · +8 −8Browse files

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

Unified · Split

libavfilter/af_acrossover.c+8−8

@@ -108,9 +108,11 @@ static const AVOption acrossover_options[] = { · 107 unmodified lines
108	108
109	109	AVFILTER_DEFINE_CLASS(acrossover);
110	110
111		−static int query_formats(AVFilterContext *ctx)
	111	+static int query_formats(const AVFilterContext *ctx,
	112	+ AVFilterFormatsConfig **cfg_in,
	113	+ AVFilterFormatsConfig **cfg_out)
112	114	{
113		− AudioCrossoverContext *s = ctx->priv;
	115	+ const AudioCrossoverContext *s = ctx->priv;
114	116	static const enum AVSampleFormat auto_sample_fmts[] = {
115	117	AV_SAMPLE_FMT_FLTP,
116	118	AV_SAMPLE_FMT_DBLP,
@@ -121,9 +123,7 @@ static int query_formats(AVFilterContext *ctx) · 4 unmodified lines
121	123	AV_SAMPLE_FMT_NONE
122	124	};
123	125	const enum AVSampleFormat *sample_fmts_list = sample_fmts;
124		− int ret = ff_set_common_all_channel_counts(ctx);
125		− if (ret < 0)
126		− return ret;
	126	+ int ret;
127	127
128	128	switch (s->precision) {
129	129	case 0:
@@ -138,11 +138,11 @@ static int query_formats(AVFilterContext *ctx) · 8 unmodified lines
138	138	default:
139	139	break;
140	140	}
141		− ret = ff_set_common_formats_from_list(ctx, sample_fmts_list);
	141	+ ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, sample_fmts_list);
142	142	if (ret < 0)
143	143	return ret;
144	144
145		− return ff_set_common_all_samplerates(ctx);
	145	+ return 0;
146	146	}
147	147
148	148	static int parse_gains(AVFilterContext *ctx)
@@ -627,7 +627,7 @@ const AVFilter ff_af_acrossover = { · 478 unmodified lines
627	627	.uninit = uninit,
628	628	FILTER_INPUTS(inputs),
629	629	.outputs = NULL,
630		− FILTER_QUERY_FUNC(query_formats),
	630	+ FILTER_QUERY_FUNC2(query_formats),
631	631	.flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS \|
632	632	AVFILTER_FLAG_SLICE_THREADS,
633	633	};

lavfi/af_acrossover: convert to query_func2()

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code