Drop redundant ff_set_common_all_channel_counts() / ff_set_common_all_samplerates() calls, since those happen implicitly in generic code.
Unified · Split
| @@ -78,9 +78,11 @@ typedef struct AudioIIRContext { · 77 unmodified lines | |||
| 78 | int (*iir_channel)(AVFilterContext *ctx, void *arg, int ch, int nb_jobs); | 78 | int (*iir_channel)(AVFilterContext *ctx, void *arg, int ch, int nb_jobs); |
| 79 | } AudioIIRContext; | 79 | } AudioIIRContext; |
| 80 | 80 | ||
| 81 | static int query_formats(AVFilterContext *ctx) | 81 | static int query_formats(const AVFilterContext *ctx, |
| 82 | AVFilterFormatsConfig **cfg_in, | ||
| 83 | AVFilterFormatsConfig **cfg_out) | ||
| 82 | { | 84 | { |
| 83 | AudioIIRContext *s = ctx->priv; | 85 | const AudioIIRContext *s = ctx->priv; |
| 84 | AVFilterFormats *formats; | 86 | AVFilterFormats *formats; |
| 85 | enum AVSampleFormat sample_fmts[] = { | 87 | enum AVSampleFormat sample_fmts[] = { |
| 86 | AV_SAMPLE_FMT_DBLP, | 88 | AV_SAMPLE_FMT_DBLP, |
| @@ -93,23 +95,17 @@ static int query_formats(AVFilterContext *ctx) · 6 unmodified lines | |||
| 93 | int ret; | 95 | int ret; |
| 94 | 96 | ||
| 95 | if (s->response) { | 97 | if (s->response) { |
| 96 | AVFilterLink *videolink = ctx->outputs[1]; | ||
| 97 | |||
| 98 | formats = ff_make_format_list(pix_fmts); | 98 | formats = ff_make_format_list(pix_fmts); |
| 99 | if ((ret = ff_formats_ref(formats, &videolink->incfg.formats)) < 0) | 99 | if ((ret = ff_formats_ref(formats, &cfg_out[1]->formats)) < 0) |
| 100 | return ret; | 100 | return ret; |
| 101 | } | 101 | } |
| 102 | 102 | ||
| 103 | ret = ff_set_common_all_channel_counts(ctx); | ||
| 104 | if (ret < 0) | ||
| 105 | return ret; | ||
| 106 | |||
| 107 | sample_fmts[0] = s->sample_format; | 103 | sample_fmts[0] = s->sample_format; |
| 108 | ret = ff_set_common_formats_from_list(ctx, sample_fmts); | 104 | ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, sample_fmts); |
| 109 | if (ret < 0) | 105 | if (ret < 0) |
| 110 | return ret; | 106 | return ret; |
| 111 | 107 | ||
| 112 | return ff_set_common_all_samplerates(ctx); | 108 | return 0; |
| 113 | } | 109 | } |
| 114 | 110 | ||
| 115 | #define IIR_CH(name, type, min, max, need_clipping) \ | 111 | #define IIR_CH(name, type, min, max, need_clipping) \ |
| @@ -1572,7 +1568,7 @@ const AVFilter ff_af_aiir = { · 1456 unmodified lines | |||
| 1572 | .init = init, | 1568 | .init = init, |
| 1573 | .uninit = uninit, | 1569 | .uninit = uninit, |
| 1574 | FILTER_INPUTS(inputs), | 1570 | FILTER_INPUTS(inputs), |
| 1575 | FILTER_QUERY_FUNC(query_formats), | 1571 | FILTER_QUERY_FUNC2(query_formats), |
| 1576 | .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS | | 1572 | .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS | |
| 1577 | AVFILTER_FLAG_SLICE_THREADS, | 1573 | AVFILTER_FLAG_SLICE_THREADS, |
| 1578 | }; | 1574 | }; |