mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl: be consistent in gobject boilerpate

Browse source 
GST_GL_IS_* vs GST_IS_GL_*

git grep -l 'GST_GL_IS_' | xargs sed -i 's/GST_GL_IS_/GST_IS_GL_/g'
This commit is contained in:
Matthew Waters 2015-10-19 15:15:30 +11:00
parent 0d3fbcdea8
commit 3dfc6899ad
29 changed files with 129 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
docs/libs/gst-plugins-bad-libs-sections.txt
View file

@ -854,11 +854,11 @@ gst_gl_context_fill_info
gst_gl_context_get_current gst_gl_context_get_current
<SUBSECTION Standard> <SUBSECTION Standard>
GST_GL_CONTEXT GST_GL_CONTEXT
GST_GL_IS_CONTEXT GST_IS_GL_CONTEXT
GST_GL_TYPE_CONTEXT GST_GL_TYPE_CONTEXT
GST_GL_CONTEXT_CLASS GST_GL_CONTEXT_CLASS
GST_GL_CONTEXT_GET_CLASS GST_GL_CONTEXT_GET_CLASS
GST_GL_IS_CONTEXT_CLASS GST_IS_GL_CONTEXT_CLASS
GST_GL_CONTEXT_CAST GST_GL_CONTEXT_CAST
GstGLContextPrivate GstGLContextPrivate
gst_gl_context_get_type gst_gl_context_get_type
@ -873,11 +873,11 @@ gst_gl_context_cocoa_get_current_context
gst_gl_context_cocoa_get_pixel_format gst_gl_context_cocoa_get_pixel_format
<SUBSECTION Standard> <SUBSECTION Standard>
GST_GL_CONTEXT_COCOA GST_GL_CONTEXT_COCOA
GST_GL_IS_CONTEXT_COCOA GST_IS_GL_CONTEXT_COCOA
GST_GL_TYPE_CONTEXT_COCOA GST_GL_TYPE_CONTEXT_COCOA
GST_GL_CONTEXT_COCOA_CLASS GST_GL_CONTEXT_COCOA_CLASS
GST_GL_CONTEXT_COCOA_GET_CLASS GST_GL_CONTEXT_COCOA_GET_CLASS
GST_GL_IS_CONTEXT_COCOA_CLASS GST_IS_GL_CONTEXT_COCOA_CLASS
GST_GL_CONTEXT_COCOA_CAST GST_GL_CONTEXT_COCOA_CAST
GstGLContextCocoaPrivate GstGLContextCocoaPrivate
gst_gl_context_cocoa_get_type gst_gl_context_cocoa_get_type
@ -894,11 +894,11 @@ gst_gl_context_egl_get_current_context
gst_gl_context_egl_get_proc_address gst_gl_context_egl_get_proc_address
<SUBSECTION Standard> <SUBSECTION Standard>
GST_GL_CONTEXT_EGL GST_GL_CONTEXT_EGL
GST_GL_IS_CONTEXT_EGL GST_IS_GL_CONTEXT_EGL
GST_GL_TYPE_CONTEXT_EGL GST_GL_TYPE_CONTEXT_EGL
GST_GL_CONTEXT_EGL_CLASS GST_GL_CONTEXT_EGL_CLASS
GST_GL_CONTEXT_EGL_GET_CLASS GST_GL_CONTEXT_EGL_GET_CLASS
GST_GL_IS_CONTEXT_EGL_CLASS GST_IS_GL_CONTEXT_EGL_CLASS
GST_GL_CONTEXT_EGL_CAST GST_GL_CONTEXT_EGL_CAST
GstGLContextEGLPrivate GstGLContextEGLPrivate
gst_gl_context_egl_get_type gst_gl_context_egl_get_type
@ -913,11 +913,11 @@ gst_gl_context_glx_get_current_context
gst_gl_context_glx_get_proc_address gst_gl_context_glx_get_proc_address
<SUBSECTION Standard> <SUBSECTION Standard>
GST_GL_CONTEXT_GLX GST_GL_CONTEXT_GLX
GST_GL_IS_CONTEXT_GLX GST_IS_GL_CONTEXT_GLX
GST_GL_TYPE_CONTEXT_GLX GST_GL_TYPE_CONTEXT_GLX
GST_GL_CONTEXT_GLX_CLASS GST_GL_CONTEXT_GLX_CLASS
GST_GL_CONTEXT_GLX_GET_CLASS GST_GL_CONTEXT_GLX_GET_CLASS
GST_GL_IS_CONTEXT_GLX_CLASS GST_IS_GL_CONTEXT_GLX_CLASS
GST_GL_CONTEXT_GLX_CAST GST_GL_CONTEXT_GLX_CAST
GstGLContextGLXPrivate GstGLContextGLXPrivate
gst_gl_context_glx_get_type gst_gl_context_glx_get_type
@ -932,11 +932,11 @@ gst_gl_context_wgl_get_current_context
gst_gl_context_wgl_get_proc_address gst_gl_context_wgl_get_proc_address
<SUBSECTION Standard> <SUBSECTION Standard>
GST_GL_CONTEXT_WGL GST_GL_CONTEXT_WGL
GST_GL_IS_CONTEXT_WGL GST_IS_GL_CONTEXT_WGL
GST_GL_TYPE_CONTEXT_WGL GST_GL_TYPE_CONTEXT_WGL
GST_GL_CONTEXT_WGL_CLASS GST_GL_CONTEXT_WGL_CLASS
GST_GL_CONTEXT_WGL_GET_CLASS GST_GL_CONTEXT_WGL_GET_CLASS
GST_GL_IS_CONTEXT_WGL_CLASS GST_IS_GL_CONTEXT_WGL_CLASS
GST_GL_CONTEXT_WGL_CAST GST_GL_CONTEXT_WGL_CAST
GstGLContextWGLPrivate GstGLContextWGLPrivate
gst_gl_context_wgl_get_type gst_gl_context_wgl_get_type
@ -950,11 +950,11 @@ gst_gl_context_eagl_new
gst_gl_context_eagl_get_current_context gst_gl_context_eagl_get_current_context
<SUBSECTION Standard> <SUBSECTION Standard>
GST_GL_CONTEXT_EAGL GST_GL_CONTEXT_EAGL
GST_GL_IS_CONTEXT_EAGL GST_IS_GL_CONTEXT_EAGL
GST_GL_TYPE_CONTEXT_EAGL GST_GL_TYPE_CONTEXT_EAGL
GST_GL_CONTEXT_EAGL_CLASS GST_GL_CONTEXT_EAGL_CLASS
GST_GL_CONTEXT_EAGL_GET_CLASS GST_GL_CONTEXT_EAGL_GET_CLASS
GST_GL_IS_CONTEXT_EAGL_CLASS GST_IS_GL_CONTEXT_EAGL_CLASS
GST_GL_CONTEXT_EAGL_CAST GST_GL_CONTEXT_EAGL_CAST
GstGLContextEaglPrivate GstGLContextEaglPrivate
@ -1165,11 +1165,11 @@ gst_gl_shader_bind_attribute_location
<SUBSECTION Standard> <SUBSECTION Standard>
GstGLShaderPrivate GstGLShaderPrivate
GST_GL_SHADER GST_GL_SHADER
GST_GL_IS_SHADER GST_IS_GL_SHADER
GST_GL_TYPE_SHADER GST_GL_TYPE_SHADER
gst_gl_shader_get_type gst_gl_shader_get_type
GST_GL_SHADER_CLASS GST_GL_SHADER_CLASS
GST_GL_IS_SHADER_CLASS GST_IS_GL_SHADER_CLASS
GST_GL_SHADER_GET_CLASS GST_GL_SHADER_GET_CLASS
</SECTION> </SECTION>
@ -1290,8 +1290,8 @@ gst_gl_window_show
gst_gl_window_get_surface_dimensions gst_gl_window_get_surface_dimensions
gst_gl_window_handle_events gst_gl_window_handle_events
<SUBSECTION Standard> <SUBSECTION Standard>
GST_GL_IS_WINDOW GST_IS_GL_WINDOW
GST_GL_IS_WINDOW_CLASS GST_IS_GL_WINDOW_CLASS
GST_GL_TYPE_WINDOW GST_GL_TYPE_WINDOW
GST_GL_WINDOW GST_GL_WINDOW
GST_GL_WINDOW_CLASS GST_GL_WINDOW_CLASS
@ -1312,8 +1312,8 @@ GstGLWindowAndroidEGL
GstGLWindowAndroidEGLClass GstGLWindowAndroidEGLClass
gst_gl_window_android_egl_new gst_gl_window_android_egl_new
<SUBSECTION Standard> <SUBSECTION Standard>
GST_GL_IS_WINDOW_ANDROID_EGL GST_IS_GL_WINDOW_ANDROID_EGL
GST_GL_IS_WINDOW_ANDROID_EGL_CLASS GST_IS_GL_WINDOW_ANDROID_EGL_CLASS
GST_GL_TYPE_WINDOW_ANDROID_EGL GST_GL_TYPE_WINDOW_ANDROID_EGL
GST_GL_WINDOW_ANDROID_EGL GST_GL_WINDOW_ANDROID_EGL
GST_GL_WINDOW_ANDROID_EGL_CLASS GST_GL_WINDOW_ANDROID_EGL_CLASS
@ -1329,8 +1329,8 @@ GstGLWindowCocoaClass
gst_gl_window_cocoa_new gst_gl_window_cocoa_new
gst_gl_window_cocoa_create_window gst_gl_window_cocoa_create_window
<SUBSECTION Standard> <SUBSECTION Standard>
GST_GL_IS_WINDOW_COCOA GST_IS_GL_WINDOW_COCOA
GST_GL_IS_WINDOW_COCOA_CLASS GST_IS_GL_WINDOW_COCOA_CLASS
GST_GL_TYPE_WINDOW_COCOA GST_GL_TYPE_WINDOW_COCOA
GST_GL_WINDOW_COCOA GST_GL_WINDOW_COCOA
GST_GL_WINDOW_COCOA_CLASS GST_GL_WINDOW_COCOA_CLASS
@ -1346,8 +1346,8 @@ GstGLWindowDispmanxEGL
GstGLWindowDispmanxEGLClass GstGLWindowDispmanxEGLClass
gst_gl_window_dispmanx_egl_new gst_gl_window_dispmanx_egl_new
<SUBSECTION Standard> <SUBSECTION Standard>
GST_GL_IS_WINDOW_DISPMANX_EGL GST_IS_GL_WINDOW_DISPMANX_EGL
GST_GL_IS_WINDOW_DISPMANX_EGL_CLASS GST_IS_GL_WINDOW_DISPMANX_EGL_CLASS
GST_GL_TYPE_WINDOW_DISPMANX_EGL GST_GL_TYPE_WINDOW_DISPMANX_EGL
GST_GL_WINDOW_DISPMANX_EGL GST_GL_WINDOW_DISPMANX_EGL
GST_GL_WINDOW_DISPMANX_EGL_CLASS GST_GL_WINDOW_DISPMANX_EGL_CLASS
@ -1362,8 +1362,8 @@ GstGLWindowWaylandEGL
GstGLWindowWaylandEGLClass GstGLWindowWaylandEGLClass
gst_gl_window_wayland_egl_new gst_gl_window_wayland_egl_new
<SUBSECTION Standard> <SUBSECTION Standard>
GST_GL_IS_WINDOW_WAYLAND_EGL GST_IS_GL_WINDOW_WAYLAND_EGL
GST_GL_IS_WINDOW_WAYLAND_EGL_CLASS GST_IS_GL_WINDOW_WAYLAND_EGL_CLASS
GST_GL_TYPE_WINDOW_WAYLAND_EGL GST_GL_TYPE_WINDOW_WAYLAND_EGL
GST_GL_WINDOW_WAYLAND_EGL GST_GL_WINDOW_WAYLAND_EGL
GST_GL_WINDOW_WAYLAND_EGL_CLASS GST_GL_WINDOW_WAYLAND_EGL_CLASS
@ -1380,8 +1380,8 @@ GstGLWindowWin32Class
gst_gl_window_win32_new gst_gl_window_win32_new
gst_gl_window_win32_create_window gst_gl_window_win32_create_window
<SUBSECTION Standard> <SUBSECTION Standard>
GST_GL_IS_WINDOW_WIN32 GST_IS_GL_WINDOW_WIN32
GST_GL_IS_WINDOW_WIN32_CLASS GST_IS_GL_WINDOW_WIN32_CLASS
GST_GL_TYPE_WINDOW_WIN32 GST_GL_TYPE_WINDOW_WIN32
GST_GL_WINDOW_WIN32 GST_GL_WINDOW_WIN32
GST_GL_WINDOW_WIN32_CLASS GST_GL_WINDOW_WIN32_CLASS
@ -1400,8 +1400,8 @@ gst_gl_window_x11_create_window
gst_gl_window_x11_trap_x_errors gst_gl_window_x11_trap_x_errors
gst_gl_window_x11_untrap_x_errors gst_gl_window_x11_untrap_x_errors
<SUBSECTION Standard> <SUBSECTION Standard>
GST_GL_IS_WINDOW_X11 GST_IS_GL_WINDOW_X11
GST_GL_IS_WINDOW_X11_CLASS GST_IS_GL_WINDOW_X11_CLASS
GST_GL_TYPE_WINDOW_X11 GST_GL_TYPE_WINDOW_X11
GST_GL_WINDOW_X11 GST_GL_WINDOW_X11
GST_GL_WINDOW_X11_CLASS GST_GL_WINDOW_X11_CLASS

