From 5a10af9bca8976ffb415adf12d4e8ffe4921da67 Mon Sep 17 00:00:00 2001 From: VaL Doroshchuk Date: Thu, 20 Feb 2020 12:57:42 +0100 Subject: Map QVideoFrame::Format_Y8=>QImage::Format_Grayscale8 in QVideoFrame Fixes: QTBUG-52455 Change-Id: I30582582935ae0a2c5094db995cba83b62adc767 Reviewed-by: Liang Qi (cherry picked from commit 2b96c113cf7057b556856149114999b973b3f2c2) Reviewed-by: Qt Cherry-pick Bot --- tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp | 4 ++-- tests/auto/unit/qvideoframe/tst_qvideoframe.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp index be5c85ab9..98ec5fc06 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) - << false - << false; + << true + << true; 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 943051435..bb77b7cca 100644 --- a/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp +++ b/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp @@ -975,7 +975,7 @@ void tst_QVideoFrame::formatConversion_data() << QImage::Format_Invalid << QVideoFrame::Format_IMC4; QTest::newRow("QVideoFrame::Format_Y8") - << QImage::Format_Invalid + << QImage::Format_Grayscale8 << QVideoFrame::Format_Y8; QTest::newRow("QVideoFrame::Format_Y16") << QImage::Format_Invalid -- cgit v1.2.3