From b60951a4fa0da18113006bb5f96c239745737317 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Wed, 6 Jan 2021 11:16:18 +1100 Subject: [PATCH] gl: add get_type() implementations for all of our memory types Otherwise, various bindings can't really know the type of an object as required. Part-of: --- gst-libs/gst/gl/egl/gstglmemoryegl.c | 2 ++ gst-libs/gst/gl/egl/gstglmemoryegl.h | 9 +++++++++ gst-libs/gst/gl/gstglbuffer.c | 2 ++ gst-libs/gst/gl/gstglbuffer.h | 9 +++++++++ gst-libs/gst/gl/gstglmemory.c | 2 ++ gst-libs/gst/gl/gstglmemory.h | 9 +++++++++ gst-libs/gst/gl/gstglmemorypbo.c | 2 ++ gst-libs/gst/gl/gstglmemorypbo.h | 9 +++++++++ gst-libs/gst/gl/gstglrenderbuffer.c | 2 ++ gst-libs/gst/gl/gstglrenderbuffer.h | 9 +++++++++ 10 files changed, 55 insertions(+) diff --git a/gst-libs/gst/gl/egl/gstglmemoryegl.c b/gst-libs/gst/gl/egl/gstglmemoryegl.c index 84b07c9..15a57bd 100644 --- a/gst-libs/gst/gl/egl/gstglmemoryegl.c +++ b/gst-libs/gst/gl/egl/gstglmemoryegl.c @@ -55,6 +55,8 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_GL_MEMORY); G_DEFINE_TYPE (GstGLMemoryEGLAllocator, gst_gl_memory_egl_allocator, GST_TYPE_GL_MEMORY_ALLOCATOR); +GST_DEFINE_MINI_OBJECT_TYPE (GstGLMemoryEGL, gst_gl_memory_egl); + /** * gst_is_gl_memory_egl: * @mem: a #GstMemory to test diff --git a/gst-libs/gst/gl/egl/gstglmemoryegl.h b/gst-libs/gst/gl/egl/gstglmemoryegl.h index a45b6f9..2891f1f 100644 --- a/gst-libs/gst/gl/egl/gstglmemoryegl.h +++ b/gst-libs/gst/gl/egl/gstglmemoryegl.h @@ -65,6 +65,15 @@ struct _GstGLMemoryEGL */ #define GST_GL_MEMORY_EGL_ALLOCATOR_NAME "GLMemoryEGL" +/** + * GST_TYPE_GL_MEMORY_EGL: + * + * Since: 1.18.3 + */ +#define GST_TYPE_GL_MEMORY_EGL (gst_gl_memory_egl_get_type()) +GST_GL_API +GType gst_gl_memory_egl_get_type(void); + GST_GL_API void gst_gl_memory_egl_init_once (void); diff --git a/gst-libs/gst/gl/gstglbuffer.c b/gst-libs/gst/gl/gstglbuffer.c index 5a45007..52d1ece 100644 --- a/gst-libs/gst/gl/gstglbuffer.c +++ b/gst-libs/gst/gl/gstglbuffer.c @@ -70,6 +70,8 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_GL_BUFFER); #define GST_CAT_DEFUALT GST_CAT_GL_BUFFER +GST_DEFINE_MINI_OBJECT_TYPE (GstGLBuffer, gst_gl_buffer); + static GstAllocator *_gl_buffer_allocator; static gboolean diff --git a/gst-libs/gst/gl/gstglbuffer.h b/gst-libs/gst/gl/gstglbuffer.h index 883e8c8..c14a585 100644 --- a/gst-libs/gst/gl/gstglbuffer.h +++ b/gst-libs/gst/gl/gstglbuffer.h @@ -131,6 +131,15 @@ struct _GstGLBufferAllocatorClass */ #define GST_GL_BUFFER_ALLOCATOR_NAME "GLBuffer" +/** + * GST_TYPE_GL_BUFFER: + * + * Since: 1.18.3 + */ +#define GST_TYPE_GL_BUFFER (gst_gl_buffer_get_type()) +GST_GL_API +GType gst_gl_buffer_get_type(void); + GST_GL_API void gst_gl_buffer_init_once (void); GST_GL_API diff --git a/gst-libs/gst/gl/gstglmemory.c b/gst-libs/gst/gl/gstglmemory.c index 76c04eb..fa0a1fb 100644 --- a/gst-libs/gst/gl/gstglmemory.c +++ b/gst-libs/gst/gl/gstglmemory.c @@ -88,6 +88,8 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_GL_MEMORY); G_DEFINE_TYPE (GstGLMemoryAllocator, gst_gl_memory_allocator, GST_TYPE_GL_BASE_MEMORY_ALLOCATOR); +GST_DEFINE_MINI_OBJECT_TYPE (GstGLMemory, gst_gl_memory); + typedef struct { /* in */ diff --git a/gst-libs/gst/gl/gstglmemory.h b/gst-libs/gst/gl/gstglmemory.h index 78a6579..d51504c 100644 --- a/gst-libs/gst/gl/gstglmemory.h +++ b/gst-libs/gst/gl/gstglmemory.h @@ -249,6 +249,15 @@ struct _GstGLMemoryAllocatorClass */ #define GST_GL_MEMORY_ALLOCATOR_NAME "GLMemory" +/** + * GST_TYPE_GL_MEMORY: + * + * Since: 1.18.3 + */ +#define GST_TYPE_GL_MEMORY (gst_gl_memory_get_type()) +GST_GL_API +GType gst_gl_memory_get_type(void); + GST_GL_API void gst_gl_memory_init_once (void); GST_GL_API diff --git a/gst-libs/gst/gl/gstglmemorypbo.c b/gst-libs/gst/gl/gstglmemorypbo.c index 260f193..04c1237 100644 --- a/gst-libs/gst/gl/gstglmemorypbo.c +++ b/gst-libs/gst/gl/gstglmemorypbo.c @@ -104,6 +104,8 @@ static GstAllocator *_gl_allocator; G_DEFINE_TYPE (GstGLMemoryPBOAllocator, gst_gl_memory_pbo_allocator, GST_TYPE_GL_MEMORY_ALLOCATOR); +GST_DEFINE_MINI_OBJECT_TYPE (GstGLMemoryPBO, gst_gl_memory_pbo); + typedef struct { /* in */ diff --git a/gst-libs/gst/gl/gstglmemorypbo.h b/gst-libs/gst/gl/gstglmemorypbo.h index afba59c..3bc7d3f 100644 --- a/gst-libs/gst/gl/gstglmemorypbo.h +++ b/gst-libs/gst/gl/gstglmemorypbo.h @@ -59,6 +59,15 @@ struct _GstGLMemoryPBO */ #define GST_GL_MEMORY_PBO_ALLOCATOR_NAME "GLMemoryPBO" +/** + * GST_TYPE_GL_MEMORY_PBO + * + * Since: 1.18.3 + */ +#define GST_TYPE_GL_MEMORY_PBO (gst_gl_memory_pbo_get_type()) +GST_GL_API +GType gst_gl_memory_pbo_get_type(void); + GST_GL_API void gst_gl_memory_pbo_init_once (void); GST_GL_API diff --git a/gst-libs/gst/gl/gstglrenderbuffer.c b/gst-libs/gst/gl/gstglrenderbuffer.c index 4399c7e..ef5ce29 100644 --- a/gst-libs/gst/gl/gstglrenderbuffer.c +++ b/gst-libs/gst/gl/gstglrenderbuffer.c @@ -59,6 +59,8 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_GL_RENDERBUFFER); G_DEFINE_TYPE (GstGLRenderbufferAllocator, gst_gl_renderbuffer_allocator, GST_TYPE_GL_BASE_MEMORY_ALLOCATOR); +GST_DEFINE_MINI_OBJECT_TYPE (GstGLRenderbuffer, gst_gl_renderbuffer); + static guint _new_renderbuffer (GstGLContext * context, guint format, guint width, guint height) diff --git a/gst-libs/gst/gl/gstglrenderbuffer.h b/gst-libs/gst/gl/gstglrenderbuffer.h index cffe44c..84be319 100644 --- a/gst-libs/gst/gl/gstglrenderbuffer.h +++ b/gst-libs/gst/gl/gstglrenderbuffer.h @@ -143,6 +143,15 @@ GstGLRenderbufferAllocationParams * gst_gl_renderbuffer_allocation_params_ne gpointer user_data, GDestroyNotify notify); +/** + * GST_TYPE_GL_RENDERBUFFER: + * + * Since: 1.18.3 + */ +#define GST_TYPE_GL_RENDERBUFFER (gst_gl_renderbuffer_get_type()) +GST_GL_API +GType gst_gl_renderbuffer_get_type(void); + GST_GL_API void gst_gl_renderbuffer_init_once (void); -- 2.7.4