Patch Detail
Show a patch.
GET /api/patches/3286/?format=api
{ "id": 3286, "url": "https://patchwork.libcamera.org/api/patches/3286/?format=api", "web_url": "https://patchwork.libcamera.org/patch/3286/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20200323173559.21109-22-laurent.pinchart@ideasonboard.com>", "date": "2020-03-23T17:35:59", "name": "[libcamera-devel,v2,21/21] qcam: viewfinder: Add support for more native formats", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "24108674717c4cad8b5b6e9cb9260dc47d894f2e", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/3286/mbox/", "series": [ { "id": 762, "url": "https://patchwork.libcamera.org/api/series/762/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=762", "date": "2020-03-23T17:35:38", "name": "qcam: Bypass format conversion when not required", "version": 2, "mbox": "https://patchwork.libcamera.org/series/762/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/3286/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/3286/checks/", "tags": {}, "headers": { "Return-Path": "<laurent.pinchart@ideasonboard.com>", "Received": [ "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 855BD62CD6\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 23 Mar 2020 18:36:23 +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 22D75308\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 23 Mar 2020 18:36:23 +0100 (CET)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1584984983;\n\tbh=+qikXKyshxo/qTFBH5W/AsDuvSQNdfc4zbNVWdaLOl4=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=I+xjZM23PqnTS0ToSde5nCw5ij6+q3pZf/KV4SbQi9+890/Pa78VFUfSCHgC4H+dH\n\t1IrBTqdmozbTGSDIOxl9oI3YNsd43K1PZYXLYjTR3IvqU2FQRqmY6ZIonH4pQyiqBc\n\tg/pA8pktKCtKWLRj+VbfHdft1/cl/n+vmycOqkbI=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 23 Mar 2020 19:35:59 +0200", "Message-Id": "<20200323173559.21109-22-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.24.1", "In-Reply-To": "<20200323173559.21109-1-laurent.pinchart@ideasonboard.com>", "References": "<20200323173559.21109-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "X-List-Received-Date": "Mon, 23 Mar 2020 17:36:26 -0000" }, "content": "Qt supports more 24-bit and 32-bit RGB formats for native painting.\nDisable the converter and create a QImage in the appropriate format.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n---\nChanges since v1:\n\n- Rename formats to nativeFormats\n---\n src/qcam/viewfinder.cpp | 17 ++++++++++++++---\n 1 file changed, 14 insertions(+), 3 deletions(-)", "diff": "diff --git a/src/qcam/viewfinder.cpp b/src/qcam/viewfinder.cpp\nindex 45e226b58135..5aa0daebfb2d 100644\n--- a/src/qcam/viewfinder.cpp\n+++ b/src/qcam/viewfinder.cpp\n@@ -7,16 +7,26 @@\n \n #include \"viewfinder.h\"\n \n+#include <stdint.h>\n #include <utility>\n \n #include <QImage>\n #include <QImageWriter>\n+#include <QMap>\n #include <QMutexLocker>\n #include <QPainter>\n #include <QtDebug>\n \n #include \"format_converter.h\"\n \n+static const QMap<uint32_t, QImage::Format> nativeFormats{\n+\t{ DRM_FORMAT_ARGB8888, QImage::Format_RGB32 },\n+\t{ DRM_FORMAT_RGB888, QImage::Format_RGB888 },\n+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))\n+\t{ DRM_FORMAT_BGR888, QImage::Format_BGR888 },\n+#endif\n+};\n+\n ViewFinder::ViewFinder(QWidget *parent)\n \t: QWidget(parent), buffer_(nullptr)\n {\n@@ -36,7 +46,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 +74,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 +86,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", "21/21" ] }