From 836bde2ba1a3fc5bdce51aad839e07fb7584af35 Mon Sep 17 00:00:00 2001
From: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
Date: Wed, 30 Oct 2019 14:01:18 +0100
Subject: Introduce MediaPlayer::videoOutput property

This property holds the target video output,
and allows to render video to multiple items.

    MediaPlayer {
        videoOutput: [videoOutput1, 1, "ignored", videoOutput2.videoSurface]
    }

Incorrect inputs are ignored.

The property also accepts single either QAbstractVideoSurface or QDeclarativeVideoOutput objects.

Task-number: QTBUG-32939
Change-Id: I41fc557dcac60be6d70b3889036ff4ae75734cc0
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
---
 src/imports/multimedia/qdeclarativeaudio.cpp | 59 ++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

(limited to 'src/imports/multimedia/qdeclarativeaudio.cpp')

diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp
index 9d41c77fa..fcba6257d 100644
--- a/src/imports/multimedia/qdeclarativeaudio.cpp
+++ b/src/imports/multimedia/qdeclarativeaudio.cpp
@@ -45,12 +45,14 @@
 
 #include <qmediaservice.h>
 #include <private/qmediaserviceprovider_p.h>
+#include <private/qdeclarativevideooutput_p.h>
 #include <qmetadatareadercontrol.h>
 #include <qmediaavailabilitycontrol.h>
 
 #include "qdeclarativeplaylist_p.h"
 #include "qdeclarativemediametadata_p.h"
 
+#include <QAbstractVideoSurface>
 #include <QTimerEvent>
 #include <QtQml/qqmlengine.h>
 
@@ -129,6 +131,63 @@ QDeclarativeAudio::~QDeclarativeAudio()
     delete m_player;
 }
 
+/*!
+    \since 5.15
+    \qmlproperty url QtMultimedia::MediaPlayer::videoOutput
+
+    This property holds the target video output.
+    Accepts one or an array of QAbstractVideoSurface or VideoOutput elements.
+
+    \snippet multimedia-snippets/multiple-videooutputs.qml complete
+
+    \sa QMediaPlayer::setVideoOutput()
+*/
+
+QVariant QDeclarativeAudio::videoOutput() const
+{
+    return m_videoOutput;
+}
+
+void QDeclarativeAudio::setVideoOutput(const QVariant &v)
+{
+    if (m_videoOutput == v)
+        return;
+
+    QAbstractVideoSurface *surface = nullptr;
+    auto vo = v.value<QDeclarativeVideoOutput *>();
+    if (vo)
+        surface = vo->videoSurface();
+    else
+        surface = v.value<QAbstractVideoSurface *>();
+
+    // If only one object has been passed.
+    if (surface) {
+        m_player->setVideoOutput(surface);
+    } else {
+        QVector<QAbstractVideoSurface *> surfaces;
+        // Check if it is an array.
+        auto arr = v.value<QJSValue>();
+        if (!arr.isNull()) {
+            const int len = arr.property("length").toInt();
+            for (int i = 0; i < len; ++i) {
+                auto &&v = arr.property(i);
+                if (v.isQObject()) {
+                    auto obj = v.toQObject();
+                    vo = qobject_cast<QDeclarativeVideoOutput *>(obj);
+                    surface = vo ? vo->videoSurface() : qobject_cast<QAbstractVideoSurface *>(obj);
+                    if (surface)
+                        surfaces.append(surface);
+                }
+            }
+        }
+
+        m_player->setVideoOutput(surfaces);
+    }
+
+    m_videoOutput = v;
+    emit videoOutputChanged();
+}
+
 /*!
     \qmlproperty enumeration QtMultimedia::Audio::availability
 
-- 
cgit v1.2.3