lavfi/af_earwax: convert to query_func2()

This commit is contained in:
Anton Khirnov 2024-09-03 10:32:45 +02:00
parent e37d1efe65
commit 7896b95430
1 changed files with 22 additions and 9 deletions

View File

@ -79,19 +79,32 @@ typedef struct EarwaxContext {
AVFrame *frame[2];
} EarwaxContext;
static int query_formats(AVFilterContext *ctx)
static int query_formats(const AVFilterContext *ctx,
AVFilterFormatsConfig **cfg_in,
AVFilterFormatsConfig **cfg_out)
{
static const enum AVSampleFormat formats[] = {
AV_SAMPLE_FMT_S16P,
AV_SAMPLE_FMT_NONE,
};
static const AVChannelLayout layouts[] = {
AV_CHANNEL_LAYOUT_STEREO,
{ .nb_channels = 0 },
};
static const int sample_rates[] = { 44100, -1 };
int ret;
AVFilterFormats *formats = NULL;
AVFilterChannelLayouts *layout = NULL;
ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, formats);
if (ret < 0)
return ret;
if ((ret = ff_add_format (&formats, AV_SAMPLE_FMT_S16P )) < 0 ||
(ret = ff_set_common_formats (ctx , formats )) < 0 ||
(ret = ff_add_channel_layout (&layout , &(AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO)) < 0 ||
(ret = ff_set_common_channel_layouts (ctx , layout )) < 0 ||
(ret = ff_set_common_samplerates_from_list(ctx, sample_rates)) < 0)
ret = ff_set_common_samplerates_from_list2(ctx, cfg_in, cfg_out, sample_rates);
if (ret < 0)
return ret;
ret = ff_set_common_channel_layouts_from_list2(ctx, cfg_in, cfg_out, layouts);
if (ret < 0)
return ret;
return 0;
@ -230,5 +243,5 @@ const AVFilter ff_af_earwax = {
.uninit = uninit,
FILTER_INPUTS(earwax_inputs),
FILTER_OUTPUTS(ff_audio_default_filterpad),
FILTER_QUERY_FUNC(query_formats),
FILTER_QUERY_FUNC2(query_formats),
};