summaryrefslogtreecommitdiff
path: root/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp')
-rw-r--r--tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
index 0cbee4ba8..afce5052f 100644
--- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
+++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
@@ -93,6 +93,7 @@ private:
QUrl localWavFile2;
QUrl localVideoFile;
QUrl localVideoFile2;
+ QUrl videoDimensionTestFile;
QUrl localCompressedSoundFile;
QUrl localFileWithMetadata;
@@ -187,6 +188,10 @@ void tst_QMediaPlayerBackend::initTestCase()
localVideoFile2 = MediaFileSelector::selectMediaFile(mediaCandidates);
mediaCandidates.clear();
+ mediaCandidates << "qrc:/testdata/BigBuckBunny.mp4";
+ videoDimensionTestFile = MediaFileSelector::selectMediaFile(mediaCandidates);
+
+ mediaCandidates.clear();
mediaCandidates << "qrc:/testdata/nokia-tune.mp3";
mediaCandidates << "qrc:/testdata/nokia-tune.mkv";
localCompressedSoundFile = MediaFileSelector::selectMediaFile(mediaCandidates);
@@ -1224,12 +1229,14 @@ void tst_QMediaPlayerBackend::videoDimensions()
QEXPECT_FAIL("", "On Android isSeekable() is always set to true due to QTBUG-96952", Continue);
#endif
QVERIFY(!player.isSeekable());
- player.setSource(localVideoFile);
+ player.setSource(videoDimensionTestFile);
QTRY_COMPARE(player.mediaStatus(), QMediaPlayer::LoadedMedia);
player.pause();
QTRY_COMPARE(surface.m_totalFrames, 1);
- QCOMPARE(surface.m_frameList.last().height(), 120);
- QCOMPARE(surface.videoSize().height(), 120);
+ QCOMPARE(surface.m_frameList.last().width(), 540);
+ QCOMPARE(surface.videoSize().width(), 540);
+ QCOMPARE(surface.m_frameList.last().height(), 320);
+ QCOMPARE(surface.videoSize().height(), 320);
}
void tst_QMediaPlayerBackend::position()