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 --- src/multimedia/video/qvideoframe.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/multimedia') diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp index fd7b74075..7840eda31 100644 --- a/src/multimedia/video/qvideoframe.cpp +++ b/src/multimedia/video/qvideoframe.cpp @@ -964,6 +964,8 @@ QVideoFrame::PixelFormat QVideoFrame::pixelFormatFromImageFormat(QImage::Format return Format_RGB555; case QImage::Format_RGB888: return Format_RGB24; + case QImage::Format_Grayscale8: + return Format_Y8; default: return Format_Invalid; } @@ -1017,12 +1019,13 @@ QImage::Format QVideoFrame::imageFormatFromPixelFormat(PixelFormat format) case Format_IMC2: case Format_IMC3: case Format_IMC4: - case Format_Y8: case Format_Y16: case Format_Jpeg: case Format_CameraRaw: case Format_AdobeDng: return QImage::Format_Invalid; + case Format_Y8: + return QImage::Format_Grayscale8; case Format_User: default: return QImage::Format_Invalid; -- cgit v1.2.3