From 27a3bc73c02ec2cd6ed204050c6627268a499ff5 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Thu, 16 Jun 2016 00:44:48 +1000 Subject: qmlglsink: propagate GL context creation failure upwards Otherwise an application cannot know if the qmlglsink will be displaying frames incorrectly/at all. --- ext/qt/qtitem.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ext/qt/qtitem.cc b/ext/qt/qtitem.cc index 8a73ed426..9c359f85d 100644 --- a/ext/qt/qtitem.cc +++ b/ext/qt/qtitem.cc @@ -414,6 +414,8 @@ QtGLVideoItem::onSceneGraphInvalidated () gboolean qt_item_init_winsys (QtGLVideoItem * widget) { + GError *error = NULL; + g_return_val_if_fail (widget != NULL, FALSE); g_mutex_lock (&widget->priv->lock); @@ -446,8 +448,12 @@ qt_item_init_winsys (QtGLVideoItem * widget) return FALSE; } - gst_gl_context_create (widget->priv->context, widget->priv->other_context, - NULL); + if (!gst_gl_context_create (widget->priv->context, widget->priv->other_context, + &error)) { + GST_ERROR ("%s", error->message); + g_mutex_unlock (&widget->priv->lock); + return FALSE; + } g_mutex_unlock (&widget->priv->lock); return TRUE; -- cgit v1.2.1