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

glcontext: move display from priv

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=750310
This commit is contained in:
Julien Isorce 2015-06-15 16:36:26 +01:00 committed by Tim-Philipp Müller
parent cbc3f1242f
commit 38a1939ea1
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -151,8 +151,6 @@ static void gst_gl_context_finalize (GObject * object);
struct _GstGLContextPrivate struct _GstGLContextPrivate
{ {
GstGLDisplay *display;
GThread *gl_thread; GThread *gl_thread;
GThread *active_thread; GThread *active_thread;
@ -212,7 +210,7 @@ _ensure_window (GstGLContext * context)
if (context->window) if (context->window)
return; return;
window = gst_gl_window_new (context->priv->display); window = gst_gl_window_new (context->display);
gst_gl_context_set_window (context, window); gst_gl_context_set_window (context, window);
@ -312,7 +310,7 @@ gst_gl_context_new (GstGLDisplay * display)
return NULL; return NULL;
} }
context->priv->display = gst_object_ref (display); context->display = gst_object_ref (display);
GST_DEBUG_OBJECT (context, GST_DEBUG_OBJECT (context,
"Done creating context for display %" GST_PTR_FORMAT " (user_choice:%s)", "Done creating context for display %" GST_PTR_FORMAT " (user_choice:%s)",
@ -360,7 +358,7 @@ gst_gl_context_new_wrapped (GstGLDisplay * display, guintptr handle,
context = (GstGLContext *) context_wrap; context = (GstGLContext *) context_wrap;
context->priv->display = gst_object_ref (display); context->display = gst_object_ref (display);
context_wrap->handle = handle; context_wrap->handle = handle;
context_wrap->platform = context_type; context_wrap->platform = context_type;
context_wrap->available_apis = available_apis; context_wrap->available_apis = available_apis;
@ -587,7 +585,7 @@ gst_gl_context_finalize (GObject * object)
gst_object_unref (context->window); gst_object_unref (context->window);
} }
gst_object_unref (context->priv->display); gst_object_unref (context->display);
if (context->gl_vtable) { if (context->gl_vtable) {
g_slice_free (GstGLFuncs, context->gl_vtable); g_slice_free (GstGLFuncs, context->gl_vtable);
@ -1221,7 +1219,7 @@ gst_gl_context_create_thread (GstGLContext * context)
context_class = GST_GL_CONTEXT_GET_CLASS (context); context_class = GST_GL_CONTEXT_GET_CLASS (context);
window_class = GST_GL_WINDOW_GET_CLASS (context->window); window_class = GST_GL_WINDOW_GET_CLASS (context->window);
display_api = gst_gl_display_get_gl_api_unlocked (context->priv->display); display_api = gst_gl_display_get_gl_api_unlocked (context->display);
if (display_api == GST_GL_API_NONE) { if (display_api == GST_GL_API_NONE) {
g_set_error (error, GST_GL_CONTEXT_ERROR, GST_GL_CONTEXT_ERROR_WRONG_API, g_set_error (error, GST_GL_CONTEXT_ERROR, GST_GL_CONTEXT_ERROR_WRONG_API,
"Cannot create context with satisfying requested apis " "Cannot create context with satisfying requested apis "
@ -1563,7 +1561,7 @@ gst_gl_context_get_display (GstGLContext * context)
{ {
g_return_val_if_fail (GST_GL_IS_CONTEXT (context), NULL); g_return_val_if_fail (GST_GL_IS_CONTEXT (context), NULL);
return gst_object_ref (context->priv->display); return gst_object_ref (context->display);
} }
typedef struct typedef struct

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

@ -72,6 +72,7 @@ struct _GstGLContext {
/*< private >*/ /*< private >*/
GstObject parent; GstObject parent;
GstGLDisplay *display;
GstGLWindow *window; GstGLWindow *window;
GstGLFuncs *gl_vtable; GstGLFuncs *gl_vtable;