{"id":3290,"url":"https://patchwork.libcamera.org/api/patches/3290/?format=json","web_url":"https://patchwork.libcamera.org/patch/3290/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200323232801.12010-1-laurent.pinchart@ideasonboard.com>","date":"2020-03-23T23:28:01","name":"[libcamera-devel,v2.2,21/21] qcam: viewfinder: Add support for more native formats","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"df1d464680bce6236dc6490d8a6fd2cf8151c3a1","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3290/mbox/","series":[{"id":765,"url":"https://patchwork.libcamera.org/api/series/765/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=765","date":"2020-03-23T23:28:01","name":null,"version":1,"mbox":"https://patchwork.libcamera.org/series/765/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3290/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3290/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A711960417\n\tfor ;\n\tTue, 24 Mar 2020 00:28:15 +0100 (CET)","from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1C524308\n\tfor ;\n\tTue, 24 Mar 2020 00:28:15 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1585006095;\n\tbh=EMAPgE9wA+2T8i4OB9OUveOCSlTf1wcDBJEImkIc7ac=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=q4KPKRysSHerOwp7dl7jnxRuw1XGZIScrBCXAFIrxcg3r7wYBhaGYFenekrnZZPmz\n\tDbk8k5ZA+wxaq+GypOueNaxYK8GC7g8W7BlUs957YufGn5g+w6S7raz7mfmOTbXpwG\n\tQBTYVi4zIJyrSjJ4pjBXy2OpPzctmqB5g7jUJGyo=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 24 Mar 2020 01:28:01 +0200","Message-Id":"<20200323232801.12010-1-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.24.1","In-Reply-To":"<20200323231710.10935-1-laurent.pinchart@ideasonboard.com>","References":"","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2.2 21/21] qcam: viewfinder: Add support\n\tfor more native formats","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Mon, 23 Mar 2020 23:28:15 -0000"},"content":"Qt supports more 24-bit and 32-bit RGB formats for native painting. If\nthe frame buffer pixel format matches any of them, disable the converter\nand create a QImage in the appropriate format.\n\nSigned-off-by: Laurent Pinchart \nReviewed-by: Kieran Bingham \n---\nChanges since v2:\n\n- Add more formats\n- Remove unnecessary parentheses\n\nChanges since v1:\n\n- Rename formats to nativeFormats\n---\n src/qcam/viewfinder.cpp | 25 ++++++++++++++++++++++---\n 1 file changed, 22 insertions(+), 3 deletions(-)","diff":"diff --git a/src/qcam/viewfinder.cpp b/src/qcam/viewfinder.cpp\nindex 45e226b58135..7e7407f56e4c 100644\n--- a/src/qcam/viewfinder.cpp\n+++ b/src/qcam/viewfinder.cpp\n@@ -7,16 +7,34 @@\n \n #include \"viewfinder.h\"\n \n+#include \n #include \n \n #include \n #include \n+#include \n #include \n #include \n #include \n \n #include \"format_converter.h\"\n \n+static const QMap nativeFormats\n+{\n+#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)\n+#if QBYTE_ORDER == Q_LITTLE_ENDIAN\n+\t{ DRM_FORMAT_ABGR8888, QImage::Format_RGBA8888 },\n+#else\n+\t{ DRM_FORMAT_RGBA8888, QImage::Format_RGBA8888 },\n+#endif\n+#endif\n+\t{ DRM_FORMAT_ARGB8888, QImage::Format_RGB32 },\n+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)\n+\t{ DRM_FORMAT_BGR888, QImage::Format_BGR888 },\n+#endif\n+\t{ DRM_FORMAT_RGB888, QImage::Format_RGB888 },\n+};\n+\n ViewFinder::ViewFinder(QWidget *parent)\n \t: QWidget(parent), buffer_(nullptr)\n {\n@@ -36,7 +54,7 @@ int ViewFinder::setFormat(const libcamera::PixelFormat &format,\n \t * If format conversion is needed, configure the converter and allocate\n \t * the destination image.\n \t */\n-\tif (format != DRM_FORMAT_ARGB8888) {\n+\tif (!nativeFormats.contains(format)) {\n \t\tint ret = converter_.configure(format, size);\n \t\tif (ret < 0)\n \t\t\treturn ret;\n@@ -64,7 +82,7 @@ void ViewFinder::render(libcamera::FrameBuffer *buffer, MappedBuffer *map)\n \t{\n \t\tQMutexLocker locker(&mutex_);\n \n-\t\tif (format_ == DRM_FORMAT_ARGB8888) {\n+\t\tif (nativeFormats.contains(format_)) {\n \t\t\t/*\n \t\t\t * If the frame format is identical to the display\n \t\t\t * format, create a QImage that references the frame\n@@ -76,7 +94,8 @@ void ViewFinder::render(libcamera::FrameBuffer *buffer, MappedBuffer *map)\n \t\t\t * computing it naively\n \t\t\t */\n \t\t\timage_ = QImage(memory, size_.width(), size_.height(),\n-\t\t\t\t\tsize / size_.height(), QImage::Format_RGB32);\n+\t\t\t\t\tsize / size_.height(),\n+\t\t\t\t\tnativeFormats[format_]);\n \t\t\tstd::swap(buffer, buffer_);\n \t\t} else {\n \t\t\t/*\n","prefixes":["libcamera-devel","v2.2","21/21"]}