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

glcontext: keep a ref to the active thread

Browse source 
With the macOS/iOS implementations, the active thread can change
multiple times over the life of a pipeline which would expose a race in
the thread tracking.

Fix by taking a ref on the active thread while the context is active.

https://bugzilla.gnome.org/show_bug.cgi?id=779202
This commit is contained in:
fvanzile 2017-02-23 15:42:08 -08:00 committed by Tim-Philipp Müller
parent c020f421e1
commit 178bbc253d
1 changed files with 45 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -674,19 +674,37 @@ gst_gl_context_finalize (GObject * object)
g_cond_wait (&context->priv->destroy_cond, &context->priv->render_lock); g_cond_wait (&context->priv->destroy_cond, &context->priv->render_lock);
GST_INFO_OBJECT (context, "gl thread joined"); GST_INFO_OBJECT (context, "gl thread joined");
if (context->priv->gl_thread) {
g_thread_unref (context->priv->gl_thread); g_thread_unref (context->priv->gl_thread);
context->priv->gl_thread = NULL; context->priv->gl_thread = NULL;
} }
}
g_mutex_unlock (&context->priv->render_lock); g_mutex_unlock (&context->priv->render_lock);
gst_gl_window_set_close_callback (context->window, NULL, NULL, NULL); gst_gl_window_set_close_callback (context->window, NULL, NULL, NULL);
gst_object_unref (context->window); gst_object_unref (context->window);
context->window = NULL;
} }
if (context->priv->sharegroup) if (context->priv->active_thread) {
_context_share_group_unref (context->priv->sharegroup); g_thread_unref (context->priv->active_thread);
context->priv->active_thread = NULL;
}
if (context->priv->gl_thread) {
g_thread_unref (context->priv->gl_thread);
context->priv->gl_thread = NULL;
}
if (context->priv->sharegroup) {
_context_share_group_unref (context->priv->sharegroup);
context->priv->sharegroup = NULL;
}
if (context->display) {
gst_object_unref (context->display); gst_object_unref (context->display);
context->display = NULL;
}
if (context->gl_vtable) { if (context->gl_vtable) {
g_slice_free (GstGLFuncs, context->gl_vtable); g_slice_free (GstGLFuncs, context->gl_vtable);
@ -735,10 +753,18 @@ gst_gl_context_activate (GstGLContext * context, gboolean activate)
result = context_class->activate (context, activate); result = context_class->activate (context, activate);
if (result && activate) { if (result && activate) {
context->priv->active_thread = g_thread_self (); GThread *old_thread = context->priv->active_thread;
context->priv->active_thread = g_thread_ref (g_thread_self ());
if (old_thread) {
g_thread_unref (old_thread);
}
g_private_set (&current_context_key, context); g_private_set (&current_context_key, context);
} else { } else {
if (context->priv->active_thread) {
g_thread_unref (context->priv->active_thread);
context->priv->active_thread = NULL; context->priv->active_thread = NULL;
}
g_private_set (&current_context_key, NULL); g_private_set (&current_context_key, NULL);
} }
GST_OBJECT_UNLOCK (context); GST_OBJECT_UNLOCK (context);
@ -1768,10 +1794,18 @@ gst_gl_wrapped_context_get_gl_platform (GstGLContext * context)
static gboolean static gboolean
gst_gl_wrapped_context_activate (GstGLContext * context, gboolean activate) gst_gl_wrapped_context_activate (GstGLContext * context, gboolean activate)
{ {
if (activate) if (activate) {
context->priv->gl_thread = g_thread_self (); GThread *old_thread = context->priv->gl_thread;
else context->priv->gl_thread = g_thread_ref (g_thread_self ());
if (old_thread) {
g_thread_unref (old_thread);
}
} else {
if (context->priv->gl_thread) {
g_thread_unref (context->priv->gl_thread);
context->priv->gl_thread = NULL; context->priv->gl_thread = NULL;
}
}
return TRUE; return TRUE;
} }