From 6af7ec3c0faf6798f34eb03b9e48ebaed03440f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?=
 <vjaquez@igalia.com>
Date: Tue, 18 Aug 2020 19:12:46 +0200
Subject: [PATCH] va: caps: expose gst_caps_set_format_array()

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1529>
---
 sys/va/gstvacaps.c | 20 ++++++++++++--------
 sys/va/gstvacaps.h |  3 +++
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/sys/va/gstvacaps.c b/sys/va/gstvacaps.c
index 74a1f1b358..b4946297de 100644
--- a/sys/va/gstvacaps.c
+++ b/sys/va/gstvacaps.c
@@ -93,14 +93,17 @@ bail:
   return NULL;
 }
 
-static gboolean
-_gst_caps_set_format_array (GstCaps * caps, GArray * formats)
+gboolean
+gst_caps_set_format_array (GstCaps * caps, GArray * formats)
 {
   GstVideoFormat fmt;
   GValue v_formats = G_VALUE_INIT;
   const gchar *format;
   guint i;
 
+  g_return_val_if_fail (GST_IS_CAPS (caps), FALSE);
+  g_return_val_if_fail (formats, FALSE);
+
   if (formats->len == 1) {
     fmt = g_array_index (formats, GstVideoFormat, 0);
     if (fmt == GST_VIDEO_FORMAT_UNKNOWN)
@@ -144,7 +147,7 @@ GstCaps *
 gst_va_create_raw_caps_from_config (GstVaDisplay * display, VAConfigID config)
 {
   GArray *formats;
-  GstCaps *caps, *base_caps, *feature_caps;
+  GstCaps *caps = NULL, *base_caps, *feature_caps;
   GstCapsFeatures *features;
   GstVideoFormat format;
   VASurfaceAttrib *attribs;
@@ -188,16 +191,17 @@ gst_va_create_raw_caps_from_config (GstVaDisplay * display, VAConfigID config)
 
   /* if driver doesn't report surface formats for current
    * chroma. Gallium AMD bug for 4:2:2 */
-  if (formats->len == 0) {
-    caps = NULL;
+  if (formats->len == 0)
     goto bail;
-  }
 
   base_caps = gst_caps_new_simple ("video/x-raw", "width", GST_TYPE_INT_RANGE,
       min_width, max_width, "height", GST_TYPE_INT_RANGE, min_height,
       max_height, NULL);
 
-  _gst_caps_set_format_array (base_caps, formats);
+  if (!gst_caps_set_format_array (base_caps, formats)) {
+    gst_caps_unref (base_caps);
+    goto bail;
+  }
 
   caps = gst_caps_new_empty ();
 
@@ -250,7 +254,7 @@ gst_va_create_raw_caps_from_config (GstVaDisplay * display, VAConfigID config)
         }
       }
 
-      if (!_gst_caps_set_format_array (raw_caps, raw_formats)) {
+      if (!gst_caps_set_format_array (raw_caps, raw_formats)) {
         gst_caps_unref (raw_caps);
         raw_caps = gst_caps_copy (base_caps);
       }
diff --git a/sys/va/gstvacaps.h b/sys/va/gstvacaps.h
index 140ede193d..b8a2830516 100644
--- a/sys/va/gstvacaps.h
+++ b/sys/va/gstvacaps.h
@@ -37,5 +37,8 @@ VASurfaceAttrib *     gst_va_get_surface_attribs          (GstVaDisplay * displa
 GstCaps *             gst_va_create_raw_caps_from_config  (GstVaDisplay * display,
                                                            VAConfigID config);
 
+gboolean              gst_caps_set_format_array           (GstCaps * caps,
+							   GArray * formats);
+
 G_END_DECLS