[libcamera-devel] [PATCH] qcam: viewfinder: Use correct DRM/QImage mappings

Kieran Bingham kieran.bingham at ideasonboard.com
Tue May 26 18:06:44 CEST 2020


When the native pixel formats supported by QT were introduced, the
RGB/BGR formats were inverted.

Swap the BGR888 and RGB888 mappings accordingly.

Fixes: f890a57b7a06 ("qcam: viewfinder: Add support for more native formats")
Signed-off-by: Kieran Bingham <kieran.bingham at ideasonboard.com>
---
 src/qcam/viewfinder.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/qcam/viewfinder.cpp b/src/qcam/viewfinder.cpp
index 0d68f62ee6d7..7a308f53f576 100644
--- a/src/qcam/viewfinder.cpp
+++ b/src/qcam/viewfinder.cpp
@@ -26,9 +26,9 @@ static const QMap<libcamera::PixelFormat, QImage::Format> nativeFormats
 #endif
 	{ libcamera::PixelFormat{ DRM_FORMAT_ARGB8888 }, QImage::Format_RGB32 },
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-	{ libcamera::PixelFormat{ DRM_FORMAT_BGR888 }, QImage::Format_BGR888 },
+	{ libcamera::PixelFormat{ DRM_FORMAT_RGB888 }, QImage::Format_BGR888 },
 #endif
-	{ libcamera::PixelFormat{ DRM_FORMAT_RGB888 }, QImage::Format_RGB888 },
+	{ libcamera::PixelFormat{ DRM_FORMAT_BGR888 }, QImage::Format_RGB888 },
 };
 
 ViewFinder::ViewFinder(QWidget *parent)
-- 
2.25.1



More information about the libcamera-devel mailing list