mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
lavfi/af_volume: convert to query_func2()
Also, drop redundant calls that also happen implicitly in generic code.
This commit is contained in:
parent
e13592c22d
commit
7887d00ee6
@ -130,9 +130,11 @@ static av_cold void uninit(AVFilterContext *ctx)
|
||||
av_freep(&vol->fdsp);
|
||||
}
|
||||
|
||||
static int query_formats(AVFilterContext *ctx)
|
||||
static int query_formats(const AVFilterContext *ctx,
|
||||
AVFilterFormatsConfig **cfg_in,
|
||||
AVFilterFormatsConfig **cfg_out)
|
||||
{
|
||||
VolumeContext *vol = ctx->priv;
|
||||
const VolumeContext *vol = ctx->priv;
|
||||
static const enum AVSampleFormat sample_fmts[][7] = {
|
||||
[PRECISION_FIXED] = {
|
||||
AV_SAMPLE_FMT_U8,
|
||||
@ -154,15 +156,13 @@ static int query_formats(AVFilterContext *ctx)
|
||||
AV_SAMPLE_FMT_NONE
|
||||
}
|
||||
};
|
||||
int ret = ff_set_common_all_channel_counts(ctx);
|
||||
int ret;
|
||||
|
||||
ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, sample_fmts[vol->precision]);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
ret = ff_set_common_formats_from_list(ctx, sample_fmts[vol->precision]);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
return ff_set_common_all_samplerates(ctx);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline void scale_samples_u8(uint8_t *dst, const uint8_t *src,
|
||||
@ -480,7 +480,7 @@ const AVFilter ff_af_volume = {
|
||||
.uninit = uninit,
|
||||
FILTER_INPUTS(avfilter_af_volume_inputs),
|
||||
FILTER_OUTPUTS(avfilter_af_volume_outputs),
|
||||
FILTER_QUERY_FUNC(query_formats),
|
||||
FILTER_QUERY_FUNC2(query_formats),
|
||||
.flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC,
|
||||
.process_command = process_command,
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user