diff options
| author | Sergey Borovkov <sergey.borovkov@wireload.net> | 2016-04-14 18:14:32 +0300 |
|---|---|---|
| committer | Matthew Waters <matthew@centricular.com> | 2016-06-16 01:49:16 +1000 |
| commit | 180405714c88c0fe1081f3ec5ca4838c1c127bd0 (patch) | |
| tree | 1b6e08eb169c3394fe67a8dc3edf3b0978e70934 /ext | |
| parent | 14c6fece0972183053f23874d0b5fd7b072e40d5 (diff) | |
| download | gstreamer-plugins-bad-180405714c88c0fe1081f3ec5ca4838c1c127bd0.tar.gz | |
qml: Enable qmlglsink for eglfs
https://bugzilla.gnome.org/show_bug.cgi?id=763044
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/qt/qtitem.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/ext/qt/qtitem.cc b/ext/qt/qtitem.cc index 9c359f85d..505ed03f2 100644 --- a/ext/qt/qtitem.cc +++ b/ext/qt/qtitem.cc @@ -44,7 +44,7 @@ #include <gst/gl/wayland/gstgldisplay_wayland.h> #endif -#if GST_GL_HAVE_WINDOW_ANDROID && GST_GL_HAVE_PLATFORM_EGL && defined (HAVE_QT_ANDROID) +#if GST_GL_HAVE_PLATFORM_EGL && defined (HAVE_QT_EGLFS) #include <gst/gl/egl/gstgldisplay_egl.h> #include <gst/gl/egl/gstglcontext_egl.h> #endif @@ -162,10 +162,14 @@ QtGLVideoItem::QtGLVideoItem() gst_gl_display_wayland_new_with_display (wayland_display); } #endif -#if GST_GL_HAVE_WINDOW_ANDROID && GST_GL_HAVE_PLATFORM_EGL && defined (HAVE_QT_ANDROID) +#if GST_GL_HAVE_PLATFORM_EGL && GST_GL_HAVE_WINDOW_ANDROID if (QString::fromUtf8 ("android") == app->platformName()) this->priv->display = (GstGLDisplay *) gst_gl_display_egl_new (); +#elif GST_GL_HAVE_PLATFORM_EGL && defined (HAVE_QT_EGLFS) + if (QString::fromUtf8("eglfs") == app->platformName()) + this->priv->display = (GstGLDisplay *) gst_gl_display_egl_new (); #endif + #if GST_GL_HAVE_WINDOW_COCOA && GST_GL_HAVE_PLATFORM_COCOA && defined (HAVE_QT_MAC) if (QString::fromUtf8 ("cocoa") == app->platformName()) this->priv->display = (GstGLDisplay *) gst_gl_display_cocoa_new (); @@ -348,7 +352,8 @@ QtGLVideoItem::onSceneGraphInitialized () platform, gl_api); } #endif -#if GST_GL_HAVE_WINDOW_ANDROID && GST_GL_HAVE_PLATFORM_EGL && defined (HAVE_QT_ANDROID) + +#if GST_GL_HAVE_PLATFORM_EGL && defined (HAVE_QT_EGLFS) if (GST_IS_GL_DISPLAY_EGL (this->priv->display)) { platform = GST_GL_PLATFORM_EGL; gl_api = gst_gl_context_get_current_gl_api (platform, NULL, NULL); @@ -359,6 +364,7 @@ QtGLVideoItem::onSceneGraphInitialized () platform, gl_api); } #endif + #if GST_GL_HAVE_WINDOW_COCOA && GST_GL_HAVE_PLATFORM_COCOA && defined (HAVE_QT_MAC) if (this->priv->display) { platform = GST_GL_PLATFORM_CGL; |