2
ext/gl/gstglimagesink.c
View file

@ -409,7 +409,7 @@ gst_glimage_sink_navigation_send_event (GstNavigation * navigation, GstStructure
return; return;
window = gst_gl_context_get_window (sink->context); window = gst_gl_context_get_window (sink->context);
g_return_if_fail (GST_GL_IS_WINDOW (window)); g_return_if_fail (GST_IS_GL_WINDOW (window));
width = GST_VIDEO_SINK_WIDTH (sink); width = GST_VIDEO_SINK_WIDTH (sink);
height = GST_VIDEO_SINK_HEIGHT (sink); height = GST_VIDEO_SINK_HEIGHT (sink);

2
ext/gtk/gtkgstglwidget.c
View file

@ -505,7 +505,7 @@ gtk_gst_gl_widget_init_winsys (GtkGstGLWidget * gst_widget)
GTK_GST_BASE_WIDGET_LOCK (gst_widget); GTK_GST_BASE_WIDGET_LOCK (gst_widget);
} }
if (!GST_GL_IS_CONTEXT (priv->other_context)) { if (!GST_IS_GL_CONTEXT (priv->other_context)) {
GTK_GST_BASE_WIDGET_UNLOCK (gst_widget); GTK_GST_BASE_WIDGET_UNLOCK (gst_widget);
return FALSE; return FALSE;
} }

2
ext/qt/qtitem.cc
View file

