virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavfi/af_lv2: convert to query_func2()

Browse Source
This commit is contained in:
Anton Khirnov 2024-09-05 10:52:38 +02:00
parent 363d4a7559
commit d0f4c08207
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libavfilter/af_lv2.c
View File

@ -474,25 +474,22 @@ static av_cold int init(AVFilterContext *ctx)
return 0; return 0;
} }
static int query_formats(AVFilterContext *ctx) static int query_formats(const AVFilterContext *ctx,
AVFilterFormatsConfig **cfg_in,
AVFilterFormatsConfig **cfg_out)
{ {
LV2Context *s = ctx->priv; const LV2Context *s = ctx->priv;
AVFilterChannelLayouts *layouts; AVFilterChannelLayouts *layouts;
AVFilterLink *outlink = ctx->outputs[0];
static const enum AVSampleFormat sample_fmts[] = { static const enum AVSampleFormat sample_fmts[] = {
AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }; AV_SAMPLE_FMT_FLTP, 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;
if (s->nb_inputs) { if (!s->nb_inputs) {
ret = ff_set_common_all_samplerates(ctx);
if (ret < 0)
return ret;
} else {
int sample_rates[] = { s->sample_rate, -1 }; int sample_rates[] = { s->sample_rate, -1 };
ret = ff_set_common_samplerates_from_list(ctx, sample_rates); ret = ff_set_common_samplerates_from_list2(ctx, cfg_in, cfg_out, sample_rates);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
@ -502,24 +499,23 @@ static int query_formats(AVFilterContext *ctx)
ret = ff_add_channel_layout(&layouts, &(AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO); ret = ff_add_channel_layout(&layouts, &(AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = ff_set_common_channel_layouts(ctx, layouts); ret = ff_set_common_channel_layouts2(ctx, cfg_in, cfg_out, layouts);
if (ret < 0) if (ret < 0)
return ret; return ret;
} else { } else {
if (s->nb_inputs >= 1) { if (s->nb_inputs >= 1) {
AVFilterLink *inlink = ctx->inputs[0];
AVChannelLayout inlayout = FF_COUNT2LAYOUT(s->nb_inputs); AVChannelLayout inlayout = FF_COUNT2LAYOUT(s->nb_inputs);
layouts = NULL; layouts = NULL;
ret = ff_add_channel_layout(&layouts, &inlayout); ret = ff_add_channel_layout(&layouts, &inlayout);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = ff_channel_layouts_ref(layouts, &inlink->outcfg.channel_layouts); ret = ff_channel_layouts_ref(layouts, &cfg_in[0]->channel_layouts);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (!s->nb_outputs) { if (!s->nb_outputs) {
ret = ff_channel_layouts_ref(layouts, &outlink->incfg.channel_layouts); ret = ff_channel_layouts_ref(layouts, &cfg_out[0]->channel_layouts);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
@ -532,7 +528,7 @@ static int query_formats(AVFilterContext *ctx)
ret = ff_add_channel_layout(&layouts, &outlayout); ret = ff_add_channel_layout(&layouts, &outlayout);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = ff_channel_layouts_ref(layouts, &outlink->incfg.channel_layouts); ret = ff_channel_layouts_ref(layouts, &cfg_out[0]->channel_layouts);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
@ -604,6 +600,6 @@ const AVFilter ff_af_lv2 = {
.process_command = process_command, .process_command = process_command,
.inputs = 0, .inputs = 0,
FILTER_OUTPUTS(lv2_outputs), FILTER_OUTPUTS(lv2_outputs),
FILTER_QUERY_FUNC(query_formats), FILTER_QUERY_FUNC2(query_formats),
.flags = AVFILTER_FLAG_DYNAMIC_INPUTS, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS,
}; };