summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2021-08-20 15:13:07 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-08-21 08:59:29 +0000
commit00a6e970c30cd3298e45020a7e4eb5bd60d65170 (patch)
treec1eb4bea07b0b48d947e3b263fdd58aa4c4b6fd3 /tests
parenta83d626631cf5ff4607c4b67b13e1e7c28484fd7 (diff)
Fix the Video QML element and smaller cleanups in VideoOutput
Remove the flush mode from VideoOutput, we should always show an empty frame when playback is stopped. Fix the QML Video element and remove API that we do not support anymore. Adjust some other parts to work correctly after API changes in the MediaPlayer and VideoOutput elements. Fixes: QTBUG-95133 Change-Id: Idf93810665f1b329ef264f59f761188e8056d755 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit a86d741a95c693324e47bb6ff41c2c8a747c52cd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/integration/qquickvideooutput/tst_qquickvideooutput.cpp19
1 files changed, 0 insertions, 19 deletions
diff --git a/tests/auto/integration/qquickvideooutput/tst_qquickvideooutput.cpp b/tests/auto/integration/qquickvideooutput/tst_qquickvideooutput.cpp
index 057505223..29b575f82 100644
--- a/tests/auto/integration/qquickvideooutput/tst_qquickvideooutput.cpp
+++ b/tests/auto/integration/qquickvideooutput/tst_qquickvideooutput.cpp
@@ -72,7 +72,6 @@ public slots:
private slots:
void fillMode();
- void flushMode();
void orientation();
void surfaceSource();
void paintSurface();
@@ -142,24 +141,6 @@ void tst_QQuickVideoOutput::fillMode()
delete videoOutput;
}
-void tst_QQuickVideoOutput::flushMode()
-{
- QQmlComponent component(&m_engine);
- component.loadUrl(QUrl("qrc:/main.qml"));
-
- QObject *videoOutput = component.create();
- QVERIFY(videoOutput != nullptr);
-
- QSignalSpy propSpy(videoOutput, SIGNAL(flushModeChanged()));
-
- QCOMPARE(videoOutput->property("flushMode").value<QQuickVideoOutput::FlushMode>(), QQuickVideoOutput::EmptyFrame);
- QCOMPARE(propSpy.count(), 0);
-
- videoOutput->setProperty("flushMode", QVariant(int(QQuickVideoOutput::FirstFrame)));
- QCOMPARE(videoOutput->property("fillMode").value<QQuickVideoOutput::FlushMode>(), QQuickVideoOutput::FirstFrame);
- QCOMPARE(propSpy.count(), 1);
-}
-
void tst_QQuickVideoOutput::orientation()
{
QQmlComponent component(&m_engine);