Also, drop redundant calls that also happen implicitly in generic code.
Unified · Split
| @@ -80,28 +80,26 @@ static av_cold void uninit(AVFilterContext *ctx) · 79 unmodified lines | ||
| 80 | 80 | av_audio_fifo_free(s->fifo); |
| 81 | 81 | } |
| 82 | 82 | |
| 83 | −static int query_formats(AVFilterContext *ctx) | |
| 83 | +static int query_formats(const AVFilterContext *ctx, | |
| 84 | + AVFilterFormatsConfig **cfg_in, | |
| 85 | + AVFilterFormatsConfig **cfg_out) | |
| 84 | 86 | { |
| 85 | 87 | AVFilterFormats *formats = NULL; |
| 86 | − AVFilterChannelLayouts *layout = NULL; | |
| 87 | − AVFilterLink *inlink = ctx->inputs[0]; | |
| 88 | − AVFilterLink *outlink = ctx->outputs[0]; | |
| 89 | 88 | static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }; |
| 90 | 89 | static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_GBRP, AV_PIX_FMT_NONE }; |
| 90 | + static const AVChannelLayout layouts[] = { AV_CHANNEL_LAYOUT_STEREO, { .nb_channels = 0 } }; | |
| 91 | 91 | int ret; |
| 92 | 92 | |
| 93 | 93 | formats = ff_make_format_list(sample_fmts); |
| 94 | − if ((ret = ff_formats_ref (formats, &inlink->outcfg.formats )) < 0 || | |
| 95 | − (ret = ff_add_channel_layout (&layout, &(AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO)) < 0 || | |
| 96 | − (ret = ff_channel_layouts_ref (layout , &inlink->outcfg.channel_layouts)) < 0) | |
| 94 | + if ((ret = ff_formats_ref(formats, &cfg_in[0]->formats)) < 0) | |
| 97 | 95 | return ret; |
| 98 | 96 | |
| 99 | − formats = ff_all_samplerates(); | |
| 100 | − if ((ret = ff_formats_ref(formats, &inlink->outcfg.samplerates)) < 0) | |
| 97 | + ret = ff_set_common_channel_layouts_from_list2(ctx, cfg_in, cfg_out, layouts); | |
| 98 | + if (ret < 0) | |
| 101 | 99 | return ret; |
| 102 | 100 | |
| 103 | 101 | formats = ff_make_format_list(pix_fmts); |
| 104 | − if ((ret = ff_formats_ref(formats, &outlink->incfg.formats)) < 0) | |
| 102 | + if ((ret = ff_formats_ref(formats, &cfg_out[0]->formats)) < 0) | |
| 105 | 103 | return ret; |
| 106 | 104 | |
| 107 | 105 | return 0; |
| @@ -330,7 +328,7 @@ const AVFilter ff_avf_showspatial = { · 222 unmodified lines | ||
| 330 | 328 | .priv_size = sizeof(ShowSpatialContext), |
| 331 | 329 | FILTER_INPUTS(ff_audio_default_filterpad), |
| 332 | 330 | FILTER_OUTPUTS(showspatial_outputs), |
| 333 | − FILTER_QUERY_FUNC(query_formats), | |
| 331 | + FILTER_QUERY_FUNC2(query_formats), | |
| 334 | 332 | .activate = spatial_activate, |
| 335 | 333 | .priv_class = &showspatial_class, |
| 336 | 334 | .flags = AVFILTER_FLAG_SLICE_THREADS, |