[FFmpeg-devel] [PATCH] asink_abuffer: extend ABufferSinkContext to make it accept lists of formats in input

[Stefano Sabatini]

This is required for the pending lavfi indev extension, also
consistent with the video buffer sink.
---
 libavfilter/asink_abuffer.c |   18 +++++++-----------
 libavfilter/asink_abuffer.h |    6 +++---
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/libavfilter/asink_abuffer.c b/libavfilter/asink_abuffer.c
index f4e7740..25950d8 100644
--- a/libavfilter/asink_abuffer.c
+++ b/libavfilter/asink_abuffer.c
@@ -46,22 +46,18 @@ static int init(AVFilterContext *ctx, const char *args, void *opaque)
 static int query_formats(AVFilterContext *ctx)
 {
     ABufferSinkContext *abuffersink = ctx->priv;
-    AVFilterFormats *formats;
-    int ret;
+    AVFilterFormats *formats = NULL;
 
-    formats = NULL;
-    if ((ret = avfilter_add_format(&formats, abuffersink->sample_fmt)) < 0)
-        return ret;
+    if (!(formats = avfilter_make_format_list(abuffersink->sample_fmts)))
+        return AVERROR(ENOMEM);
     avfilter_set_common_sample_formats(ctx, formats);
 
-    formats = NULL;
-    if ((ret = avfilter_add_format(&formats, abuffersink->channel_layout)) < 0)
-        return ret;
+    if (!(formats = avfilter_make_format64_list(abuffersink->channel_layouts)))
+        return AVERROR(ENOMEM);
     avfilter_set_common_channel_layouts(ctx, formats);
 
-    formats = NULL;
-    if ((ret = avfilter_add_format(&formats, abuffersink->planar)) < 0)
-        return ret;
+    if (!(formats = avfilter_make_format_list(abuffersink->packing_fmts)))
+        return AVERROR(ENOMEM);
     avfilter_set_common_packing_formats(ctx, formats);
 
     return 0;
diff --git a/libavfilter/asink_abuffer.h b/libavfilter/asink_abuffer.h
index 2c039fb..37341fb 100644
--- a/libavfilter/asink_abuffer.h
+++ b/libavfilter/asink_abuffer.h
@@ -27,9 +27,9 @@
 #include "avfilter.h"
 
 typedef struct {
-    enum AVSampleFormat sample_fmt;
-    int64_t channel_layout;
-    int planar;
+    const enum AVSampleFormat *sample_fmts; ///< list of allowed sample formats, terminated by AV_SAMPLE_FMTS
+    const int64_t *channel_layouts;         ///< list of allowed channel layouts, terminated by -1
+    const int *packing_fmts;                ///< list of allowed packing formats
 } ABufferSinkContext;
 
 
-- 
1.7.2.5