mirror of https://git.ffmpeg.org/ffmpeg.git
lavfi/af_anlms: convert to query_func2()
Also, drop redundant calls that also happen implicitly in generic code.
This commit is contained in:
parent
e0ab1fcc8c
commit
6f2adb7967
|
@ -87,9 +87,11 @@ static const AVOption anlms_options[] = {
|
||||||
|
|
||||||
AVFILTER_DEFINE_CLASS_EXT(anlms, "anlm(f|s)", anlms_options);
|
AVFILTER_DEFINE_CLASS_EXT(anlms, "anlm(f|s)", anlms_options);
|
||||||
|
|
||||||
static int query_formats(AVFilterContext *ctx)
|
static int query_formats(const AVFilterContext *ctx,
|
||||||
|
AVFilterFormatsConfig **cfg_in,
|
||||||
|
AVFilterFormatsConfig **cfg_out)
|
||||||
{
|
{
|
||||||
AudioNLMSContext *s = ctx->priv;
|
const AudioNLMSContext *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 },
|
||||||
|
@ -97,13 +99,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)
|
||||||
|
@ -277,7 +277,7 @@ const AVFilter ff_af_anlmf = {
|
||||||
.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,
|
||||||
|
|
Loading…
Reference in New Issue