Unified · Split
| @@ -149,27 +149,6 @@ static const AVOption astats_options[] = { · 148 unmodified lines | |||
| 149 | 149 | ||
| 150 | AVFILTER_DEFINE_CLASS(astats); | 150 | AVFILTER_DEFINE_CLASS(astats); |
| 151 | 151 | ||
| 152 | static int query_formats(AVFilterContext *ctx) | ||
| 153 | { | ||
| 154 | static const enum AVSampleFormat sample_fmts[] = { | ||
| 155 | AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P, | ||
| 156 | AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_S32P, | ||
| 157 | AV_SAMPLE_FMT_S64, AV_SAMPLE_FMT_S64P, | ||
| 158 | AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, | ||
| 159 | AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP, | ||
| 160 | AV_SAMPLE_FMT_NONE | ||
| 161 | }; | ||
| 162 | int ret = ff_set_common_all_channel_counts(ctx); | ||
| 163 | if (ret < 0) | ||
| 164 | return ret; | ||
| 165 | |||
| 166 | ret = ff_set_common_formats_from_list(ctx, sample_fmts); | ||
| 167 | if (ret < 0) | ||
| 168 | return ret; | ||
| 169 | |||
| 170 | return ff_set_common_all_samplerates(ctx); | ||
| 171 | } | ||
| 172 | |||
| 173 | static void reset_stats(AudioStatsContext *s) | 152 | static void reset_stats(AudioStatsContext *s) |
| 174 | { | 153 | { |
| 175 | int c; | 154 | int c; |
| @@ -868,6 +847,10 @@ const AVFilter ff_af_astats = { · 692 unmodified lines | |||
| 868 | .uninit = uninit, | 847 | .uninit = uninit, |
| 869 | FILTER_INPUTS(astats_inputs), | 848 | FILTER_INPUTS(astats_inputs), |
| 870 | FILTER_OUTPUTS(astats_outputs), | 849 | FILTER_OUTPUTS(astats_outputs), |
| 871 | FILTER_QUERY_FUNC(query_formats), | 850 | FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P, |
| 851 | AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_S32P, | ||
| 852 | AV_SAMPLE_FMT_S64, AV_SAMPLE_FMT_S64P, | ||
| 853 | AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, | ||
| 854 | AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP), | ||
| 872 | .flags = AVFILTER_FLAG_SLICE_THREADS, | 855 | .flags = AVFILTER_FLAG_SLICE_THREADS, |
| 873 | }; | 856 | }; |