summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/integration/qaudiooutput/BLACKLIST1
-rw-r--r--tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp4
-rw-r--r--tests/auto/unit/qvideoframe/tst_qvideoframe.cpp10
3 files changed, 8 insertions, 7 deletions
diff --git a/tests/auto/integration/qaudiooutput/BLACKLIST b/tests/auto/integration/qaudiooutput/BLACKLIST
index 966b48af6..22ed580c3 100644
--- a/tests/auto/integration/qaudiooutput/BLACKLIST
+++ b/tests/auto/integration/qaudiooutput/BLACKLIST
@@ -1 +1,2 @@
linux ci
+macos arm
diff --git a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
index 98ec5fc06..be5c85ab9 100644
--- a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
+++ b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
@@ -253,8 +253,8 @@ void tst_QPainterVideoSurface::supportedFormat_data()
<< QAbstractVideoBuffer::NoHandle
<< QVideoFrame::Format_Y8
<< QSize(640, 480)
- << true
- << true;
+ << false
+ << false;
QTest::newRow("Texture: rgb32 640x480")
<< QAbstractVideoBuffer::GLTextureHandle
<< QVideoFrame::Format_RGB32
diff --git a/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp b/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp
index e99c4bf77..1b597a241 100644
--- a/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp
+++ b/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp
@@ -978,7 +978,7 @@ void tst_QVideoFrame::formatConversion_data()
<< QImage::Format_Invalid
<< QVideoFrame::Format_IMC4;
QTest::newRow("QVideoFrame::Format_Y8")
- << QImage::Format_Grayscale8
+ << QImage::Format_Invalid
<< QVideoFrame::Format_Y8;
QTest::newRow("QVideoFrame::Format_Y16")
<< QImage::Format_Invalid
@@ -1244,14 +1244,14 @@ void tst_QVideoFrame::image_data()
QTest::newRow("64x64 YUV420P")
<< QSize(64, 64)
<< QVideoFrame::Format_YUV420P
- << 13288
+ << 18432
<< 256
<< QImage::Format_ARGB32;
QTest::newRow("64x64 YV12")
<< QSize(64, 64)
<< QVideoFrame::Format_YV12
- << 16384
+ << 18432
<< 256
<< QImage::Format_ARGB32;
@@ -1272,14 +1272,14 @@ void tst_QVideoFrame::image_data()
QTest::newRow("64x64 NV12")
<< QSize(64, 64)
<< QVideoFrame::Format_NV12
- << 16384
+ << 24576
<< 256
<< QImage::Format_ARGB32;
QTest::newRow("64x64 NV21")
<< QSize(64, 64)
<< QVideoFrame::Format_NV21
- << 16384
+ << 24576
<< 256
<< QImage::Format_ARGB32;
#endif