From b45754b4781f994358fe3761b37f97dadb65b7a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?=
 <vjaquez@igalia.com>
Date: Sat, 17 Jul 2021 20:48:21 +0200
Subject: [PATCH] va: decoder: Group decoder methods.

Move up gst_va_decoder_get_config() to group decoders function in the
same file area.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2417>
---
 sys/va/gstvadecoder.c | 44 ++++++++++++++++++++++---------------------
 sys/va/gstvadecoder.h | 11 +++++------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/sys/va/gstvadecoder.c b/sys/va/gstvadecoder.c
index 0f97232520..cf0d9399ab 100644
--- a/sys/va/gstvadecoder.c
+++ b/sys/va/gstvadecoder.c
@@ -716,6 +716,29 @@ gst_va_decoder_config_is_equal (GstVaDecoder * self, VAProfile new_profile,
   return ret;
 }
 
+gboolean
+gst_va_decoder_get_config (GstVaDecoder * self, VAProfile * profile,
+    guint * rt_format, gint * width, gint * height)
+{
+  g_return_val_if_fail (GST_IS_VA_DECODER (self), FALSE);
+
+  if (!gst_va_decoder_is_open (self))
+    return FALSE;
+
+  GST_OBJECT_LOCK (self);
+  if (profile)
+    *profile = self->profile;
+  if (rt_format)
+    *rt_format = self->rt_format;
+  if (width)
+    *width = self->coded_width;
+  if (height)
+    *height = self->coded_height;
+  GST_OBJECT_UNLOCK (self);
+
+  return TRUE;
+}
+
 static gboolean
 _destroy_buffers (GstVaDecodePicture * pic)
 {
@@ -824,24 +847,3 @@ gst_va_decode_picture_dup (GstVaDecodePicture * pic)
   dup->gstbuffer = gst_buffer_ref (pic->gstbuffer);
   return dup;
 }
-
-gboolean
-gst_va_decoder_get_config (GstVaDecoder * decoder, VAProfile * profile,
-    guint * rt_format, gint * width, gint * height)
-{
-  g_return_val_if_fail (decoder, FALSE);
-
-  if (!gst_va_decoder_is_open (decoder))
-    return FALSE;
-
-  if (profile)
-    *profile = decoder->profile;
-  if (rt_format)
-    *rt_format = decoder->rt_format;
-  if (width)
-    *width = decoder->coded_width;
-  if (height)
-    *height = decoder->coded_height;
-
-  return TRUE;
-}
diff --git a/sys/va/gstvadecoder.h b/sys/va/gstvadecoder.h
index 204721cd7a..b529e7199a 100644
--- a/sys/va/gstvadecoder.h
+++ b/sys/va/gstvadecoder.h
@@ -91,6 +91,11 @@ gboolean              gst_va_decoder_config_is_equal      (GstVaDecoder * decode
                                                            guint new_rtformat,
                                                            gint new_width,
                                                            gint new_height);
+gboolean              gst_va_decoder_get_config           (GstVaDecoder * decoder,
+                                                           VAProfile * profile,
+                                                           guint * rt_format,
+                                                           gint * width,
+                                                           gint * height);
 
 GstVaDecodePicture *  gst_va_decode_picture_new           (GstVaDecoder * self,
                                                            GstBuffer * buffer);
@@ -99,10 +104,4 @@ VASurfaceID           gst_va_decode_picture_get_aux_surface (GstVaDecodePicture
 void                  gst_va_decode_picture_free          (GstVaDecodePicture * pic);
 GstVaDecodePicture *  gst_va_decode_picture_dup           (GstVaDecodePicture * pic);
 
-gboolean              gst_va_decoder_get_config           (GstVaDecoder * decoder,
-                                                           VAProfile * profile,
-                                                           guint * rt_format,
-                                                           gint * width,
-                                                           gint * height);
-
 G_END_DECLS