lavfi/asrc_hilbert: convert to query_func2()

pull/153/merge
Anton Khirnov 4 months ago
parent 21d2be1088
commit 66c9457387
  1. 12
      libavfilter/asrc_hilbert.c

@ -75,7 +75,9 @@ static av_cold void uninit(AVFilterContext *ctx)
av_freep(&s->taps); av_freep(&s->taps);
} }
static av_cold int query_formats(AVFilterContext *ctx) static av_cold int query_formats(const AVFilterContext *ctx,
AVFilterFormatsConfig **cfg_in,
AVFilterFormatsConfig **cfg_out)
{ {
HilbertContext *s = ctx->priv; HilbertContext *s = ctx->priv;
static const AVChannelLayout chlayouts[] = { AV_CHANNEL_LAYOUT_MONO, { 0 } }; static const AVChannelLayout chlayouts[] = { AV_CHANNEL_LAYOUT_MONO, { 0 } };
@ -84,15 +86,15 @@ static av_cold int query_formats(AVFilterContext *ctx)
AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLT,
AV_SAMPLE_FMT_NONE AV_SAMPLE_FMT_NONE
}; };
int ret = ff_set_common_formats_from_list(ctx, sample_fmts); int ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, sample_fmts);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = ff_set_common_channel_layouts_from_list(ctx, chlayouts); ret = ff_set_common_channel_layouts_from_list2(ctx, cfg_in, cfg_out, chlayouts);
if (ret < 0) if (ret < 0)
return ret; return ret;
return ff_set_common_samplerates_from_list(ctx, sample_rates); return ff_set_common_samplerates_from_list2(ctx, cfg_in, cfg_out, sample_rates);
} }
static av_cold int config_props(AVFilterLink *outlink) static av_cold int config_props(AVFilterLink *outlink)
@ -168,6 +170,6 @@ const AVFilter ff_asrc_hilbert = {
.priv_size = sizeof(HilbertContext), .priv_size = sizeof(HilbertContext),
.inputs = NULL, .inputs = NULL,
FILTER_OUTPUTS(hilbert_outputs), FILTER_OUTPUTS(hilbert_outputs),
FILTER_QUERY_FUNC(query_formats), FILTER_QUERY_FUNC2(query_formats),
.priv_class = &hilbert_class, .priv_class = &hilbert_class,
}; };

Loading…
Cancel
Save