@ -387,7 +387,7 @@ qt_item_init_winsys (QtGLVideoItem * widget)
return FALSE; return FALSE;
} }
if (!GST_GL_IS_CONTEXT (widget->priv->other_context)) { if (!GST_IS_GL_CONTEXT (widget->priv->other_context)) {
GST_ERROR ("%p failed to retrieve wrapped context %" GST_PTR_FORMAT, widget, GST_ERROR ("%p failed to retrieve wrapped context %" GST_PTR_FORMAT, widget,
widget->priv->other_context); widget->priv->other_context);
g_mutex_unlock (&widget->priv->lock); g_mutex_unlock (&widget->priv->lock);

4
gst-libs/gst/gl/android/gstglwindow_android_egl.h
View file

@ -30,8 +30,8 @@ G_BEGIN_DECLS
#define GST_GL_TYPE_WINDOW_ANDROID_EGL (gst_gl_window_android_egl_get_type()) #define GST_GL_TYPE_WINDOW_ANDROID_EGL (gst_gl_window_android_egl_get_type())
#define GST_GL_WINDOW_ANDROID_EGL(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_WINDOW_ANDROID_EGL, GstGLWindowAndroidEGL)) #define GST_GL_WINDOW_ANDROID_EGL(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_WINDOW_ANDROID_EGL, GstGLWindowAndroidEGL))
#define GST_GL_WINDOW_ANDROID_EGL_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_WINDOW_ANDROID_EGL, GstGLWindowAndroidEGLClass)) #define GST_GL_WINDOW_ANDROID_EGL_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_WINDOW_ANDROID_EGL, GstGLWindowAndroidEGLClass))
#define GST_GL_IS_WINDOW_ANDROID_EGL(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_WINDOW_ANDROID_EGL)) #define GST_IS_GL_WINDOW_ANDROID_EGL(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_WINDOW_ANDROID_EGL))
#define GST_GL_IS_WINDOW_ANDROID_EGL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_WINDOW_ANDROID_EGL)) #define GST_IS_GL_WINDOW_ANDROID_EGL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_WINDOW_ANDROID_EGL))
#define GST_GL_WINDOW_ANDROID_EGL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_WINDOW_ANDROID_EGL, GstGLWindowAndroidEGL_Class)) #define GST_GL_WINDOW_ANDROID_EGL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_WINDOW_ANDROID_EGL, GstGLWindowAndroidEGL_Class))
typedef struct _GstGLWindowAndroidEGL GstGLWindowAndroidEGL; typedef struct _GstGLWindowAndroidEGL GstGLWindowAndroidEGL;

4
gst-libs/gst/gl/cocoa/gstglcontext_cocoa.h
View file

@ -30,8 +30,8 @@ G_BEGIN_DECLS
#define GST_GL_TYPE_CONTEXT_COCOA (gst_gl_context_cocoa_get_type()) #define GST_GL_TYPE_CONTEXT_COCOA (gst_gl_context_cocoa_get_type())
#define GST_GL_CONTEXT_COCOA(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_CONTEXT_COCOA, GstGLContextCocoa)) #define GST_GL_CONTEXT_COCOA(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_CONTEXT_COCOA, GstGLContextCocoa))
#define GST_GL_CONTEXT_COCOA_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_CONTEXT_COCOA, GstGLContextCocoaClass)) #define GST_GL_CONTEXT_COCOA_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_CONTEXT_COCOA, GstGLContextCocoaClass))
#define GST_GL_IS_CONTEXT_COCOA(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_CONTEXT_COCOA)) #define GST_IS_GL_CONTEXT_COCOA(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_CONTEXT_COCOA))
#define GST_GL_IS_CONTEXT_COCOA_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_CONTEXT_COCOA)) #define GST_IS_GL_CONTEXT_COCOA_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_CONTEXT_COCOA))
#define GST_GL_CONTEXT_COCOA_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_CONTEXT_COCOA, GstGLContextCocoaClass)) #define GST_GL_CONTEXT_COCOA_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_CONTEXT_COCOA, GstGLContextCocoaClass))
typedef struct _GstGLContextCocoa GstGLContextCocoa; typedef struct _GstGLContextCocoa GstGLContextCocoa;

4
gst-libs/gst/gl/cocoa/gstglwindow_cocoa.h
View file

@ -30,8 +30,8 @@ G_BEGIN_DECLS
#define GST_GL_TYPE_WINDOW_COCOA (gst_gl_window_cocoa_get_type()) #define GST_GL_TYPE_WINDOW_COCOA (gst_gl_window_cocoa_get_type())
#define GST_GL_WINDOW_COCOA(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_WINDOW_COCOA, GstGLWindowCocoa)) #define GST_GL_WINDOW_COCOA(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_WINDOW_COCOA, GstGLWindowCocoa))
#define GST_GL_WINDOW_COCOA_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_WINDOW_COCOA, GstGLWindowCocoaClass)) #define GST_GL_WINDOW_COCOA_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_WINDOW_COCOA, GstGLWindowCocoaClass))
#define GST_GL_IS_WINDOW_COCOA(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_WINDOW_COCOA)) #define GST_IS_GL_WINDOW_COCOA(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_WINDOW_COCOA))
#define GST_GL_IS_WINDOW_COCOA_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_WINDOW_COCOA)) #define GST_IS_GL_WINDOW_COCOA_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_WINDOW_COCOA))
#define GST_GL_WINDOW_COCOA_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_WINDOW_COCOA, GstGLWindowCocoaClass)) #define GST_GL_WINDOW_COCOA_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_WINDOW_COCOA, GstGLWindowCocoaClass))
typedef struct _GstGLWindowCocoa GstGLWindowCocoa; typedef struct _GstGLWindowCocoa GstGLWindowCocoa;

4
gst-libs/gst/gl/dispmanx/gstglwindow_dispmanx_egl.h
View file

@ -47,8 +47,8 @@ G_BEGIN_DECLS
#define GST_GL_TYPE_WINDOW_DISPMANX_EGL (gst_gl_window_dispmanx_egl_get_type()) #define GST_GL_TYPE_WINDOW_DISPMANX_EGL (gst_gl_window_dispmanx_egl_get_type())
#define GST_GL_WINDOW_DISPMANX_EGL(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_WINDOW_DISPMANX_EGL, GstGLWindowDispmanxEGL)) #define GST_GL_WINDOW_DISPMANX_EGL(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_WINDOW_DISPMANX_EGL, GstGLWindowDispmanxEGL))
#define GST_GL_WINDOW_DISPMANX_EGL_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_WINDOW_DISPMANX_EGL, GstGLWindowDispmanxEGLClass)) #define GST_GL_WINDOW_DISPMANX_EGL_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_WINDOW_DISPMANX_EGL, GstGLWindowDispmanxEGLClass))
#define GST_GL_IS_WINDOW_DISPMANX_EGL(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_WINDOW_DISPMANX_EGL)) #define GST_IS_GL_WINDOW_DISPMANX_EGL(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_WINDOW_DISPMANX_EGL))
#define GST_GL_IS_WINDOW_DISPMANX_EGL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_WINDOW_DISPMANX_EGL)) #define GST_IS_GL_WINDOW_DISPMANX_EGL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_WINDOW_DISPMANX_EGL))
#define GST_GL_WINDOW_DISPMANX_EGL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_WINDOW_DISPMANX_EGL, GstGLWindowDispmanxEGL_Class)) #define GST_GL_WINDOW_DISPMANX_EGL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_WINDOW_DISPMANX_EGL, GstGLWindowDispmanxEGL_Class))
typedef struct _GstGLWindowDispmanxEGL GstGLWindowDispmanxEGL; typedef struct _GstGLWindowDispmanxEGL GstGLWindowDispmanxEGL;

4
gst-libs/gst/gl/eagl/gstglcontext_eagl.h
View file

@ -29,8 +29,8 @@ G_BEGIN_DECLS
#define GST_GL_TYPE_CONTEXT_EAGL (gst_gl_context_eagl_get_type()) #define GST_GL_TYPE_CONTEXT_EAGL (gst_gl_context_eagl_get_type())
#define GST_GL_CONTEXT_EAGL(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_CONTEXT_EAGL, GstGLContextEagl)) #define GST_GL_CONTEXT_EAGL(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_CONTEXT_EAGL, GstGLContextEagl))
#define GST_GL_CONTEXT_EAGL_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_CONTEXT_EAGL, GstGLContextEaglClass)) #define GST_GL_CONTEXT_EAGL_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_CONTEXT_EAGL, GstGLContextEaglClass))
#define GST_GL_IS_CONTEXT_EAGL(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_CONTEXT_EAGL)) #define GST_IS_GL_CONTEXT_EAGL(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_CONTEXT_EAGL))
#define GST_GL_IS_CONTEXT_EAGL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_CONTEXT_EAGL)) #define GST_IS_GL_CONTEXT_EAGL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_CONTEXT_EAGL))
#define GST_GL_CONTEXT_EAGL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_CONTEXT_EAGL, GstGLContextEaglClass)) #define GST_GL_CONTEXT_EAGL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_CONTEXT_EAGL, GstGLContextEaglClass))
typedef struct _GstGLContextEagl GstGLContextEagl; typedef struct _GstGLContextEagl GstGLContextEagl;

4
gst-libs/gst/gl/eagl/gstglwindow_eagl.h
View file

@ -29,8 +29,8 @@ G_BEGIN_DECLS
#define GST_GL_TYPE_WINDOW_EAGL (gst_gl_window_eagl_get_type()) #define GST_GL_TYPE_WINDOW_EAGL (gst_gl_window_eagl_get_type())
#define GST_GL_WINDOW_EAGL(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_WINDOW_EAGL, GstGLWindowEagl)) #define GST_GL_WINDOW_EAGL(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_WINDOW_EAGL, GstGLWindowEagl))
#define GST_GL_WINDOW_EAGL_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_WINDOW_EAGL, GstGLWindowEaglClass)) #define GST_GL_WINDOW_EAGL_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_WINDOW_EAGL, GstGLWindowEaglClass))
#define GST_GL_IS_WINDOW_EAGL(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_WINDOW_EAGL)) #define GST_IS_GL_WINDOW_EAGL(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_WINDOW_EAGL))
#define GST_GL_IS_WINDOW_EAGL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_WINDOW_EAGL)) #define GST_IS_GL_WINDOW_EAGL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_WINDOW_EAGL))
#define GST_GL_WINDOW_EAGL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_WINDOW_EAGL, GstGLWindowEaglClass)) #define GST_GL_WINDOW_EAGL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_WINDOW_EAGL, GstGLWindowEaglClass))
typedef struct _GstGLWindowEagl GstGLWindowEagl; typedef struct _GstGLWindowEagl GstGLWindowEagl;

10
gst-libs/gst/gl/egl/gstglcontext_egl.c
View file

@ -150,7 +150,7 @@ static gboolean
gst_gl_context_egl_choose_format (GstGLContext * context, GError ** error) gst_gl_context_egl_choose_format (GstGLContext * context, GError ** error)
{ {
#if GST_GL_HAVE_WINDOW_X11 #if GST_GL_HAVE_WINDOW_X11
if (GST_GL_IS_WINDOW_X11 (context->window)) { if (GST_IS_GL_WINDOW_X11 (context->window)) {
GstGLWindow *window = gst_gl_context_get_window (context); GstGLWindow *window = gst_gl_context_get_window (context);
GstGLWindowX11 *window_x11 = GST_GL_WINDOW_X11 (window); GstGLWindowX11 *window_x11 = GST_GL_WINDOW_X11 (window);
gint ret; gint ret;
@ -391,25 +391,25 @@ gst_gl_context_egl_create_context (GstGLContext * context,
} }
/* FIXME do we want a window vfunc ? */ /* FIXME do we want a window vfunc ? */
#if GST_GL_HAVE_WINDOW_X11 #if GST_GL_HAVE_WINDOW_X11
if (GST_GL_IS_WINDOW_X11 (context->window)) { if (GST_IS_GL_WINDOW_X11 (context->window)) {
gst_gl_window_x11_create_window ((GstGLWindowX11 *) context->window); gst_gl_window_x11_create_window ((GstGLWindowX11 *) context->window);
} }
#endif #endif
if (other_context == NULL) { if (other_context == NULL) {
#if GST_GL_HAVE_WINDOW_WAYLAND #if GST_GL_HAVE_WINDOW_WAYLAND
if (GST_GL_IS_WINDOW_WAYLAND_EGL (context->window)) { if (GST_IS_GL_WINDOW_WAYLAND_EGL (context->window)) {
gst_gl_window_wayland_egl_create_window ((GstGLWindowWaylandEGL *) gst_gl_window_wayland_egl_create_window ((GstGLWindowWaylandEGL *)
context->window); context->window);
} }
#endif #endif
#if GST_GL_HAVE_WINDOW_WIN32 #if GST_GL_HAVE_WINDOW_WIN32
if (GST_GL_IS_WINDOW_WIN32 (context->window)) { if (GST_IS_GL_WINDOW_WIN32 (context->window)) {
gst_gl_window_win32_create_window ((GstGLWindowWin32 *) context->window); gst_gl_window_win32_create_window ((GstGLWindowWin32 *) context->window);
} }
#endif #endif
#if GST_GL_HAVE_WINDOW_DISPMANX #if GST_GL_HAVE_WINDOW_DISPMANX
if (GST_GL_IS_WINDOW_DISPMANX_EGL (context->window)) { if (GST_IS_GL_WINDOW_DISPMANX_EGL (context->window)) {
gst_gl_window_dispmanx_egl_create_window ((GstGLWindowDispmanxEGL *) gst_gl_window_dispmanx_egl_create_window ((GstGLWindowDispmanxEGL *)
context->window); context->window);
} }

4
gst-libs/gst/gl/egl/gstglcontext_egl.h
View file

@ -34,8 +34,8 @@ GType gst_gl_context_egl_get_type (void);
#define GST_GL_TYPE_CONTEXT_EGL (gst_gl_context_egl_get_type()) #define GST_GL_TYPE_CONTEXT_EGL (gst_gl_context_egl_get_type())
#define GST_GL_CONTEXT_EGL(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_CONTEXT_EGL, GstGLContextEGL)) #define GST_GL_CONTEXT_EGL(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_CONTEXT_EGL, GstGLContextEGL))
#define GST_GL_CONTEXT_EGL_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_CONTEXT_EGL, GstGLContextEGLClass)) #define GST_GL_CONTEXT_EGL_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_CONTEXT_EGL, GstGLContextEGLClass))
#define GST_GL_IS_CONTEXT_EGL(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_CONTEXT_EGL)) #define GST_IS_GL_CONTEXT_EGL(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_CONTEXT_EGL))
#define GST_GL_IS_CONTEXT_EGL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_CONTEXT_EGL)) #define GST_IS_GL_CONTEXT_EGL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_CONTEXT_EGL))
#define GST_GL_CONTEXT_EGL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_CONTEXT_EGL, GstGLContextEGLClass)) #define GST_GL_CONTEXT_EGL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_CONTEXT_EGL, GstGLContextEGLClass))
struct _GstGLContextEGL { struct _GstGLContextEGL {

44
gst-libs/gst/gl/gstglcontext.c
View file

@ -223,8 +223,8 @@ G_DEFINE_TYPE (GstGLWrappedContext, gst_gl_wrapped_context,
#define GST_GL_WRAPPED_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_WRAPPED_CONTEXT, GstGLWrappedContext)) #define GST_GL_WRAPPED_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_WRAPPED_CONTEXT, GstGLWrappedContext))
#define GST_GL_WRAPPED_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_CONTEXT, GstGLContextClass)) #define GST_GL_WRAPPED_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_CONTEXT, GstGLContextClass))
#define GST_GL_IS_WRAPPED_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_WRAPPED_CONTEXT)) #define GST_IS_GL_WRAPPED_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_WRAPPED_CONTEXT))
#define GST_GL_IS_WRAPPED_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_WRAPPED_CONTEXT)) #define GST_IS_GL_WRAPPED_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_WRAPPED_CONTEXT))
#define GST_GL_WRAPPED_CONTEXT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_WRAPPED_CONTEXT, GstGLWrappedContextClass)) #define GST_GL_WRAPPED_CONTEXT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_WRAPPED_CONTEXT, GstGLWrappedContextClass))
GQuark GQuark
@ -686,7 +686,7 @@ gst_gl_context_activate (GstGLContext * context, gboolean activate)
GstGLContextClass *context_class; GstGLContextClass *context_class;
gboolean result; gboolean result;
g_return_val_if_fail (GST_GL_IS_CONTEXT (context), FALSE); g_return_val_if_fail (GST_IS_GL_CONTEXT (context), FALSE);
context_class = GST_GL_CONTEXT_GET_CLASS (context); context_class = GST_GL_CONTEXT_GET_CLASS (context);
g_return_val_if_fail (context_class->activate != NULL, FALSE); g_return_val_if_fail (context_class->activate != NULL, FALSE);
@ -747,7 +747,7 @@ gst_gl_context_get_gl_api (GstGLContext * context)
{ {
GstGLContextClass *context_class; GstGLContextClass *context_class;
g_return_val_if_fail (GST_GL_IS_CONTEXT (context), GST_GL_API_NONE); g_return_val_if_fail (GST_IS_GL_CONTEXT (context), GST_GL_API_NONE);
context_class = GST_GL_CONTEXT_GET_CLASS (context); context_class = GST_GL_CONTEXT_GET_CLASS (context);
g_return_val_if_fail (context_class->get_gl_api != NULL, GST_GL_API_NONE); g_return_val_if_fail (context_class->get_gl_api != NULL, GST_GL_API_NONE);
@ -776,7 +776,7 @@ gst_gl_context_get_proc_address (GstGLContext * context, const gchar * name)
GstGLContextClass *context_class; GstGLContextClass *context_class;
GstGLAPI gl_api; GstGLAPI gl_api;
g_return_val_if_fail (GST_GL_IS_CONTEXT (context), NULL); g_return_val_if_fail (GST_IS_GL_CONTEXT (context), NULL);
context_class = GST_GL_CONTEXT_GET_CLASS (context); context_class = GST_GL_CONTEXT_GET_CLASS (context);
g_return_val_if_fail (context_class->get_proc_address != NULL, NULL); g_return_val_if_fail (context_class->get_proc_address != NULL, NULL);
@ -832,7 +832,7 @@ gst_gl_context_default_get_proc_address (GstGLAPI gl_api, const gchar * name)
gboolean gboolean
gst_gl_context_set_window (GstGLContext * context, GstGLWindow * window) gst_gl_context_set_window (GstGLContext * context, GstGLWindow * window)
{ {
g_return_val_if_fail (!GST_GL_IS_WRAPPED_CONTEXT (context), FALSE); g_return_val_if_fail (!GST_IS_GL_WRAPPED_CONTEXT (context), FALSE);
GST_DEBUG_OBJECT (context, "window:%" GST_PTR_FORMAT, window); GST_DEBUG_OBJECT (context, "window:%" GST_PTR_FORMAT, window);
@ -866,9 +866,9 @@ gst_gl_context_set_window (GstGLContext * context, GstGLWindow * window)
GstGLWindow * GstGLWindow *
gst_gl_context_get_window (GstGLContext * context) gst_gl_context_get_window (GstGLContext * context)
{ {
g_return_val_if_fail (GST_GL_IS_CONTEXT (context), NULL); g_return_val_if_fail (GST_IS_GL_CONTEXT (context), NULL);
if (GST_GL_IS_WRAPPED_CONTEXT (context)) { if (GST_IS_GL_WRAPPED_CONTEXT (context)) {
GST_WARNING_OBJECT (context, "context is not toplevel, returning NULL"); GST_WARNING_OBJECT (context, "context is not toplevel, returning NULL");
return NULL; return NULL;
} }
@ -893,8 +893,8 @@ gst_gl_context_get_window (GstGLContext * context)
gboolean gboolean
gst_gl_context_can_share (GstGLContext * context, GstGLContext * other_context) gst_gl_context_can_share (GstGLContext * context, GstGLContext * other_context)
{ {
g_return_val_if_fail (GST_GL_IS_CONTEXT (context), FALSE); g_return_val_if_fail (GST_IS_GL_CONTEXT (context), FALSE);
g_return_val_if_fail (GST_GL_IS_CONTEXT (other_context), FALSE); g_return_val_if_fail (GST_IS_GL_CONTEXT (other_context), FALSE);
/* check if the contexts are descendants or the root nodes are the same */ /* check if the contexts are descendants or the root nodes are the same */
return context->priv->sharegroup_id != 0 return context->priv->sharegroup_id != 0
@ -926,8 +926,8 @@ gst_gl_context_create (GstGLContext * context,
{ {
gboolean alive = FALSE; gboolean alive = FALSE;
g_return_val_if_fail (GST_GL_IS_CONTEXT (context), FALSE); g_return_val_if_fail (GST_IS_GL_CONTEXT (context), FALSE);
g_return_val_if_fail (!GST_GL_IS_WRAPPED_CONTEXT (context), FALSE); g_return_val_if_fail (!GST_IS_GL_WRAPPED_CONTEXT (context), FALSE);
GST_DEBUG_OBJECT (context, " other_context:%" GST_PTR_FORMAT, other_context); GST_DEBUG_OBJECT (context, " other_context:%" GST_PTR_FORMAT, other_context);
@ -1273,7 +1273,7 @@ gst_gl_context_destroy (GstGLContext * context)
{ {
GstGLContextClass *context_class; GstGLContextClass *context_class;
g_return_if_fail (GST_GL_IS_CONTEXT (context)); g_return_if_fail (GST_IS_GL_CONTEXT (context));
context_class = GST_GL_CONTEXT_GET_CLASS (context); context_class = GST_GL_CONTEXT_GET_CLASS (context);
g_return_if_fail (context_class->destroy_context != NULL); g_return_if_fail (context_class->destroy_context != NULL);
@ -1299,7 +1299,7 @@ gst_gl_context_fill_info (GstGLContext * context, GError ** error)
GstGLAPI gl_api; GstGLAPI gl_api;
gboolean ret; gboolean ret;
g_return_val_if_fail (GST_GL_IS_CONTEXT (context), FALSE); g_return_val_if_fail (GST_IS_GL_CONTEXT (context), FALSE);
g_return_val_if_fail (context->priv->active_thread == g_thread_self (), g_return_val_if_fail (context->priv->active_thread == g_thread_self (),
FALSE); FALSE);
@ -1391,7 +1391,7 @@ gst_gl_context_get_gl_context (GstGLContext * context)
GstGLContextClass *context_class; GstGLContextClass *context_class;
guintptr result; guintptr result;
g_return_val_if_fail (GST_GL_IS_CONTEXT (context), 0); g_return_val_if_fail (GST_IS_GL_CONTEXT (context), 0);
context_class = GST_GL_CONTEXT_GET_CLASS (context); context_class = GST_GL_CONTEXT_GET_CLASS (context);
g_return_val_if_fail (context_class->get_gl_context != NULL, 0); g_return_val_if_fail (context_class->get_gl_context != NULL, 0);
@ -1415,7 +1415,7 @@ gst_gl_context_get_gl_platform (GstGLContext * context)
{ {
GstGLContextClass *context_class; GstGLContextClass *context_class;
g_return_val_if_fail (GST_GL_IS_CONTEXT (context), 0); g_return_val_if_fail (GST_IS_GL_CONTEXT (context), 0);
context_class = GST_GL_CONTEXT_GET_CLASS (context); context_class = GST_GL_CONTEXT_GET_CLASS (context);
g_return_val_if_fail (context_class->get_gl_platform != NULL, 0); g_return_val_if_fail (context_class->get_gl_platform != NULL, 0);
@ -1433,7 +1433,7 @@ gst_gl_context_get_gl_platform (GstGLContext * context)
GstGLDisplay * GstGLDisplay *
gst_gl_context_get_display (GstGLContext * context) gst_gl_context_get_display (GstGLContext * context)
{ {
g_return_val_if_fail (GST_GL_IS_CONTEXT (context), NULL); g_return_val_if_fail (GST_IS_GL_CONTEXT (context), NULL);
return gst_object_ref (context->display); return gst_object_ref (context->display);
} }
@ -1473,10 +1473,10 @@ gst_gl_context_thread_add (GstGLContext * context,
GstGLWindow *window; GstGLWindow *window;
RunGenericData rdata; RunGenericData rdata;
g_return_if_fail (GST_GL_IS_CONTEXT (context)); g_return_if_fail (GST_IS_GL_CONTEXT (context));
g_return_if_fail (func != NULL); g_return_if_fail (func != NULL);
if (GST_GL_IS_WRAPPED_CONTEXT (context)) { if (GST_IS_GL_WRAPPED_CONTEXT (context)) {
g_return_if_fail (context->priv->active_thread == g_thread_self ()); g_return_if_fail (context->priv->active_thread == g_thread_self ());
func (context, data); func (context, data);
return; return;
@ -1509,7 +1509,7 @@ gst_gl_context_thread_add (GstGLContext * context,
void void
gst_gl_context_get_gl_version (GstGLContext * context, gint * maj, gint * min) gst_gl_context_get_gl_version (GstGLContext * context, gint * maj, gint * min)
{ {
g_return_if_fail (GST_GL_IS_CONTEXT (context)); g_return_if_fail (GST_IS_GL_CONTEXT (context));
g_return_if_fail (maj != NULL && min != NULL); g_return_if_fail (maj != NULL && min != NULL);
if (maj) if (maj)
@ -1535,7 +1535,7 @@ gboolean
gst_gl_context_check_gl_version (GstGLContext * context, GstGLAPI api, gst_gl_context_check_gl_version (GstGLContext * context, GstGLAPI api,
gint maj, gint min) gint maj, gint min)
{ {
g_return_val_if_fail (GST_GL_IS_CONTEXT (context), FALSE); g_return_val_if_fail (GST_IS_GL_CONTEXT (context), FALSE);
if (maj > context->priv->gl_major) if (maj > context->priv->gl_major)
return FALSE; return FALSE;
@ -1569,7 +1569,7 @@ gst_gl_context_check_feature (GstGLContext * context, const gchar * feature)
{ {
GstGLContextClass *context_class; GstGLContextClass *context_class;
g_return_val_if_fail (GST_GL_IS_CONTEXT (context), FALSE); g_return_val_if_fail (GST_IS_GL_CONTEXT (context), FALSE);
g_return_val_if_fail (feature != NULL, FALSE); g_return_val_if_fail (feature != NULL, FALSE);
context_class = GST_GL_CONTEXT_GET_CLASS (context); context_class = GST_GL_CONTEXT_GET_CLASS (context);

4
gst-libs/gst/gl/gstglcontext.h
View file

@ -30,8 +30,8 @@ G_BEGIN_DECLS
#define GST_GL_TYPE_CONTEXT (gst_gl_context_get_type()) #define GST_GL_TYPE_CONTEXT (gst_gl_context_get_type())
#define GST_GL_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_CONTEXT, GstGLContext)) #define GST_GL_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_CONTEXT, GstGLContext))
#define GST_GL_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GST_GL_TYPE_CONTEXT, GstGLContextClass)) #define GST_GL_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GST_GL_TYPE_CONTEXT, GstGLContextClass))
#define GST_GL_IS_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_CONTEXT)) #define GST_IS_GL_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_CONTEXT))
#define GST_GL_IS_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_CONTEXT)) #define GST_IS_GL_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_CONTEXT))
#define GST_GL_CONTEXT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_CONTEXT, GstGLContextClass)) #define GST_GL_CONTEXT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_CONTEXT, GstGLContextClass))
GType gst_gl_context_get_type (void); GType gst_gl_context_get_type (void);

2
gst-libs/gst/gl/gstgldisplay.c
View file

@ -533,7 +533,7 @@ gst_gl_display_add_context (GstGLDisplay * display, GstGLContext * context)
GWeakRef *ref; GWeakRef *ref;
g_return_val_if_fail (GST_IS_GL_DISPLAY (display), FALSE); g_return_val_if_fail (GST_IS_GL_DISPLAY (display), FALSE);
g_return_val_if_fail (GST_GL_IS_CONTEXT (context), FALSE); g_return_val_if_fail (GST_IS_GL_CONTEXT (context), FALSE);
context_display = gst_gl_context_get_display (context); context_display = gst_gl_context_get_display (context);
g_assert (context_display == display); g_assert (context_display == display);

24
gst-libs/gst/gl/gstglshader.c
View file

@ -198,7 +198,7 @@ _new_with_stages_va_list (GstGLContext * context, GError ** error,
GstGLShader *shader; GstGLShader *shader;
GstGLSLStage *stage; GstGLSLStage *stage;
g_return_val_if_fail (GST_GL_IS_CONTEXT (context), NULL); g_return_val_if_fail (GST_IS_GL_CONTEXT (context), NULL);
shader = g_object_new (GST_GL_TYPE_SHADER, NULL); shader = g_object_new (GST_GL_TYPE_SHADER, NULL);
shader->context = gst_object_ref (context); shader->context = gst_object_ref (context);
@ -320,7 +320,7 @@ gst_gl_shader_is_linked (GstGLShader * shader)
{ {
gboolean ret; gboolean ret;
g_return_val_if_fail (GST_GL_IS_SHADER (shader), FALSE); g_return_val_if_fail (GST_IS_GL_SHADER (shader), FALSE);
GST_OBJECT_LOCK (shader); GST_OBJECT_LOCK (shader);
ret = shader->priv->linked; ret = shader->priv->linked;
@ -350,7 +350,7 @@ gst_gl_shader_get_program_handle (GstGLShader * shader)
{ {
int ret; int ret;
g_return_val_if_fail (GST_GL_IS_SHADER (shader), 0); g_return_val_if_fail (GST_IS_GL_SHADER (shader), 0);
GST_OBJECT_LOCK (shader); GST_OBJECT_LOCK (shader);
ret = (int) shader->priv->program_handle; ret = (int) shader->priv->program_handle;
@ -375,7 +375,7 @@ gst_gl_shader_detach_unlocked (GstGLShader * shader, GstGLSLStage * stage)
guint stage_handle; guint stage_handle;
GList *elem; GList *elem;
g_return_if_fail (GST_GL_IS_SHADER (shader)); g_return_if_fail (GST_IS_GL_SHADER (shader));
g_return_if_fail (GST_IS_GLSL_STAGE (stage)); g_return_if_fail (GST_IS_GLSL_STAGE (stage));
if (!_gst_glsl_funcs_fill (&shader->priv->vtable, shader->context)) { if (!_gst_glsl_funcs_fill (&shader->priv->vtable, shader->context)) {
@ -426,7 +426,7 @@ gst_gl_shader_detach_unlocked (GstGLShader * shader, GstGLSLStage * stage)
void void
gst_gl_shader_detach (GstGLShader * shader, GstGLSLStage * stage) gst_gl_shader_detach (GstGLShader * shader, GstGLSLStage * stage)
{ {
g_return_if_fail (GST_GL_IS_SHADER (shader)); g_return_if_fail (GST_IS_GL_SHADER (shader));
g_return_if_fail (GST_IS_GLSL_STAGE (stage)); g_return_if_fail (GST_IS_GLSL_STAGE (stage));
GST_OBJECT_LOCK (shader); GST_OBJECT_LOCK (shader);
@ -451,7 +451,7 @@ gst_gl_shader_attach_unlocked (GstGLShader * shader, GstGLSLStage * stage)
{ {
guint stage_handle; guint stage_handle;
g_return_val_if_fail (GST_GL_IS_SHADER (shader), FALSE); g_return_val_if_fail (GST_IS_GL_SHADER (shader), FALSE);
g_return_val_if_fail (GST_IS_GLSL_STAGE (stage), FALSE); g_return_val_if_fail (GST_IS_GLSL_STAGE (stage), FALSE);
if (!_gst_glsl_funcs_fill (&shader->priv->vtable, shader->context)) { if (!_gst_glsl_funcs_fill (&shader->priv->vtable, shader->context)) {
@ -502,7 +502,7 @@ gst_gl_shader_attach (GstGLShader * shader, GstGLSLStage * stage)
{ {
gboolean ret; gboolean ret;
g_return_val_if_fail (GST_GL_IS_SHADER (shader), FALSE); g_return_val_if_fail (GST_IS_GL_SHADER (shader), FALSE);
g_return_val_if_fail (GST_IS_GLSL_STAGE (stage), FALSE); g_return_val_if_fail (GST_IS_GLSL_STAGE (stage), FALSE);
GST_OBJECT_LOCK (shader); GST_OBJECT_LOCK (shader);
@ -565,7 +565,7 @@ gst_gl_shader_link (GstGLShader * shader, GError ** error)
gboolean ret; gboolean ret;
GList *elem; GList *elem;
g_return_val_if_fail (GST_GL_IS_SHADER (shader), FALSE); g_return_val_if_fail (GST_IS_GL_SHADER (shader), FALSE);
GST_OBJECT_LOCK (shader); GST_OBJECT_LOCK (shader);
@ -653,7 +653,7 @@ gst_gl_shader_release_unlocked (GstGLShader * shader)
GstGLShaderPrivate *priv; GstGLShaderPrivate *priv;
GList *elem; GList *elem;
g_return_if_fail (GST_GL_IS_SHADER (shader)); g_return_if_fail (GST_IS_GL_SHADER (shader));
priv = shader->priv; priv = shader->priv;
@ -682,7 +682,7 @@ gst_gl_shader_release_unlocked (GstGLShader * shader)
void void
gst_gl_shader_release (GstGLShader * shader) gst_gl_shader_release (GstGLShader * shader)
{ {
g_return_if_fail (GST_GL_IS_SHADER (shader)); g_return_if_fail (GST_IS_GL_SHADER (shader));
GST_OBJECT_LOCK (shader); GST_OBJECT_LOCK (shader);
gst_gl_shader_release_unlocked (shader); gst_gl_shader_release_unlocked (shader);
@ -702,7 +702,7 @@ gst_gl_shader_use (GstGLShader * shader)
{ {
GstGLShaderPrivate *priv; GstGLShaderPrivate *priv;
g_return_if_fail (GST_GL_IS_SHADER (shader)); g_return_if_fail (GST_IS_GL_SHADER (shader));
priv = shader->priv; priv = shader->priv;
@ -726,7 +726,7 @@ gst_gl_context_clear_shader (GstGLContext * context)
{ {
GstGLFuncs *gl; GstGLFuncs *gl;
g_return_if_fail (GST_GL_IS_CONTEXT (context)); g_return_if_fail (GST_IS_GL_CONTEXT (context));
gl = context->gl_vtable; gl = context->gl_vtable;

4
gst-libs/gst/gl/gstglshader.h
View file

@ -30,8 +30,8 @@ GType gst_gl_shader_get_type (void);
#define GST_GL_TYPE_SHADER (gst_gl_shader_get_type()) #define GST_GL_TYPE_SHADER (gst_gl_shader_get_type())
#define GST_GL_SHADER(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_SHADER, GstGLShader)) #define GST_GL_SHADER(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_SHADER, GstGLShader))
#define GST_GL_SHADER_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_SHADER, GstGLShaderClass)) #define GST_GL_SHADER_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_SHADER, GstGLShaderClass))
#define GST_GL_IS_SHADER(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_SHADER)) #define GST_IS_GL_SHADER(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_SHADER))
#define GST_GL_IS_SHADER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_SHADER)) #define GST_IS_GL_SHADER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_SHADER))
#define GST_GL_SHADER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_SHADER, GstGLShaderClass)) #define GST_GL_SHADER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_SHADER, GstGLShaderClass))
struct _GstGLShader { struct _GstGLShader {

2
gst-libs/gst/gl/gstglsl.c
View file

@ -436,7 +436,7 @@ gboolean
gst_gl_context_supports_glsl_profile_version (GstGLContext * context, gst_gl_context_supports_glsl_profile_version (GstGLContext * context,
GstGLSLVersion version, GstGLSLProfile profile) GstGLSLVersion version, GstGLSLProfile profile)
{ {
g_return_val_if_fail (GST_GL_IS_CONTEXT (context), FALSE); g_return_val_if_fail (GST_IS_GL_CONTEXT (context), FALSE);
if (!_is_valid_version_profile (version, profile)) if (!_is_valid_version_profile (version, profile))
return FALSE; return FALSE;

2
gst-libs/gst/gl/gstglslstage.c
View file

@ -218,7 +218,7 @@ gst_glsl_stage_new_with_strings (GstGLContext * context, guint type,
{ {
GstGLSLStage *stage; GstGLSLStage *stage;
g_return_val_if_fail (GST_GL_IS_CONTEXT (context), NULL); g_return_val_if_fail (GST_IS_GL_CONTEXT (context), NULL);
g_return_val_if_fail (_is_valid_shader_type (type), NULL); g_return_val_if_fail (_is_valid_shader_type (type), NULL);
stage = g_object_new (GST_TYPE_GLSL_STAGE, NULL); stage = g_object_new (GST_TYPE_GLSL_STAGE, NULL);

2
gst-libs/gst/gl/gstglsyncmeta.c
View file

@ -43,7 +43,7 @@ gst_buffer_add_gl_sync_meta (GstGLContext * context, GstBuffer * buffer)
{ {
GstGLSyncMeta *meta; GstGLSyncMeta *meta;
g_return_val_if_fail (GST_GL_IS_CONTEXT (context), NULL); g_return_val_if_fail (GST_IS_GL_CONTEXT (context), NULL);
meta = meta =
(GstGLSyncMeta *) gst_buffer_add_meta ((buffer), GST_GL_SYNC_META_INFO, (GstGLSyncMeta *) gst_buffer_add_meta ((buffer), GST_GL_SYNC_META_INFO,

2
gst-libs/gst/gl/gstglviewconvert.c
View file

@ -1899,7 +1899,7 @@ gst_gl_view_convert_get_output (GstGLViewConvert * viewconvert,
GstVideoMultiviewFlags in_flags, out_flags; GstVideoMultiviewFlags in_flags, out_flags;
g_return_val_if_fail (GST_IS_GL_VIEW_CONVERT (viewconvert), GST_FLOW_ERROR); g_return_val_if_fail (GST_IS_GL_VIEW_CONVERT (viewconvert), GST_FLOW_ERROR);
g_return_val_if_fail (GST_GL_IS_CONTEXT (viewconvert->context), g_return_val_if_fail (GST_IS_GL_CONTEXT (viewconvert->context),
GST_FLOW_ERROR); GST_FLOW_ERROR);
GST_OBJECT_LOCK (viewconvert); GST_OBJECT_LOCK (viewconvert);

44
gst-libs/gst/gl/gstglwindow.c
View file

@ -415,7 +415,7 @@ gst_gl_window_set_window_handle (GstGLWindow * window, guintptr handle)
GstGLWindowClass *window_class; GstGLWindowClass *window_class;
GstSetWindowHandleCb *data; GstSetWindowHandleCb *data;
g_return_if_fail (GST_GL_IS_WINDOW (window)); g_return_if_fail (GST_IS_GL_WINDOW (window));
g_return_if_fail (handle != 0); g_return_if_fail (handle != 0);
window_class = GST_GL_WINDOW_GET_CLASS (window); window_class = GST_GL_WINDOW_GET_CLASS (window);
g_return_if_fail (window_class->set_window_handle != NULL); g_return_if_fail (window_class->set_window_handle != NULL);
@ -474,7 +474,7 @@ gst_gl_window_draw (GstGLWindow * window)
{ {
GstGLWindowClass *window_class; GstGLWindowClass *window_class;
g_return_if_fail (GST_GL_IS_WINDOW (window)); g_return_if_fail (GST_IS_GL_WINDOW (window));
window_class = GST_GL_WINDOW_GET_CLASS (window); window_class = GST_GL_WINDOW_GET_CLASS (window);
g_return_if_fail (window_class->draw != NULL); g_return_if_fail (window_class->draw != NULL);
@ -504,7 +504,7 @@ gst_gl_window_set_preferred_size (GstGLWindow * window, gint width, gint height)
{ {
GstGLWindowClass *window_class; GstGLWindowClass *window_class;
g_return_if_fail (GST_GL_IS_WINDOW (window)); g_return_if_fail (GST_IS_GL_WINDOW (window));
window_class = GST_GL_WINDOW_GET_CLASS (window); window_class = GST_GL_WINDOW_GET_CLASS (window);
if (window_class->set_preferred_size) if (window_class->set_preferred_size)
@ -524,7 +524,7 @@ gst_gl_window_show (GstGLWindow * window)
{ {
GstGLWindowClass *window_class; GstGLWindowClass *window_class;
g_return_if_fail (GST_GL_IS_WINDOW (window)); g_return_if_fail (GST_IS_GL_WINDOW (window));
window_class = GST_GL_WINDOW_GET_CLASS (window); window_class = GST_GL_WINDOW_GET_CLASS (window);
if (window_class->show) if (window_class->show)
@ -550,7 +550,7 @@ gst_gl_window_run (GstGLWindow * window)
{ {
GstGLWindowClass *window_class; GstGLWindowClass *window_class;
g_return_if_fail (GST_GL_IS_WINDOW (window)); g_return_if_fail (GST_IS_GL_WINDOW (window));
window_class = GST_GL_WINDOW_GET_CLASS (window); window_class = GST_GL_WINDOW_GET_CLASS (window);
g_return_if_fail (window_class->run != NULL); g_return_if_fail (window_class->run != NULL);
@ -569,7 +569,7 @@ gst_gl_window_run (GstGLWindow * window)
void void
gst_gl_window_run_navigation (GstGLWindow * window) gst_gl_window_run_navigation (GstGLWindow * window)
{ {
g_return_if_fail (GST_GL_IS_WINDOW (window)); g_return_if_fail (GST_IS_GL_WINDOW (window));
g_return_if_fail (window->navigation_context != NULL); g_return_if_fail (window->navigation_context != NULL);
g_return_if_fail (window->navigation_loop != NULL); g_return_if_fail (window->navigation_loop != NULL);
g_main_loop_run (window->navigation_loop); g_main_loop_run (window->navigation_loop);
@ -594,7 +594,7 @@ gst_gl_window_quit (GstGLWindow * window)
{ {
GstGLWindowClass *window_class; GstGLWindowClass *window_class;
g_return_if_fail (GST_GL_IS_WINDOW (window)); g_return_if_fail (GST_IS_GL_WINDOW (window));
window_class = GST_GL_WINDOW_GET_CLASS (window); window_class = GST_GL_WINDOW_GET_CLASS (window);
g_return_if_fail (window_class->quit != NULL); g_return_if_fail (window_class->quit != NULL);
@ -675,7 +675,7 @@ gst_gl_window_send_message (GstGLWindow * window, GstGLWindowCB callback,
{ {
GstGLWindowClass *window_class; GstGLWindowClass *window_class;
g_return_if_fail (GST_GL_IS_WINDOW (window)); g_return_if_fail (GST_IS_GL_WINDOW (window));
g_return_if_fail (callback != NULL); g_return_if_fail (callback != NULL);
window_class = GST_GL_WINDOW_GET_CLASS (window); window_class = GST_GL_WINDOW_GET_CLASS (window);
g_return_if_fail (window_class->send_message != NULL); g_return_if_fail (window_class->send_message != NULL);
@ -737,7 +737,7 @@ gst_gl_window_send_message_async (GstGLWindow * window, GstGLWindowCB callback,
{ {
GstGLWindowClass *window_class; GstGLWindowClass *window_class;
g_return_if_fail (GST_GL_IS_WINDOW (window)); g_return_if_fail (GST_IS_GL_WINDOW (window));
g_return_if_fail (callback != NULL); g_return_if_fail (callback != NULL);
window_class = GST_GL_WINDOW_GET_CLASS (window); window_class = GST_GL_WINDOW_GET_CLASS (window);
g_return_if_fail (window_class->send_message_async != NULL); g_return_if_fail (window_class->send_message_async != NULL);
@ -760,7 +760,7 @@ void
gst_gl_window_set_draw_callback (GstGLWindow * window, GstGLWindowCB callback, gst_gl_window_set_draw_callback (GstGLWindow * window, GstGLWindowCB callback,
gpointer data, GDestroyNotify destroy_notify) gpointer data, GDestroyNotify destroy_notify)
{ {
g_return_if_fail (GST_GL_IS_WINDOW (window)); g_return_if_fail (GST_IS_GL_WINDOW (window));
GST_GL_WINDOW_LOCK (window); GST_GL_WINDOW_LOCK (window);
@ -789,7 +789,7 @@ void
gst_gl_window_set_resize_callback (GstGLWindow * window, gst_gl_window_set_resize_callback (GstGLWindow * window,
GstGLWindowResizeCB callback, gpointer data, GDestroyNotify destroy_notify) GstGLWindowResizeCB callback, gpointer data, GDestroyNotify destroy_notify)
{ {
g_return_if_fail (GST_GL_IS_WINDOW (window)); g_return_if_fail (GST_IS_GL_WINDOW (window));
GST_GL_WINDOW_LOCK (window); GST_GL_WINDOW_LOCK (window);
@ -818,7 +818,7 @@ void
gst_gl_window_set_close_callback (GstGLWindow * window, GstGLWindowCB callback, gst_gl_window_set_close_callback (GstGLWindow * window, GstGLWindowCB callback,
gpointer data, GDestroyNotify destroy_notify) gpointer data, GDestroyNotify destroy_notify)
{ {
g_return_if_fail (GST_GL_IS_WINDOW (window)); g_return_if_fail (GST_IS_GL_WINDOW (window));
GST_GL_WINDOW_LOCK (window); GST_GL_WINDOW_LOCK (window);
@ -861,7 +861,7 @@ gst_gl_window_get_display (GstGLWindow * window)
{ {
GstGLWindowClass *window_class; GstGLWindowClass *window_class;
g_return_val_if_fail (GST_GL_IS_WINDOW (window), 0); g_return_val_if_fail (GST_IS_GL_WINDOW (window), 0);
window_class = GST_GL_WINDOW_GET_CLASS (window); window_class = GST_GL_WINDOW_GET_CLASS (window);
g_return_val_if_fail (window_class->get_display != NULL, 0); g_return_val_if_fail (window_class->get_display != NULL, 0);
@ -881,7 +881,7 @@ gst_gl_window_get_window_handle (GstGLWindow * window)
{ {
GstGLWindowClass *window_class; GstGLWindowClass *window_class;
g_return_val_if_fail (GST_GL_IS_WINDOW (window), 0); g_return_val_if_fail (GST_IS_GL_WINDOW (window), 0);
window_class = GST_GL_WINDOW_GET_CLASS (window); window_class = GST_GL_WINDOW_GET_CLASS (window);
g_return_val_if_fail (window_class->get_window_handle != NULL, 0); g_return_val_if_fail (window_class->get_window_handle != NULL, 0);
@ -899,7 +899,7 @@ gst_gl_window_get_window_handle (GstGLWindow * window)
GstGLContext * GstGLContext *
gst_gl_window_get_context (GstGLWindow * window) gst_gl_window_get_context (GstGLWindow * window)
{ {
g_return_val_if_fail (GST_GL_IS_WINDOW (window), NULL); g_return_val_if_fail (GST_IS_GL_WINDOW (window), NULL);
return (GstGLContext *) g_weak_ref_get (&window->context_ref); return (GstGLContext *) g_weak_ref_get (&window->context_ref);
} }
@ -929,7 +929,7 @@ G_DEFINE_TYPE (GstGLDummyWindow, gst_gl_dummy_window, GST_GL_TYPE_WINDOW);
void void
gst_gl_window_open_navigation (GstGLWindow * window) gst_gl_window_open_navigation (GstGLWindow * window)
{ {
g_return_if_fail (GST_GL_IS_WINDOW (window)); g_return_if_fail (GST_IS_GL_WINDOW (window));
g_mutex_lock (&window->nav_lock); g_mutex_lock (&window->nav_lock);
window->navigation_context = g_main_context_new (); window->navigation_context = g_main_context_new ();
window->navigation_loop = g_main_loop_new (window->navigation_context, FALSE); window->navigation_loop = g_main_loop_new (window->navigation_context, FALSE);
@ -942,7 +942,7 @@ gst_gl_window_open_navigation (GstGLWindow * window)
void void
gst_gl_window_close_navigation (GstGLWindow * window) gst_gl_window_close_navigation (GstGLWindow * window)
{ {
g_return_if_fail (GST_GL_IS_WINDOW (window)); g_return_if_fail (GST_IS_GL_WINDOW (window));
g_return_if_fail (window->navigation_context != NULL); g_return_if_fail (window->navigation_context != NULL);
g_return_if_fail (window->navigation_loop != NULL); g_return_if_fail (window->navigation_loop != NULL);
@ -958,7 +958,7 @@ gst_gl_window_close_navigation (GstGLWindow * window)
void void
gst_gl_window_quit_navigation (GstGLWindow * window) gst_gl_window_quit_navigation (GstGLWindow * window)
{ {
g_return_if_fail (GST_GL_IS_WINDOW (window)); g_return_if_fail (GST_IS_GL_WINDOW (window));
g_main_loop_quit (window->navigation_loop); g_main_loop_quit (window->navigation_loop);
} }
@ -1081,7 +1081,7 @@ gst_gl_window_handle_events (GstGLWindow * window, gboolean handle_events)
{ {
GstGLWindowClass *window_class; GstGLWindowClass *window_class;
g_return_if_fail (GST_GL_IS_WINDOW (window)); g_return_if_fail (GST_IS_GL_WINDOW (window));
window_class = GST_GL_WINDOW_GET_CLASS (window); window_class = GST_GL_WINDOW_GET_CLASS (window);
if (window_class->handle_events) if (window_class->handle_events)
@ -1108,7 +1108,7 @@ gst_gl_window_set_render_rectangle (GstGLWindow * window, gint x, gint y,
GstGLWindowClass *window_class; GstGLWindowClass *window_class;
gboolean ret = FALSE; gboolean ret = FALSE;
g_return_val_if_fail (GST_GL_IS_WINDOW (window), FALSE); g_return_val_if_fail (GST_IS_GL_WINDOW (window), FALSE);
window_class = GST_GL_WINDOW_GET_CLASS (window); window_class = GST_GL_WINDOW_GET_CLASS (window);
if (x < 0 || y < 0 || width <= 0 || height <= 0) if (x < 0 || y < 0 || width <= 0 || height <= 0)
@ -1125,7 +1125,7 @@ gst_gl_window_queue_resize (GstGLWindow * window)
{ {
GstGLWindowClass *window_class; GstGLWindowClass *window_class;
g_return_if_fail (GST_GL_IS_WINDOW (window)); g_return_if_fail (GST_IS_GL_WINDOW (window));
window_class = GST_GL_WINDOW_GET_CLASS (window); window_class = GST_GL_WINDOW_GET_CLASS (window);
window->queue_resize = TRUE; window->queue_resize = TRUE;
@ -1136,7 +1136,7 @@ gst_gl_window_queue_resize (GstGLWindow * window)
void void
gst_gl_window_resize (GstGLWindow * window, guint width, guint height) gst_gl_window_resize (GstGLWindow * window, guint width, guint height)
{ {
g_return_if_fail (GST_GL_IS_WINDOW (window)); g_return_if_fail (GST_IS_GL_WINDOW (window));
if (window->resize) if (window->resize)
window->resize (window->resize_data, width, height); window->resize (window->resize_data, width, height);

4
gst-libs/gst/gl/gstglwindow.h
View file

@ -33,8 +33,8 @@ G_BEGIN_DECLS
#define GST_GL_TYPE_WINDOW (gst_gl_window_get_type()) #define GST_GL_TYPE_WINDOW (gst_gl_window_get_type())
#define GST_GL_WINDOW(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_WINDOW, GstGLWindow)) #define GST_GL_WINDOW(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_WINDOW, GstGLWindow))
#define GST_GL_WINDOW_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GST_GL_TYPE_WINDOW, GstGLWindowClass)) #define GST_GL_WINDOW_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GST_GL_TYPE_WINDOW, GstGLWindowClass))
#define GST_GL_IS_WINDOW(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_WINDOW)) #define GST_IS_GL_WINDOW(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_WINDOW))
#define GST_GL_IS_WINDOW_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_WINDOW)) #define GST_IS_GL_WINDOW_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_WINDOW))
#define GST_GL_WINDOW_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_WINDOW, GstGLWindowClass)) #define GST_GL_WINDOW_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_WINDOW, GstGLWindowClass))
#define GST_GL_WINDOW_LOCK(w) g_mutex_lock(&GST_GL_WINDOW(w)->lock) #define GST_GL_WINDOW_LOCK(w) g_mutex_lock(&GST_GL_WINDOW(w)->lock)

4
gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.h
View file

@ -32,8 +32,8 @@ G_BEGIN_DECLS
#define GST_GL_TYPE_WINDOW_WAYLAND_EGL (gst_gl_window_wayland_egl_get_type()) #define GST_GL_TYPE_WINDOW_WAYLAND_EGL (gst_gl_window_wayland_egl_get_type())
#define GST_GL_WINDOW_WAYLAND_EGL(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_WINDOW_WAYLAND_EGL, GstGLWindowWaylandEGL)) #define GST_GL_WINDOW_WAYLAND_EGL(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_WINDOW_WAYLAND_EGL, GstGLWindowWaylandEGL))
#define GST_GL_WINDOW_WAYLAND_EGL_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_WINDOW_WAYLAND_EGL, GstGLWindowWaylandEGLClass)) #define GST_GL_WINDOW_WAYLAND_EGL_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_WINDOW_WAYLAND_EGL, GstGLWindowWaylandEGLClass))
#define GST_GL_IS_WINDOW_WAYLAND_EGL(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_WINDOW_WAYLAND_EGL)) #define GST_IS_GL_WINDOW_WAYLAND_EGL(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_WINDOW_WAYLAND_EGL))
#define GST_GL_IS_WINDOW_WAYLAND_EGL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_WINDOW_WAYLAND_EGL)) #define GST_IS_GL_WINDOW_WAYLAND_EGL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_WINDOW_WAYLAND_EGL))
#define GST_GL_WINDOW_WAYLAND_EGL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_WINDOW_WAYLAND_EGL, GstGLWindowWaylandEGL_Class)) #define GST_GL_WINDOW_WAYLAND_EGL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_WINDOW_WAYLAND_EGL, GstGLWindowWaylandEGL_Class))
typedef struct _GstGLWindowWaylandEGL GstGLWindowWaylandEGL; typedef struct _GstGLWindowWaylandEGL GstGLWindowWaylandEGL;

4
gst-libs/gst/gl/win32/gstglcontext_wgl.h
View file

@ -28,8 +28,8 @@ G_BEGIN_DECLS
#define GST_GL_TYPE_CONTEXT_WGL (gst_gl_context_wgl_get_type()) #define GST_GL_TYPE_CONTEXT_WGL (gst_gl_context_wgl_get_type())
#define GST_GL_CONTEXT_WGL(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_CONTEXT_WGL, GstGLContextWGL)) #define GST_GL_CONTEXT_WGL(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_CONTEXT_WGL, GstGLContextWGL))
#define GST_GL_CONTEXT_WGL_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_CONTEXT_WGL, GstGLContextWGLClass)) #define GST_GL_CONTEXT_WGL_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_CONTEXT_WGL, GstGLContextWGLClass))
#define GST_GL_IS_CONTEXT_WGL(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_CONTEXT_WGL)) #define GST_IS_GL_CONTEXT_WGL(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_CONTEXT_WGL))
#define GST_GL_IS_CONTEXT_WGL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_CONTEXT_WGL)) #define GST_IS_GL_CONTEXT_WGL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_CONTEXT_WGL))
#define GST_GL_CONTEXT_WGL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_CONTEXT_WGL, GstGLContextWGLClass)) #define GST_GL_CONTEXT_WGL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_CONTEXT_WGL, GstGLContextWGLClass))
typedef struct _GstGLContextWGL GstGLContextWGL; typedef struct _GstGLContextWGL GstGLContextWGL;

4
gst-libs/gst/gl/win32/gstglwindow_win32.h
View file

@ -32,8 +32,8 @@ G_BEGIN_DECLS
#define GST_GL_TYPE_WINDOW_WIN32 (gst_gl_window_win32_get_type()) #define GST_GL_TYPE_WINDOW_WIN32 (gst_gl_window_win32_get_type())
#define GST_GL_WINDOW_WIN32(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_WINDOW_WIN32, GstGLWindowWin32)) #define GST_GL_WINDOW_WIN32(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_WINDOW_WIN32, GstGLWindowWin32))
#define GST_GL_WINDOW_WIN32_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_WINDOW_WIN32, GstGLWindowWin32Class)) #define GST_GL_WINDOW_WIN32_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_WINDOW_WIN32, GstGLWindowWin32Class))
#define GST_GL_IS_WINDOW_WIN32(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_WINDOW_WIN32)) #define GST_IS_GL_WINDOW_WIN32(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_WINDOW_WIN32))
#define GST_GL_IS_WINDOW_WIN32_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_WINDOW_WIN32)) #define GST_IS_GL_WINDOW_WIN32_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_WINDOW_WIN32))
#define GST_GL_WINDOW_WIN32_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_WINDOW_WIN32, GstGLWindowWin32Class)) #define GST_GL_WINDOW_WIN32_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_WINDOW_WIN32, GstGLWindowWin32Class))
typedef struct _GstGLWindowWin32 GstGLWindowWin32; typedef struct _GstGLWindowWin32 GstGLWindowWin32;

4
gst-libs/gst/gl/win32/gstglwindow_win32_egl.h
View file

@ -30,8 +30,8 @@ G_BEGIN_DECLS
#define GST_GL_TYPE_WINDOW_WIN32_EGL (gst_gl_window_win32_egl_get_type()) #define GST_GL_TYPE_WINDOW_WIN32_EGL (gst_gl_window_win32_egl_get_type())
#define GST_GL_WINDOW_WIN32_EGL(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_WINDOW_WIN32_EGL, GstGLWindowWin32EGL)) #define GST_GL_WINDOW_WIN32_EGL(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_WINDOW_WIN32_EGL, GstGLWindowWin32EGL))
#define GST_GL_WINDOW_WIN32_EGL_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_WINDOW_WIN32_EGL, GstGLWindowWin32EGLClass)) #define GST_GL_WINDOW_WIN32_EGL_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_WINDOW_WIN32_EGL, GstGLWindowWin32EGLClass))
#define GST_GL_IS_WINDOW_WIN32_EGL(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_WINDOW_WIN32_EGL)) #define GST_IS_GL_WINDOW_WIN32_EGL(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_WINDOW_WIN32_EGL))
#define GST_GL_IS_WINDOW_WIN32_EGL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_WINDOW_WIN32_EGL)) #define GST_IS_GL_WINDOW_WIN32_EGL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_WINDOW_WIN32_EGL))
#define GST_GL_WINDOW_WIN32_EGL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_WINDOW_WIN32_EGL, GstGLWindowWin32EGLClass)) #define GST_GL_WINDOW_WIN32_EGL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_WINDOW_WIN32_EGL, GstGLWindowWin32EGLClass))
typedef struct _GstGLWindowWin32EGL GstGLWindowWin32EGL; typedef struct _GstGLWindowWin32EGL GstGLWindowWin32EGL;

4
gst-libs/gst/gl/x11/gstglcontext_glx.h
View file

@ -30,8 +30,8 @@ G_BEGIN_DECLS
#define GST_GL_TYPE_CONTEXT_GLX (gst_gl_context_glx_get_type()) #define GST_GL_TYPE_CONTEXT_GLX (gst_gl_context_glx_get_type())
#define GST_GL_CONTEXT_GLX(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_CONTEXT_GLX, GstGLContextGLX)) #define GST_GL_CONTEXT_GLX(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_CONTEXT_GLX, GstGLContextGLX))
#define GST_GL_CONTEXT_GLX_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_CONTEXT_GLX, GstGLContextGLXClass)) #define GST_GL_CONTEXT_GLX_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_CONTEXT_GLX, GstGLContextGLXClass))
#define GST_GL_IS_CONTEXT_GLX(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_CONTEXT_GLX)) #define GST_IS_GL_CONTEXT_GLX(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_CONTEXT_GLX))
#define GST_GL_IS_CONTEXT_GLX_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_CONTEXT_GLX)) #define GST_IS_GL_CONTEXT_GLX_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_CONTEXT_GLX))
#define GST_GL_CONTEXT_GLX_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_CONTEXT_GLX, GstGLContextGLX_Class)) #define GST_GL_CONTEXT_GLX_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_CONTEXT_GLX, GstGLContextGLX_Class))
typedef struct _GstGLContextGLX GstGLContextGLX; typedef struct _GstGLContextGLX GstGLContextGLX;

4
gst-libs/gst/gl/x11/gstglwindow_x11.h
View file

@ -31,8 +31,8 @@ G_BEGIN_DECLS
#define GST_GL_TYPE_WINDOW_X11 (gst_gl_window_x11_get_type()) #define GST_GL_TYPE_WINDOW_X11 (gst_gl_window_x11_get_type())
#define GST_GL_WINDOW_X11(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_WINDOW_X11, GstGLWindowX11)) #define GST_GL_WINDOW_X11(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_WINDOW_X11, GstGLWindowX11))
#define GST_GL_WINDOW_X11_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_WINDOW_X11, GstGLWindowX11Class)) #define GST_GL_WINDOW_X11_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_WINDOW_X11, GstGLWindowX11Class))
#define GST_GL_IS_WINDOW_X11(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_WINDOW_X11)) #define GST_IS_GL_WINDOW_X11(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_WINDOW_X11))
#define GST_GL_IS_WINDOW_X11_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_WINDOW_X11)) #define GST_IS_GL_WINDOW_X11_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_WINDOW_X11))
#define GST_GL_WINDOW_X11_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_WINDOW_X11, GstGLWindowX11Class)) #define GST_GL_WINDOW_X11_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_WINDOW_X11, GstGLWindowX11Class))
typedef struct _GstGLWindowX11 GstGLWindowX11; typedef struct _GstGLWindowX11 GstGLWindowX11;