1*4882a593SmuzhiyunFrom 7a61361b5ff151ad36de04ca77a86944f14a2ab8 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Jeffy Chen <jeffy.chen@rock-chips.com> 3*4882a593SmuzhiyunDate: Fri, 15 Jan 2021 16:27:59 +0800 4*4882a593SmuzhiyunSubject: [PATCH 11/17] quicktools: Prefer VideoWindowBackend when using gst 5*4882a593Smuzhiyun sink 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunPrefer VideoWindowBackend for video overlay. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunSigned-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> 10*4882a593Smuzhiyun--- 11*4882a593Smuzhiyun .../qdeclarativevideooutput.cpp | 15 +++++++++++---- 12*4882a593Smuzhiyun 1 file changed, 11 insertions(+), 4 deletions(-) 13*4882a593Smuzhiyun 14*4882a593Smuzhiyundiff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp 15*4882a593Smuzhiyunindex ca3a4b2..d2f735b 100644 16*4882a593Smuzhiyun--- a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp 17*4882a593Smuzhiyun+++ b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp 18*4882a593Smuzhiyun@@ -245,6 +245,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QMediaPluginLoader, videoBackendFactoryLoader, 19*4882a593Smuzhiyun bool QDeclarativeVideoOutput::createBackend(QMediaService *service) 20*4882a593Smuzhiyun { 21*4882a593Smuzhiyun bool backendAvailable = false; 22*4882a593Smuzhiyun+ bool preferWindowBackend = !qgetenv( "QT_GSTREAMER_WINDOW_VIDEOSINK" ).isEmpty(); 23*4882a593Smuzhiyun 24*4882a593Smuzhiyun const auto instances = videoBackendFactoryLoader()->instances(QLatin1String("declarativevideobackend")); 25*4882a593Smuzhiyun for (QObject *instance : instances) { 26*4882a593Smuzhiyun@@ -257,10 +258,11 @@ bool QDeclarativeVideoOutput::createBackend(QMediaService *service) 27*4882a593Smuzhiyun } 28*4882a593Smuzhiyun } 29*4882a593Smuzhiyun } 30*4882a593Smuzhiyun+ 31*4882a593Smuzhiyun+retry: 32*4882a593Smuzhiyun #if QT_CONFIG(opengl) 33*4882a593Smuzhiyun- if (!backendAvailable) { 34*4882a593Smuzhiyun- if (!m_backend) 35*4882a593Smuzhiyun- m_backend.reset(new QDeclarativeVideoRendererBackend(this)); 36*4882a593Smuzhiyun+ if (!backendAvailable && !preferWindowBackend) { 37*4882a593Smuzhiyun+ m_backend.reset(new QDeclarativeVideoRendererBackend(this)); 38*4882a593Smuzhiyun if (m_backend->init(service)) 39*4882a593Smuzhiyun backendAvailable = true; 40*4882a593Smuzhiyun } 41*4882a593Smuzhiyun@@ -268,13 +270,18 @@ bool QDeclarativeVideoOutput::createBackend(QMediaService *service) 42*4882a593Smuzhiyun 43*4882a593Smuzhiyun // QDeclarativeVideoWindowBackend only works when there is a service with a QVideoWindowControl. 44*4882a593Smuzhiyun // Without service, the QDeclarativeVideoRendererBackend should always work. 45*4882a593Smuzhiyun- if (!backendAvailable) { 46*4882a593Smuzhiyun+ if (!backendAvailable && service) { 47*4882a593Smuzhiyun Q_ASSERT(service); 48*4882a593Smuzhiyun m_backend.reset(new QDeclarativeVideoWindowBackend(this)); 49*4882a593Smuzhiyun if (m_backend->init(service)) 50*4882a593Smuzhiyun backendAvailable = true; 51*4882a593Smuzhiyun } 52*4882a593Smuzhiyun 53*4882a593Smuzhiyun+ if (!backendAvailable && preferWindowBackend) { 54*4882a593Smuzhiyun+ preferWindowBackend = false; 55*4882a593Smuzhiyun+ goto retry; 56*4882a593Smuzhiyun+ } 57*4882a593Smuzhiyun+ 58*4882a593Smuzhiyun if (backendAvailable) { 59*4882a593Smuzhiyun // Since new backend has been created needs to update its geometry. 60*4882a593Smuzhiyun m_geometryDirty = true; 61*4882a593Smuzhiyun-- 62*4882a593Smuzhiyun2.20.1 63*4882a593Smuzhiyun 64