From bd29c87027637a013f2c5e3b549fcda84e4d7545 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Fri, 27 Nov 2020 11:31:43 +0100 Subject: Revert "Map QVideoFrame::Format_Y8=>QImage::Format_Grayscale8 in QVideoFrame" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 2b96c113cf7057b556856149114999b973b3f2c2, due to the fact that it introduces a problem with existing cameras on Windows. So reverting for now until a fix can be found. Change-Id: Ica59c8a68de7aecf6a4ebd1bd044363e9acefd93 Reviewed-by: Liang Qi Reviewed-by: Tor Arne Vestbø (cherry picked from commit 67d1ff140e60e3372d05fc7af2cf85de891a31f0) Reviewed-by: Qt Cherry-pick Bot --- src/multimedia/video/qvideoframe.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/multimedia/video') diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp index 7840eda31..fd7b74075 100644 --- a/src/multimedia/video/qvideoframe.cpp +++ b/src/multimedia/video/qvideoframe.cpp @@ -964,8 +964,6 @@ 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; } @@ -1019,13 +1017,12 @@ 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