har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavfi/af_hdcd: convert to query_func2()

Browse Source
This commit is contained in:
Anton Khirnov 2024-09-04 14:43:33 +02:00
parent 0ec382f494
commit c9c6f07436
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libavfilter/af_hdcd.c
View File

@ -1601,8 +1601,15 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
return ff_filter_frame(outlink, out); return ff_filter_frame(outlink, out);
} }
static int query_formats(AVFilterContext *ctx) static int query_formats(const AVFilterContext *ctx,
AVFilterFormatsConfig **cfg_in,
AVFilterFormatsConfig **cfg_out)
{ {
static const AVChannelLayout layouts[] = {
AV_CHANNEL_LAYOUT_MONO,
AV_CHANNEL_LAYOUT_STEREO,
{ .nb_channels = 0 },
};
static const int sample_rates[] = { static const int sample_rates[] = {
44100, 48000, 44100, 48000,
88200, 96000, 88200, 96000,
@ -1611,9 +1618,6 @@ static int query_formats(AVFilterContext *ctx)
}; };
AVFilterFormats *in_formats; AVFilterFormats *in_formats;
AVFilterFormats *out_formats; AVFilterFormats *out_formats;
AVFilterChannelLayouts *layouts = NULL;
AVFilterLink *inlink = ctx->inputs[0];
AVFilterLink *outlink = ctx->outputs[0];
static const enum AVSampleFormat sample_fmts_in[] = { static const enum AVSampleFormat sample_fmts_in[] = {
AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16,
@ -1628,28 +1632,21 @@ static int query_formats(AVFilterContext *ctx)
}; };
int ret; int ret;
ret = ff_add_channel_layout(&layouts, &(AVChannelLayout)AV_CHANNEL_LAYOUT_MONO); ret = ff_set_common_channel_layouts_from_list2(ctx, cfg_in, cfg_out, layouts);
if (ret < 0)
return ret;
ret = ff_add_channel_layout(&layouts, &(AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO);
if (ret < 0)
return ret;
ret = ff_set_common_channel_layouts(ctx, layouts);
if (ret < 0) if (ret < 0)
return ret; return ret;
in_formats = ff_make_format_list(sample_fmts_in); in_formats = ff_make_format_list(sample_fmts_in);
ret = ff_formats_ref(in_formats, &inlink->outcfg.formats); ret = ff_formats_ref(in_formats, &cfg_in[0]->formats);
if (ret < 0) if (ret < 0)
return ret; return ret;
out_formats = ff_make_format_list(sample_fmts_out); out_formats = ff_make_format_list(sample_fmts_out);
ret = ff_formats_ref(out_formats, &outlink->incfg.formats); ret = ff_formats_ref(out_formats, &cfg_out[0]->formats);
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 void uninit(AVFilterContext *ctx) static av_cold void uninit(AVFilterContext *ctx)
@ -1770,5 +1767,5 @@ const AVFilter ff_af_hdcd = {
.uninit = uninit, .uninit = uninit,
FILTER_INPUTS(avfilter_af_hdcd_inputs), FILTER_INPUTS(avfilter_af_hdcd_inputs),
FILTER_OUTPUTS(ff_audio_default_filterpad), FILTER_OUTPUTS(ff_audio_default_filterpad),
FILTER_QUERY_FUNC(query_formats), FILTER_QUERY_FUNC2(query_formats),
}; };