libs: gl: silence gir compiler

There were a couple complains of the gir compiler on these gstgl
files.

* Added namespace to public macros, even if they are helpers.
* Removed a misused private tag

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/678>

diff --git a/gst-libs/gst/gl/gstglcolorconvert.h b/gst-libs/gst/gl/gstglcolorconvert.h
index 00954d6..c3f2d89 100644 (file)
--- a/gst-libs/gst/gl/gstglcolorconvert.h
+++ b/gst-libs/gst/gl/gstglcolorconvert.h
@@ -83,23 +83,28 @@ struct _GstGLColorConvertClass
 };
 
 /**
- * GST_GL_COLOR_CONVERT_FORMATS:
+ * GST_GL_COLOR_CONVERT_EXT_FORMATS: (skip)
  *
- * The currently supported formats that can be converted
  */
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
-#define COLOR_CONVERT_EXT_FORMATS \
+#define GST_GL_COLOR_CONVERT_EXT_FORMATS \
     ", BGR10A2_LE, RGB10A2_LE, P010_10LE, P012_LE, P016_LE, Y212_LE, Y412_LE"
 #else
-#define COLOR_CONVERT_EXT_FORMATS \
+#define GST_GL_COLOR_CONVERT_EXT_FORMATS \
     ", P010_10BE, P012_BE, P016_BE, Y212_BE, Y412_BE"
 #endif
 
+/**
+ * GST_GL_COLOR_CONVERT_FORMATS:
+ *
+ * The currently supported formats that can be converted
+ */
 #define GST_GL_COLOR_CONVERT_FORMATS "{ RGBA, RGB, RGBx, BGR, BGRx, BGRA, xRGB, " \
                                "xBGR, ARGB, ABGR, Y444, I420, YV12, Y42B, " \
                                "Y41B, NV12, NV21, NV16, NV61, YUY2, UYVY, Y210, AYUV, " \
                                "VUYA, Y410, GRAY8, GRAY16_LE, GRAY16_BE, " \
-                               "RGB16, BGR16, ARGB64 " COLOR_CONVERT_EXT_FORMATS "}"
+                               "RGB16, BGR16, ARGB64 " \
+                               GST_GL_COLOR_CONVERT_EXT_FORMATS "}"
 
 /**
  * GST_GL_COLOR_CONVERT_VIDEO_CAPS:

diff --git a/gst-libs/gst/gl/gstglmemory.h b/gst-libs/gst/gl/gstglmemory.h
index 95062e6..d3ac52f 100644 (file)
--- a/gst-libs/gst/gl/gstglmemory.h
+++ b/gst-libs/gst/gl/gstglmemory.h
@@ -46,22 +46,26 @@ GType gst_gl_memory_allocator_get_type(void);
  */
 #define GST_CAPS_FEATURE_MEMORY_GL_MEMORY "memory:GLMemory"
 /**
- * GST_GL_MEMORY_VIDEO_FORMATS_STR:
- *
- * List of video formats that are supported by #GstGLMemory
+ * GST_GL_MEMORY_VIDEO_EXT_FORMATS: (skip)
  */
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
-#define MEMORY_VIDEO_EXT_FORMATS \
+#define GST_GL_MEMORY_VIDEO_EXT_FORMATS \
     ", BGR10A2_LE, RGB10A2_LE, P010_10LE, P012_LE, P016_LE, Y212_LE, Y412_LE"
 #else
-#define MEMORY_VIDEO_EXT_FORMATS \
+#define GST_GL_MEMORY_VIDEO_EXT_FORMATS \
     ", P010_10BE, P012_BE, P016_BE, Y212_BE, Y412_BE"
 #endif
 
+/**
+ * GST_GL_MEMORY_VIDEO_FORMATS_STR:
+ *
+ * List of video formats that are supported by #GstGLMemory
+ */
 #define GST_GL_MEMORY_VIDEO_FORMATS_STR \
     "{ RGBA, BGRA, RGBx, BGRx, ARGB, ABGR, xRGB, xBGR, RGB, BGR, RGB16, BGR16, " \
     "AYUV, VUYA, Y410, I420, YV12, NV12, NV21, NV16, NV61, YUY2, UYVY, Y210, Y41B, " \
-    "Y42B, Y444, GRAY8, GRAY16_LE, GRAY16_BE, ARGB64" MEMORY_VIDEO_EXT_FORMATS "}"
+    "Y42B, Y444, GRAY8, GRAY16_LE, GRAY16_BE, ARGB64" \
+    GST_GL_MEMORY_VIDEO_EXT_FORMATS "}"
 
 /**
  * GstGLMemory:

diff --git a/gst-libs/gst/gl/gstglupload.h b/gst-libs/gst/gl/gstglupload.h
index 976ada5..5911584 100644 (file)
--- a/gst-libs/gst/gl/gstglupload.h
+++ b/gst-libs/gst/gl/gstglupload.h
@@ -42,6 +42,7 @@ GType gst_gl_upload_get_type (void);
  * @GST_GL_UPLOAD_ERROR: An unspecified error occurred
  * @GST_GL_UPLOAD_UNSUPPORTED: The configuration is unsupported.
  * @GST_GL_UPLOAD_RECONFIGURE: This element requires a reconfiguration.
+ * @GST_GL_UPLOAD_UNSHARED_GL_CONTEXT: private return value.
  */
 typedef enum
 {
@@ -50,7 +51,7 @@ typedef enum
   GST_GL_UPLOAD_ERROR = -1,
   GST_GL_UPLOAD_UNSUPPORTED = -2,
   GST_GL_UPLOAD_RECONFIGURE = -3,
-  /*< private >*/
+
   GST_GL_UPLOAD_UNSHARED_GL_CONTEXT = -100,
 } GstGLUploadReturn;