projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
577ca6a
)
gtkglsink: Release the widget lock when trying to get the GL context
author
Thibault Saunier
<tsaunier@gnome.org>
Mon, 6 Jul 2015 17:33:35 +0000
(19:33 +0200)
committer
Thibault Saunier
<tsaunier@gnome.org>
Mon, 6 Jul 2015 17:33:35 +0000
(19:33 +0200)
Otherwise we might be waiting for the lock on the main loop (for
example in the ->render vmethod) and thus we will deadlock.
ext/gtk/gtkgstglwidget.c
patch
|
blob
|
history
diff --git
a/ext/gtk/gtkgstglwidget.c
b/ext/gtk/gtkgstglwidget.c
index e7e12210cdd9759f830e10281fa66865d931e65c..81950342d5fb76131df16b097369467615a626c9 100644
(file)
--- a/
ext/gtk/gtkgstglwidget.c
+++ b/
ext/gtk/gtkgstglwidget.c
@@
-683,7
+683,9
@@
gtk_gst_gl_widget_init_winsys (GtkGstGLWidget * widget)
}
if (!widget->priv->other_context) {
+ g_mutex_unlock (&widget->priv->lock);
_invoke_on_main ((ThreadFunc) _get_gl_context, widget);
+ g_mutex_lock (&widget->priv->lock);
}
if (!GST_GL_IS_CONTEXT (widget->priv->other_context)) {