mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 23:06:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

[723/906] gstglwindow: close has to be called in the glthread.

Browse source 
Indeed 'glXMakeCurrent (window_x11->device, None, NULL);'
has to be called in the thread where the glcontext is actually
current.
Otherwise glXDestroyContext may crash.
This commit is contained in:
Julien Isorce 2013-07-01 14:43:14 +01:00 committed by Tim-Philipp Müller
parent 9af1cee2f7
commit bbc71ed90f
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -160,7 +160,6 @@ static void
gst_gl_window_finalize (GObject * object) gst_gl_window_finalize (GObject * object)
{ {
GstGLWindow *window = GST_GL_WINDOW (object); GstGLWindow *window = GST_GL_WINDOW (object);
GstGLWindowClass *window_class = GST_GL_WINDOW_GET_CLASS (window);
if (window) { if (window) {
gst_gl_window_set_resize_callback (window, NULL, NULL); gst_gl_window_set_resize_callback (window, NULL, NULL);
@ -181,10 +180,6 @@ gst_gl_window_finalize (GObject * object)
window->priv->gl_thread = NULL; window->priv->gl_thread = NULL;
} }
if (window_class->close) {
window_class->close (window);
}
g_mutex_clear (&window->priv->render_lock); g_mutex_clear (&window->priv->render_lock);
g_cond_clear (&window->priv->cond_destroy_context); g_cond_clear (&window->priv->cond_destroy_context);
@ -729,6 +724,10 @@ _gst_gl_window_thread_create_context (GstGLWindow * window)
window->priv->alive = FALSE; window->priv->alive = FALSE;
if (window_class->close) {
window_class->close (window);
}
g_cond_signal (&window->priv->cond_destroy_context); g_cond_signal (&window->priv->cond_destroy_context);
g_mutex_unlock (&window->priv->render_lock); g_mutex_unlock (&window->priv->render_lock);