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

qt6glwindow: Fallback to GL_RGB on CopyTexImage2D error

Browse source 
With GLES 2.0 we are forced to use CopyTextImage2D which requires
passing an internal format. With QT6 eglfs, we need to pass GL_RGB
instead, probably because of how the texture has been created. As its
hard to guess, simply fallback to GL_RGB on failure. This fixes usage
or qml6glsrc with eglfs backend, without loosing support for
semi-transparent window on other platforms.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7321>
This commit is contained in:
Nicolas Dufresne 2024-08-07 15:56:08 -04:00 committed by GStreamer Marge Bot
parent c9df0a5799
commit 3f2ed552fb
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
subprojects/gst-plugins-good/ext/qt6/qt6glwindow.cc
View file

@ -62,6 +62,7 @@ struct _Qt6GLWindowPrivate
GstVideoFrame mapped_frame;
GstGLBaseMemoryAllocator *gl_allocator;
GstGLAllocationParams *gl_params;
GLenum internal_format;
gboolean initted;
gboolean updated;
@ -99,6 +100,7 @@ Qt6GLWindow::Qt6GLWindow (QWindow * parent, QQuickWindow *src)
this->priv->display = gst_qml6_get_gl_display(FALSE);
this->priv->result = TRUE;
this->priv->internal_format = GL_RGBA;
connect (source, SIGNAL(beforeRendering()), this, SLOT(beforeRendering()), Qt::DirectConnection);
connect (source, SIGNAL(afterRendering()), this, SLOT(afterRendering()), Qt::DirectConnection);
@ -252,7 +254,21 @@ Qt6GLWindow::afterRendering()
0, 0, width, height,
GL_COLOR_BUFFER_BIT, GL_LINEAR);
} else {
gl->CopyTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, width, height, 0);
gl->CopyTexImage2D (GL_TEXTURE_2D, 0, this->priv->internal_format, 0, 0, width, height, 0);
GLenum err = gl->GetError ();
if (err && this->priv->internal_format == GL_RGBA) {
this->priv->internal_format = GL_RGB;
GST_WARNING ("Falling back to GL_RGB (opaque) when copying QML texture.");
gl->CopyTexImage2D (GL_TEXTURE_2D, 0, GL_RGB, 0, 0, width, height, 0);
err = gl->GetError ();
}
if (err) {
GST_ERROR ("CopyTexImage2D() failed with error: 0x%X", err);
ret = FALSE;
goto errors;
}
}
}
@ -304,6 +320,7 @@ Qt6GLWindow::onSceneGraphInitialized()
this->priv->initted = gst_qml6_get_gl_wrapcontext (this->priv->display,
&this->priv->other_context, &this->priv->context);
this->priv->internal_format = GL_RGBA;
if (this->priv->initted && this->priv->other_context) {
const GstGLFuncs *gl;