RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavfi/asrc_flite: convert to query_func2()

This commit is contained in:
Anton Khirnov 2024-09-09 17:29:04 +02:00
parent 9335af9acc
commit 21d2be1088
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libavfilter/asrc_flite.c
View File

@ -255,24 +255,35 @@ static av_cold void uninit(AVFilterContext *ctx)
av_audio_fifo_free(flite->fifo); av_audio_fifo_free(flite->fifo);
} }
static int query_formats(AVFilterContext *ctx) static int query_formats(const AVFilterContext *ctx,
AVFilterFormatsConfig **cfg_in,
AVFilterFormatsConfig **cfg_out)
{ {
FliteContext *flite = ctx->priv; const FliteContext *flite = ctx->priv;
static const enum AVSampleFormat formats[] = {
AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE,
};
int sample_rates[] = { flite->sample_rate, -1 };
AVChannelLayout layouts[2] = {
{ .nb_channels = 0 },
};
int ret; int ret;
AVFilterChannelLayouts *chlayouts = NULL; av_channel_layout_default(&layouts[0], flite->nb_channels);
AVFilterFormats *sample_formats = NULL;
AVFilterFormats *sample_rates = NULL;
AVChannelLayout chlayout = { 0 };
av_channel_layout_default(&chlayout, flite->nb_channels); ret = ff_set_common_channel_layouts_from_list2(ctx, cfg_in, cfg_out, layouts);
if (ret < 0)
return ret;
if ((ret = ff_add_channel_layout (&chlayouts , &chlayout )) < 0 || ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, formats);
(ret = ff_set_common_channel_layouts (ctx , chlayouts )) < 0 || if (ret < 0)
(ret = ff_add_format (&sample_formats, AV_SAMPLE_FMT_S16 )) < 0 || return ret;
(ret = ff_set_common_formats (ctx , sample_formats )) < 0 ||
(ret = ff_add_format (&sample_rates , flite->sample_rate )) < 0 || ret = ff_set_common_samplerates_from_list2(ctx, cfg_in, cfg_out, sample_rates);
(ret = ff_set_common_samplerates (ctx , sample_rates )) < 0) if (ret < 0)
return ret; return ret;
return 0; return 0;
@ -348,6 +359,6 @@ const AVFilter ff_asrc_flite = {
.activate = activate, .activate = activate,
.inputs = NULL, .inputs = NULL,
FILTER_OUTPUTS(flite_outputs), FILTER_OUTPUTS(flite_outputs),
FILTER_QUERY_FUNC(query_formats), FILTER_QUERY_FUNC2(query_formats),
.priv_class = &flite_class, .priv_class = &flite_class,
}; };