avfilter/af_loudnorm: simplify query_formats()

Paul B Mahol committed 3 years ago

Commit 24cd4c91 parent cc6312d1 file · +9 −18Browse files

Showing the changes to libavfilter (1 of 1 file). Show all

Unified · Split

 static int query_formats(AVFilterContext *ctx)
 {
     LoudNormContext *s = ctx->priv;
-    AVFilterFormats *formats;
+    AVFilterFormats *formats = NULL;
-    AVFilterLink *inlink = ctx->inputs[0];
-    AVFilterLink *outlink = ctx->outputs[0];
     static const int input_srate[] = {192000, -1};
-    static const enum AVSampleFormat sample_fmts[] = {
-        AV_SAMPLE_FMT_DBL,
-        AV_SAMPLE_FMT_NONE
-    };
     int ret = ff_set_common_all_channel_counts(ctx);
     if (ret < 0)
         return ret;
-    ret = ff_set_common_formats_from_list(ctx, sample_fmts);
+    ret = ff_add_format(&formats, AV_SAMPLE_FMT_DBL);
-    if (ret < 0)
+    if (ret)
+        return ret;
+    ret = ff_set_common_formats(ctx, formats);
+    if (ret)
         return ret;
     if (s->frame_type != LINEAR_MODE) {
         formats = ff_make_format_list(input_srate);
-        if (!formats)
+    } else {
-            return AVERROR(ENOMEM);
+        formats = ff_all_samplerates();
-        ret = ff_formats_ref(formats, &inlink->outcfg.samplerates);
-        if (ret < 0)
-            return ret;
-        ret = ff_formats_ref(formats, &outlink->incfg.samplerates);
-        if (ret < 0)
-            return ret;
     }
-    return 0;
+    return ff_set_common_samplerates(ctx, formats);
 }
 static int config_input(AVFilterLink *inlink)

Keyboard shortcuts