mirror of https://git.ffmpeg.org/ffmpeg.git
lavfi/asrc_afirsrc: convert to query_func2()
This commit is contained in:
parent
47f87409e3
commit
242dab2ccd
|
@ -113,24 +113,26 @@ static av_cold void uninit(AVFilterContext *ctx)
|
||||||
av_tx_uninit(&s->itx_ctx);
|
av_tx_uninit(&s->itx_ctx);
|
||||||
}
|
}
|
||||||
|
|
||||||
static av_cold int query_formats(AVFilterContext *ctx)
|
static av_cold int query_formats(const AVFilterContext *ctx,
|
||||||
|
AVFilterFormatsConfig **cfg_in,
|
||||||
|
AVFilterFormatsConfig **cfg_out)
|
||||||
{
|
{
|
||||||
AudioFIRSourceContext *s = ctx->priv;
|
const AudioFIRSourceContext *s = ctx->priv;
|
||||||
static const AVChannelLayout chlayouts[] = { AV_CHANNEL_LAYOUT_MONO, { 0 } };
|
static const AVChannelLayout chlayouts[] = { AV_CHANNEL_LAYOUT_MONO, { 0 } };
|
||||||
int sample_rates[] = { s->sample_rate, -1 };
|
int sample_rates[] = { s->sample_rate, -1 };
|
||||||
static const enum AVSampleFormat sample_fmts[] = {
|
static const enum AVSampleFormat sample_fmts[] = {
|
||||||
AV_SAMPLE_FMT_FLT,
|
AV_SAMPLE_FMT_FLT,
|
||||||
AV_SAMPLE_FMT_NONE
|
AV_SAMPLE_FMT_NONE
|
||||||
};
|
};
|
||||||
int ret = ff_set_common_formats_from_list(ctx, sample_fmts);
|
int ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, sample_fmts);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
ret = ff_set_common_channel_layouts_from_list(ctx, chlayouts);
|
ret = ff_set_common_channel_layouts_from_list2(ctx, cfg_in, cfg_out, chlayouts);
|
||||||
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 int parse_string(char *str, float **items, int *nb_items, int *items_size)
|
static int parse_string(char *str, float **items, int *nb_items, int *items_size)
|
||||||
|
@ -304,7 +306,7 @@ const AVFilter ff_asrc_afirsrc = {
|
||||||
.priv_size = sizeof(AudioFIRSourceContext),
|
.priv_size = sizeof(AudioFIRSourceContext),
|
||||||
.inputs = NULL,
|
.inputs = NULL,
|
||||||
FILTER_OUTPUTS(afirsrc_outputs),
|
FILTER_OUTPUTS(afirsrc_outputs),
|
||||||
FILTER_QUERY_FUNC(query_formats),
|
FILTER_QUERY_FUNC2(query_formats),
|
||||||
.priv_class = &afirsrc_class,
|
.priv_class = &afirsrc_class,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -585,6 +587,6 @@ const AVFilter ff_asrc_afireqsrc = {
|
||||||
.priv_size = sizeof(AudioFIRSourceContext),
|
.priv_size = sizeof(AudioFIRSourceContext),
|
||||||
.inputs = NULL,
|
.inputs = NULL,
|
||||||
FILTER_OUTPUTS(afireqsrc_outputs),
|
FILTER_OUTPUTS(afireqsrc_outputs),
|
||||||
FILTER_QUERY_FUNC(query_formats),
|
FILTER_QUERY_FUNC2(query_formats),
|
||||||
.priv_class = &afireqsrc_class,
|
.priv_class = &afireqsrc_class,
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue