mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 05:06:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

qt: return a different GstGLDisplay object when the first sink requests

Browse source 
This allows the 'replace-gstreamer-opengl-context' context machinery to
correctly replace the OpenGL context used by the pipeline when the first
qmlglsink is added to the pipeline.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/982>
This commit is contained in:
Matthew Waters 2021-05-03 17:39:05 +10:00 committed by GStreamer Marge Bot
parent 0ff50d6723
commit c7181bedac
5 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ext/qt/gstqtglutility.cc
View file

@ -60,9 +60,10 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
G_LOCK_DEFINE_STATIC (display_lock); G_LOCK_DEFINE_STATIC (display_lock);
static GWeakRef qt_display; static GWeakRef qt_display;
static gboolean sink_retrieved = FALSE;
GstGLDisplay * GstGLDisplay *
gst_qt_get_gl_display () gst_qt_get_gl_display (gboolean sink)
{ {
GstGLDisplay *display = NULL; GstGLDisplay *display = NULL;
QGuiApplication *app = static_cast<QGuiApplication *> (QCoreApplication::instance ()); QGuiApplication *app = static_cast<QGuiApplication *> (QCoreApplication::instance ());
@ -80,9 +81,14 @@ gst_qt_get_gl_display ()
/* XXX: this assumes that only one display will ever be created by Qt */ /* XXX: this assumes that only one display will ever be created by Qt */
display = static_cast<GstGLDisplay *>(g_weak_ref_get (&qt_display)); display = static_cast<GstGLDisplay *>(g_weak_ref_get (&qt_display));
if (display) { if (display) {
GST_INFO ("returning previously created display"); if (sink_retrieved) {
G_UNLOCK (display_lock); GST_INFO ("returning previously created display");
return display; G_UNLOCK (display_lock);
return display;
} else if (sink) {
sink_retrieved = sink;
}
gst_clear_object (&display);
} }
GST_INFO ("QGuiApplication::instance()->platformName() %s", app->platformName().toUtf8().data()); GST_INFO ("QGuiApplication::instance()->platformName() %s", app->platformName().toUtf8().data());

2
ext/qt/gstqtglutility.h
View file

@ -28,7 +28,7 @@
G_BEGIN_DECLS G_BEGIN_DECLS
GstGLDisplay * gst_qt_get_gl_display (); GstGLDisplay * gst_qt_get_gl_display (gboolean sink);
gboolean gst_qt_get_gl_wrapcontext (GstGLDisplay * display, gboolean gst_qt_get_gl_wrapcontext (GstGLDisplay * display,
GstGLContext **wrap_glcontext, GstGLContext **context); GstGLContext **wrap_glcontext, GstGLContext **context);

2
ext/qt/gstqtoverlay.cc
View file

@ -468,7 +468,7 @@ gst_qt_overlay_change_state (GstElement * element,
return GST_STATE_CHANGE_FAILURE; return GST_STATE_CHANGE_FAILURE;
} }
display = gst_qt_get_gl_display (); display = gst_qt_get_gl_display (FALSE);
if (display != filter->display) if (display != filter->display)
/* always propagate. The application may need to choose between window /* always propagate. The application may need to choose between window

2
ext/qt/qtitem.cc
View file

@ -129,7 +129,7 @@ QtGLVideoItem::QtGLVideoItem()
g_mutex_init (&this->priv->lock); g_mutex_init (&this->priv->lock);
this->priv->display = gst_qt_get_gl_display(); this->priv->display = gst_qt_get_gl_display(TRUE);
connect(this, SIGNAL(windowChanged(QQuickWindow*)), this, connect(this, SIGNAL(windowChanged(QQuickWindow*)), this,
SLOT(handleWindowChanged(QQuickWindow*))); SLOT(handleWindowChanged(QQuickWindow*)));

2
ext/qt/qtwindow.cc
View file

@ -117,7 +117,7 @@ QtGLWindow::QtGLWindow ( QWindow * parent, QQuickWindow *src ) :
g_mutex_init (&this->priv->lock); g_mutex_init (&this->priv->lock);
g_cond_init (&this->priv->update_cond); g_cond_init (&this->priv->update_cond);
this->priv->display = gst_qt_get_gl_display(); this->priv->display = gst_qt_get_gl_display(FALSE);
connect (source, SIGNAL(beforeRendering()), this, SLOT(beforeRendering()), Qt::DirectConnection); connect (source, SIGNAL(beforeRendering()), this, SLOT(beforeRendering()), Qt::DirectConnection);
connect (source, SIGNAL(afterRendering()), this, SLOT(afterRendering()), Qt::DirectConnection); connect (source, SIGNAL(afterRendering()), this, SLOT(afterRendering()), Qt::DirectConnection);