summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVal Doroshchuk <valentyn.doroshchuk@qt.io>2019-09-13 14:43:57 +0200
committerVaL Doroshchuk <valentyn.doroshchuk@qt.io>2019-09-27 08:42:53 +0000
commit5155d1afb36a44a3916cce1abf124c67f9cb4700 (patch)
tree243a5db260be417d2d5038a3f699aa8505633906
parent5323fcef6cfcaa14ff6a7f53c546020d523f8186 (diff)
DirectShow: Fix tst_QMediaPlayerBackend::surfaceTest
YVU formats are likely not supported by the codecs and the pipeline will not be negotiated in this case. Fixes BFAIL : tst_QMediaPlayerBackend::surfaceTest(YVU formats) 'surface.m_totalFrames >= 25' returned FALSE. (Expected >= 25, got 0) Task-number: QTBUG-46368 Change-Id: I6bf1a5822481a018549fe58aaf5fe79c79ff8456 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
-rw-r--r--tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
index 25430a189..9d29025c8 100644
--- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
+++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
@@ -39,6 +39,8 @@
#include "../shared/mediafileselector.h"
//TESTED_COMPONENT=src/multimedia
+#include <QtMultimedia/private/qtmultimedia-config_p.h>
+
QT_USE_NAMESPACE
/*
@@ -1357,8 +1359,10 @@ void tst_QMediaPlayerBackend::surfaceTest_data()
QTest::newRow("RGB formats")
<< formatsRGB;
+#if !QT_CONFIG(directshow)
QTest::newRow("YVU formats")
<< formatsYUV;
+#endif
QTest::newRow("RGB & YUV formats")
<< formatsRGB + formatsYUV;