From 5155d1afb36a44a3916cce1abf124c67f9cb4700 Mon Sep 17 00:00:00 2001 From: Val Doroshchuk Date: Fri, 13 Sep 2019 14:43:57 +0200 Subject: 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 --- .../auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tests') 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 + 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; -- cgit v1.2.3