lavfi/af_volume: convert to query_func2()

Also, drop redundant calls that also happen implicitly in generic code.

Anton Khirnov committed 2 years ago

Commit 7887d001 parent e13592c1 file · +8 −8Browse files

Unified · Split

     av_freep(&vol->fdsp);
 }
-static int query_formats(AVFilterContext *ctx)
+static int query_formats(const AVFilterContext *ctx,
+                         AVFilterFormatsConfig **cfg_in,
+                         AVFilterFormatsConfig **cfg_out)
 {
-    VolumeContext *vol = ctx->priv;
+    const VolumeContext *vol = ctx->priv;
     static const enum AVSampleFormat sample_fmts[][7] = {
         [PRECISION_FIXED] = {
             AV_SAMPLE_FMT_U8,
             AV_SAMPLE_FMT_NONE
         }
     };
-    int ret = ff_set_common_all_channel_counts(ctx);
+    int ret;
-    if (ret < 0)
-        return ret;
-    ret = ff_set_common_formats_from_list(ctx, sample_fmts[vol->precision]);
+    ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, sample_fmts[vol->precision]);
     if (ret < 0)
         return ret;
-    return ff_set_common_all_samplerates(ctx);
+    return 0;
 }
 static inline void scale_samples_u8(uint8_t *dst, const uint8_t *src,
     .uninit         = uninit,
     FILTER_INPUTS(avfilter_af_volume_inputs),
     FILTER_OUTPUTS(avfilter_af_volume_outputs),
-    FILTER_QUERY_FUNC(query_formats),
+    FILTER_QUERY_FUNC2(query_formats),
     .flags          = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC,
     .process_command = process_command,
 };

Keyboard shortcuts