mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-24 08:08:22 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl/cocoa: avoid deadlock when creating context on the main thread.

Browse source 
Make window/view creation async so that it is possible to
gst_gl_context_create from the main thread.
This commit is contained in:
Matthew Waters 2015-03-03 18:05:04 +11:00 committed by Tim-Philipp Müller
parent 813fb633b4
commit 35476a4cb4
3 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ext/gl/caopengllayersink.m
View file

@ -272,8 +272,6 @@ _ensure_gl_setup (GstCAOpenGLLayerSink * ca_sink)
{ {
GError *error = NULL; GError *error = NULL;
g_assert (![NSThread isMainThread]);
if (!gst_gl_ensure_element_data (ca_sink, &ca_sink->display, if (!gst_gl_ensure_element_data (ca_sink, &ca_sink->display,
&ca_sink->other_context)) &ca_sink->other_context))
return FALSE; return FALSE;
@ -400,6 +398,7 @@ gst_ca_opengl_layer_sink_change_state (GstElement * element, GstStateChange tran
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
_ensure_gl_setup (ca_sink);
break; break;
case GST_STATE_CHANGE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
g_atomic_int_set (&ca_sink->to_quit, 0); g_atomic_int_set (&ca_sink->to_quit, 0);

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

@ -62,7 +62,6 @@ GstGLWindowCocoa * gst_gl_window_cocoa_new (void);
void gst_gl_window_cocoa_draw_thread (GstGLWindowCocoa *window_cocoa); void gst_gl_window_cocoa_draw_thread (GstGLWindowCocoa *window_cocoa);
G_END_DECLS G_END_DECLS
#endif /* __GST_GL_WINDOW_COCOA_H__ */ #endif /* __GST_GL_WINDOW_COCOA_H__ */

19
gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m
View file

@ -92,6 +92,9 @@ struct _GstGLWindowCocoaPrivate
gint preferred_height; gint preferred_height;
GLint viewport_dim[4]; GLint viewport_dim[4];
/* atomic set when the internal NSView has been created */
int view_ready;
}; };
static void static void
@ -178,7 +181,9 @@ gst_gl_window_cocoa_create_window (GstGLWindowCocoa *window_cocoa)
GST_DEBUG ("NSWindow id: %"G_GUINTPTR_FORMAT, (guintptr) priv->internal_win_id); GST_DEBUG ("NSWindow id: %"G_GUINTPTR_FORMAT, (guintptr) priv->internal_win_id);
[priv->internal_win_id setContentView:glView]; [priv->internal_win_id setContentView:glView];
g_atomic_int_set (&window_cocoa->priv->view_ready, 1);
return TRUE; return TRUE;
} }
@ -287,7 +292,14 @@ static void
gst_gl_window_cocoa_draw (GstGLWindow * window) gst_gl_window_cocoa_draw (GstGLWindow * window)
{ {
GstGLWindowCocoa *window_cocoa = GST_GL_WINDOW_COCOA (window); GstGLWindowCocoa *window_cocoa = GST_GL_WINDOW_COCOA (window);
GstGLNSView *view = (GstGLNSView *)[window_cocoa->priv->internal_win_id contentView]; GstGLNSView *view;
/* As the view is created asynchronously in the main thread we cannot know
* exactly when it will be ready to draw to */
if (!g_atomic_int_get (&window_cocoa->priv->view_ready))
return;
view = (GstGLNSView *)[window_cocoa->priv->internal_win_id contentView];
/* this redraws the GstGLCAOpenGLLayer which calls /* this redraws the GstGLCAOpenGLLayer which calls
* gst_gl_window_cocoa_draw_thread(). Use an explicit CATransaction since we * gst_gl_window_cocoa_draw_thread(). Use an explicit CATransaction since we
@ -584,9 +596,8 @@ _invoke_on_main (GstGLWindowCB func, gpointer data)
if ([NSThread isMainThread]) { if ([NSThread isMainThread]) {
func (data); func (data);
} else { } else {
dispatch_sync (dispatch_get_main_queue (), ^{ dispatch_async (dispatch_get_main_queue (), ^{
func (data); func (data);
}); });
} }
} }