diff options
| author | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-11-27 13:18:55 +0100 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-12-04 18:43:25 +0100 |
| commit | c5f34e063927ed10206f9f378092f6fd3f71af3c (patch) | |
| tree | c7f559855acbe2b7bf7455ab1aa352737b6a4d4c /tests/auto/unit/qvideoframe | |
| parent | e4c627ecc2ade9de3cf795f6f5f245be0d3a8e85 (diff) | |
| download | qtmultimedia-c5f34e063927ed10206f9f378092f6fd3f71af3c.tar.gz | |
DirectShow: Disable QVideoFrame::image() test
Change-Id: I7afeb2d74e95f1e65335bda505d8762b68393ae4
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/auto/unit/qvideoframe')
| -rw-r--r-- | tests/auto/unit/qvideoframe/BLACKLIST | 2 | ||||
| -rw-r--r-- | tests/auto/unit/qvideoframe/tst_qvideoframe.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/unit/qvideoframe/BLACKLIST b/tests/auto/unit/qvideoframe/BLACKLIST deleted file mode 100644 index 1fa752da5..000000000 --- a/tests/auto/unit/qvideoframe/BLACKLIST +++ /dev/null @@ -1,2 +0,0 @@ -[image:64x64 AYUV444,64x64 YUV444,64x64 YUV420P,64x64 YV12,64x64 UYVY,64x64 YUYV,64x64 NV12,64x64 NV21] -windows-10 ci diff --git a/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp b/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp index de9295c33..943051435 100644 --- a/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp +++ b/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp @@ -33,6 +33,7 @@ #include <qvideoframe.h> #include <QtGui/QImage> #include <QtCore/QPointer> +#include <QtMultimedia/private/qtmultimedia-config_p.h> // Adds an enum, and the stringized version #define ADD_ENUM_TEST(x) \ @@ -1222,7 +1223,7 @@ void tst_QVideoFrame::image_data() << 16384 << 256 << QImage::Format_ARGB32; - +#if !QT_CONFIG(directshow) QTest::newRow("64x64 AYUV444") << QSize(64, 64) << QVideoFrame::Format_AYUV444 @@ -1278,6 +1279,7 @@ void tst_QVideoFrame::image_data() << 16384 << 256 << QImage::Format_ARGB32; +#endif } void tst_QVideoFrame::image() |