From fbb62097e71b65c587dc703d6399eb1b5f444e2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 10 Aug 2017 09:09:22 +0100 Subject: [PATCH] gl, wayland: mark more declared functions with GST_EXPORT --- gst-libs/gst/gl/egl/gsteglimage.h | 7 ++++++- gst-libs/gst/gl/egl/gstgldisplay_egl.h | 8 ++++++++ gst-libs/gst/gl/egl/gstglmemoryegl.h | 8 +++++++- gst-libs/gst/gl/gstgldisplay.h | 3 +++ gst-libs/gst/gl/gstglrenderbuffer.h | 16 ++++++++++++++-- gst-libs/gst/gl/wayland/gstgldisplay_wayland.h | 5 ++++- gst-libs/gst/gl/x11/gstgldisplay_x11.h | 4 ++++ 7 files changed, 46 insertions(+), 5 deletions(-) diff --git a/gst-libs/gst/gl/egl/gsteglimage.h b/gst-libs/gst/gl/egl/gsteglimage.h index 327709d476..9a0e848064 100644 --- a/gst-libs/gst/gl/egl/gsteglimage.h +++ b/gst-libs/gst/gl/egl/gsteglimage.h @@ -31,7 +31,8 @@ G_BEGIN_DECLS -GType gst_egl_image_get_type (void); +GST_EXPORT GType gst_egl_image_get_type (void); + #define GST_TYPE_EGL_IMAGE (gst_egl_image_get_type()) #define GST_IS_EGL_IMAGE(obj) (GST_IS_MINI_OBJECT_TYPE(obj, GST_TYPE_EGL_IMAGE)) #define GST_EGL_IMAGE_CAST(obj) ((GstEGLImage *)(obj)) @@ -70,17 +71,21 @@ struct _GstEGLImage gpointer _padding[GST_PADDING]; }; +GST_EXPORT GstEGLImage * gst_egl_image_new_wrapped (GstGLContext * context, EGLImageKHR image, GstGLFormat format, gpointer user_data, GstEGLImageDestroyNotify user_data_destroy); +GST_EXPORT EGLImageKHR gst_egl_image_get_image (GstEGLImage * image); +GST_EXPORT GstEGLImage * gst_egl_image_from_texture (GstGLContext * context, GstGLMemory * gl_mem, guintptr * attribs); #if GST_GL_HAVE_DMABUF +GST_EXPORT GstEGLImage * gst_egl_image_from_dmabuf (GstGLContext * context, gint dmabuf, GstVideoInfo * in_info, diff --git a/gst-libs/gst/gl/egl/gstgldisplay_egl.h b/gst-libs/gst/gl/egl/gstgldisplay_egl.h index f81aeb26e7..1ee1c4939f 100644 --- a/gst-libs/gst/gl/egl/gstgldisplay_egl.h +++ b/gst-libs/gst/gl/egl/gstgldisplay_egl.h @@ -27,6 +27,7 @@ G_BEGIN_DECLS +GST_EXPORT GType gst_gl_display_egl_get_type (void); #define GST_TYPE_GL_DISPLAY_EGL (gst_gl_display_egl_get_type()) @@ -64,9 +65,16 @@ struct _GstGLDisplayEGLClass gpointer _padding[GST_PADDING]; }; +GST_EXPORT GstGLDisplayEGL *gst_gl_display_egl_new (void); + +GST_EXPORT GstGLDisplayEGL *gst_gl_display_egl_new_with_egl_display (EGLDisplay display); + +GST_EXPORT GstGLDisplayEGL *gst_gl_display_egl_from_gl_display (GstGLDisplay * display); + +GST_EXPORT EGLDisplay gst_gl_display_egl_get_from_native (GstGLDisplayType type, guintptr display); #define GST_GL_DISPLAY_EGL_NAME "gst.gl.display.egl" diff --git a/gst-libs/gst/gl/egl/gstglmemoryegl.h b/gst-libs/gst/gl/egl/gstglmemoryegl.h index 587955226f..ac7ca78418 100644 --- a/gst-libs/gst/gl/egl/gstglmemoryegl.h +++ b/gst-libs/gst/gl/egl/gstglmemoryegl.h @@ -36,7 +36,7 @@ G_BEGIN_DECLS #define GST_TYPE_GL_MEMORY_EGL_ALLOCATOR (gst_gl_memory_egl_allocator_get_type()) -GType gst_gl_memory_egl_allocator_get_type(void); +GST_EXPORT GType gst_gl_memory_egl_allocator_get_type(void); #define GST_IS_GL_MEMORY_EGL_ALLOCATOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_GL_MEMORY_EGL_ALLOCATOR)) #define GST_IS_GL_MEMORY_EGL_ALLOCATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_GL_MEMORY_EGL_ALLOCATOR)) @@ -67,10 +67,16 @@ struct _GstGLMemoryEGL */ #define GST_GL_MEMORY_EGL_ALLOCATOR_NAME "GLMemoryEGL" +GST_EXPORT void gst_gl_memory_egl_init_once (void); + +GST_EXPORT gboolean gst_is_gl_memory_egl (GstMemory * mem); +GST_EXPORT EGLImageKHR gst_gl_memory_egl_get_image (GstGLMemoryEGL * mem); + +GST_EXPORT EGLDisplay gst_gl_memory_egl_get_display (GstGLMemoryEGL * mem); /** diff --git a/gst-libs/gst/gl/gstgldisplay.h b/gst-libs/gst/gl/gstgldisplay.h index 66165a9ec5..95ae8d648d 100644 --- a/gst-libs/gst/gl/gstgldisplay.h +++ b/gst-libs/gst/gl/gstgldisplay.h @@ -139,8 +139,11 @@ GST_EXPORT gboolean gst_gl_display_add_context (GstGLDisplay * display, GstGLContext * context); +GST_EXPORT GstGLWindow * gst_gl_display_create_window (GstGLDisplay * display); +GST_EXPORT gboolean gst_gl_display_remove_window (GstGLDisplay * display, GstGLWindow * window); +GST_EXPORT GstGLWindow * gst_gl_display_find_window (GstGLDisplay * display, gpointer data, GCompareFunc compare_func); G_END_DECLS diff --git a/gst-libs/gst/gl/gstglrenderbuffer.h b/gst-libs/gst/gl/gstglrenderbuffer.h index 2f15a2e556..9b47e6796f 100644 --- a/gst-libs/gst/gl/gstglrenderbuffer.h +++ b/gst-libs/gst/gl/gstglrenderbuffer.h @@ -30,7 +30,7 @@ G_BEGIN_DECLS #define GST_TYPE_GL_RENDERBUFFER_ALLOCATOR (gst_gl_renderbuffer_allocator_get_type()) -GType gst_gl_renderbuffer_allocator_get_type(void); +GST_EXPORT GType gst_gl_renderbuffer_allocator_get_type(void); #define GST_IS_GL_RENDERBUFFER_ALLOCATOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_GL_RENDERBUFFER_ALLOCATOR)) #define GST_IS_GL_RENDERBUFFER_ALLOCATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_GL_RENDERBUFFER_ALLOCATOR)) @@ -102,7 +102,7 @@ struct _GstGLRenderbufferAllocatorClass #include -GType gst_gl_renderbuffer_allocation_params_get_type (void); +GST_EXPORT GType gst_gl_renderbuffer_allocation_params_get_type (void); #define GST_TYPE_RENDERBUFFER_ALLOCATION_PARAMS (gst_gl_renderbuffer_allocation_params_get_type) typedef struct @@ -117,12 +117,14 @@ typedef struct gpointer _padding[GST_PADDING]; } GstGLRenderbufferAllocationParams; +GST_EXPORT GstGLRenderbufferAllocationParams * gst_gl_renderbuffer_allocation_params_new (GstGLContext * context, GstAllocationParams * alloc_params, GstGLFormat renderbuffer_format, guint width, guint height); +GST_EXPORT GstGLRenderbufferAllocationParams * gst_gl_renderbuffer_allocation_params_new_wrapped (GstGLContext * context, GstAllocationParams * alloc_params, GstGLFormat renderbuffer_format, @@ -132,13 +134,23 @@ GstGLRenderbufferAllocationParams * gst_gl_renderbuffer_allocation_params_ne gpointer user_data, GDestroyNotify notify); +GST_EXPORT void gst_gl_renderbuffer_init_once (void); + +GST_EXPORT gboolean gst_is_gl_renderbuffer (GstMemory * mem); /* accessors */ +GST_EXPORT gint gst_gl_renderbuffer_get_width (GstGLRenderbuffer * gl_mem); + +GST_EXPORT gint gst_gl_renderbuffer_get_height (GstGLRenderbuffer * gl_mem); + +GST_EXPORT GstGLFormat gst_gl_renderbuffer_get_format (GstGLRenderbuffer * gl_mem); + +GST_EXPORT guint gst_gl_renderbuffer_get_id (GstGLRenderbuffer * gl_mem); G_END_DECLS diff --git a/gst-libs/gst/gl/wayland/gstgldisplay_wayland.h b/gst-libs/gst/gl/wayland/gstgldisplay_wayland.h index 6fbf522f12..ab1d42afa9 100644 --- a/gst-libs/gst/gl/wayland/gstgldisplay_wayland.h +++ b/gst-libs/gst/gl/wayland/gstgldisplay_wayland.h @@ -30,7 +30,7 @@ G_BEGIN_DECLS -GType gst_gl_display_wayland_get_type (void); +GST_EXPORT GType gst_gl_display_wayland_get_type (void); #define GST_TYPE_GL_DISPLAY_WAYLAND (gst_gl_display_wayland_get_type()) #define GST_GL_DISPLAY_WAYLAND(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GL_DISPLAY_WAYLAND,GstGLDisplayWayland)) @@ -71,7 +71,10 @@ struct _GstGLDisplayWaylandClass gpointer _padding[GST_PADDING]; }; +GST_EXPORT GstGLDisplayWayland *gst_gl_display_wayland_new (const gchar * name); + +GST_EXPORT GstGLDisplayWayland *gst_gl_display_wayland_new_with_display (struct wl_display *display); G_END_DECLS diff --git a/gst-libs/gst/gl/x11/gstgldisplay_x11.h b/gst-libs/gst/gl/x11/gstgldisplay_x11.h index b6bac8b42d..d96a6697fd 100644 --- a/gst-libs/gst/gl/x11/gstgldisplay_x11.h +++ b/gst-libs/gst/gl/x11/gstgldisplay_x11.h @@ -30,6 +30,7 @@ G_BEGIN_DECLS +GST_EXPORT GType gst_gl_display_x11_get_type (void); #define GST_TYPE_GL_DISPLAY_X11 (gst_gl_display_x11_get_type()) @@ -68,7 +69,10 @@ struct _GstGLDisplayX11Class gpointer _padding[GST_PADDING]; }; +GST_EXPORT GstGLDisplayX11 *gst_gl_display_x11_new (const gchar * name); + +GST_EXPORT GstGLDisplayX11 *gst_gl_display_x11_new_with_display (Display *display); G_END_DECLS