ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-18 20:43:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

lavfi/af_apulsator: convert to query_func2()

Browse Source 
Also, simplify code, and drop a redundant call that also happens
implicitly in generic code.
This commit is contained in:
Anton Khirnov 2024-08-30 21:56:02 +02:00
parent 6f2adb7967
commit c24e0df30b
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libavfilter/af_apulsator.c
View File

@ -185,19 +185,30 @@ 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)
{ {
AVFilterChannelLayouts *layout = NULL; static const enum AVSampleFormat formats[] = {
AVFilterFormats *formats = NULL; AV_SAMPLE_FMT_DBL,
AV_SAMPLE_FMT_NONE,
};
static const AVChannelLayout layouts[] = {
(AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO,
(AVChannelLayout){ .nb_channels = 0 },
};
int ret; int ret;
if ((ret = ff_add_format (&formats, AV_SAMPLE_FMT_DBL )) < 0 || ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, formats);
(ret = ff_set_common_formats (ctx , formats )) < 0 || if (ret < 0)
(ret = ff_add_channel_layout (&layout , &(AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO)) < 0 ||
(ret = ff_set_common_channel_layouts (ctx , layout )) < 0)
return ret; return ret;
return ff_set_common_all_samplerates(ctx); ret = ff_set_common_channel_layouts_from_list2(ctx, cfg_in, cfg_out, layouts);
if (ret < 0)
return ret;
return 0;
} }
static int config_input(AVFilterLink *inlink) static int config_input(AVFilterLink *inlink)
@ -245,5 +256,5 @@ const AVFilter ff_af_apulsator = {
.priv_class = &apulsator_class, .priv_class = &apulsator_class,
FILTER_INPUTS(inputs), FILTER_INPUTS(inputs),
FILTER_OUTPUTS(ff_audio_default_filterpad), FILTER_OUTPUTS(ff_audio_default_filterpad),
FILTER_QUERY_FUNC(query_formats), FILTER_QUERY_FUNC2(query_formats),
}; };