VideoOutput: Introduce flushMode property

Added flushMode property to QML VideoOutput element to define
what should be shown when flush is requested.

Takes affect only for QDeclarativeVideoRendererBackend
and when QSGVideoItemSurface is already started.

Flushing (passing empty video frame to the surface) is usually performed
when EndOfMedia or playback is stopped.
Which caused disappearing the content and blinking if playlist is used.

Using this property now possible to define
what frame (last, first or empty) should be shown when playback is stopped or finished.

By default shows empty frame (clears the video output).

To show a frame it requires to keep QVideoFrame and thus its data.

Task-number: QTBUG-37301
Task-number: QTBUG-49446
Change-Id: I3be5309217b9f543da804e3b616dee9d97fba65f
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>

1 files changed, 20 insertions, 0 deletions

diff --git a/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp b/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp
index 707a01512..3059a4641 100644
--- a/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp
+++ b/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp
@@ -106,6 +106,7 @@ public slots:
 
 private slots:
     void fillMode();
+    void flushMode();
     void orientation();
     void surfaceSource();
     void sourceRect();
@@ -161,6 +162,7 @@ void tst_QDeclarativeVideoOutput::initTestCase()
 }
 
 Q_DECLARE_METATYPE(QDeclarativeVideoOutput::FillMode)
+Q_DECLARE_METATYPE(QDeclarativeVideoOutput::FlushMode)
 
 tst_QDeclarativeVideoOutput::tst_QDeclarativeVideoOutput()
     : m_mappingComponent(0)
@@ -199,6 +201,24 @@ void tst_QDeclarativeVideoOutput::fillMode()
     delete videoOutput;
 }
 
+void tst_QDeclarativeVideoOutput::flushMode()
+{
+    QQmlComponent component(&m_engine);
+    component.setData(m_plainQML, QUrl());
+
+    QObject *videoOutput = component.create();
+    QVERIFY(videoOutput != 0);
+
+    QSignalSpy propSpy(videoOutput, SIGNAL(flushModeChanged()));
+
+    QCOMPARE(videoOutput->property("flushMode").value<QDeclarativeVideoOutput::FlushMode>(), QDeclarativeVideoOutput::EmptyFrame);
+    QCOMPARE(propSpy.count(), 0);
+
+    videoOutput->setProperty("flushMode", QVariant(int(QDeclarativeVideoOutput::FirstFrame)));
+    QCOMPARE(videoOutput->property("fillMode").value<QDeclarativeVideoOutput::FlushMode>(), QDeclarativeVideoOutput::FirstFrame);
+    QCOMPARE(propSpy.count(), 1);
+}
+
 void tst_QDeclarativeVideoOutput::orientation()
 {
     QQmlComponent component(&m_engine);