Unified · Split
| @@ -113,24 +113,26 @@ static av_cold void uninit(AVFilterContext *ctx) · 112 unmodified lines | |||
| 113 | av_tx_uninit(&s->itx_ctx); | 113 | av_tx_uninit(&s->itx_ctx); |
| 114 | } | 114 | } |
| 115 | 115 | ||
| 116 | static av_cold int query_formats(AVFilterContext *ctx) | 116 | static av_cold int query_formats(const AVFilterContext *ctx, |
| 117 | AVFilterFormatsConfig **cfg_in, | ||
| 118 | AVFilterFormatsConfig **cfg_out) | ||
| 117 | { | 119 | { |
| 118 | AudioFIRSourceContext *s = ctx->priv; | 120 | const AudioFIRSourceContext *s = ctx->priv; |
| 119 | static const AVChannelLayout chlayouts[] = { AV_CHANNEL_LAYOUT_MONO, { 0 } }; | 121 | static const AVChannelLayout chlayouts[] = { AV_CHANNEL_LAYOUT_MONO, { 0 } }; |
| 120 | int sample_rates[] = { s->sample_rate, -1 }; | 122 | int sample_rates[] = { s->sample_rate, -1 }; |
| 121 | static const enum AVSampleFormat sample_fmts[] = { | 123 | static const enum AVSampleFormat sample_fmts[] = { |
| 122 | AV_SAMPLE_FMT_FLT, | 124 | AV_SAMPLE_FMT_FLT, |
| 123 | AV_SAMPLE_FMT_NONE | 125 | AV_SAMPLE_FMT_NONE |
| 124 | }; | 126 | }; |
| 125 | int ret = ff_set_common_formats_from_list(ctx, sample_fmts); | 127 | int ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, sample_fmts); |
| 126 | if (ret < 0) | 128 | if (ret < 0) |
| 127 | return ret; | 129 | return ret; |
| 128 | 130 | ||
| 129 | ret = ff_set_common_channel_layouts_from_list(ctx, chlayouts); | 131 | ret = ff_set_common_channel_layouts_from_list2(ctx, cfg_in, cfg_out, chlayouts); |
| 130 | if (ret < 0) | 132 | if (ret < 0) |
| 131 | return ret; | 133 | return ret; |
| 132 | 134 | ||
| 133 | return ff_set_common_samplerates_from_list(ctx, sample_rates); | 135 | return ff_set_common_samplerates_from_list2(ctx, cfg_in, cfg_out, sample_rates); |
| 134 | } | 136 | } |
| 135 | 137 | ||
| 136 | static int parse_string(char *str, float **items, int *nb_items, int *items_size) | 138 | static int parse_string(char *str, float **items, int *nb_items, int *items_size) |
| @@ -304,7 +306,7 @@ const AVFilter ff_asrc_afirsrc = { · 167 unmodified lines | |||
| 304 | .priv_size = sizeof(AudioFIRSourceContext), | 306 | .priv_size = sizeof(AudioFIRSourceContext), |
| 305 | .inputs = NULL, | 307 | .inputs = NULL, |
| 306 | FILTER_OUTPUTS(afirsrc_outputs), | 308 | FILTER_OUTPUTS(afirsrc_outputs), |
| 307 | FILTER_QUERY_FUNC(query_formats), | 309 | FILTER_QUERY_FUNC2(query_formats), |
| 308 | .priv_class = &afirsrc_class, | 310 | .priv_class = &afirsrc_class, |
| 309 | }; | 311 | }; |
| 310 | 312 | ||
| @@ -585,6 +587,6 @@ const AVFilter ff_asrc_afireqsrc = { · 274 unmodified lines | |||
| 585 | .priv_size = sizeof(AudioFIRSourceContext), | 587 | .priv_size = sizeof(AudioFIRSourceContext), |
| 586 | .inputs = NULL, | 588 | .inputs = NULL, |
| 587 | FILTER_OUTPUTS(afireqsrc_outputs), | 589 | FILTER_OUTPUTS(afireqsrc_outputs), |
| 588 | FILTER_QUERY_FUNC(query_formats), | 590 | FILTER_QUERY_FUNC2(query_formats), |
| 589 | .priv_class = &afireqsrc_class, | 591 | .priv_class = &afireqsrc_class, |
| 590 | }; | 592 | }; |