Patch Detail
Show a patch.
GET /api/1.1/patches/17224/?format=api
{ "id": 17224, "url": "https://patchwork.libcamera.org/api/1.1/patches/17224/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17224/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20220829100414.28404-3-laurent.pinchart@ideasonboard.com>", "date": "2022-08-29T10:04:13", "name": "[libcamera-devel,2/3] qcam: Pass color space to ViewFinder::setFormat()", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "42b8fbd13ea540ef33be295e4a295be2a05d33ef", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/1.1/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/17224/mbox/", "series": [ { "id": 3445, "url": "https://patchwork.libcamera.org/api/1.1/series/3445/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3445", "date": "2022-08-29T10:04:11", "name": "Misc color space plumbing improvements", "version": 1, "mbox": "https://patchwork.libcamera.org/series/3445/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17224/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17224/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "X-Original-To": "parsemail@patchwork.libcamera.org", "Delivered-To": "parsemail@patchwork.libcamera.org", "Received": [ "from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 14395C3272\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 29 Aug 2022 10:04:30 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C2BEC61FC6;\n\tMon, 29 Aug 2022 12:04:29 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 73B4E61FC2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 29 Aug 2022 12:04:27 +0200 (CEST)", "from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E25EC8BD\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 29 Aug 2022 12:04:26 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1661767469;\n\tbh=8twypGA1ryQShZKLj+yoixVo829FfaTYwkHXGcLJsMI=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=WfuZYSyp8kbZRfwlCRQonwfz/HggeETtAiKWpvOYre55IUW5lWfHjLeu9PgYVxjTJ\n\t97gL80GEhw4GXIZJD9ZyJRw9SkxhlKnsdMu9pTRIYiFYnXaOCcdN+cJQXNoW1eJqOI\n\teQ7jiEFAmrQNUFuc2gn4DPUsWyjQrvs17jH3R2QP89BSmprRSb+NNY2gYa99dfVPKl\n\tthjpu1anRYiY0A/Uugk5ghKGpvnePBOz3HpxvJlDIne8MGbaU9puwnYESS1+UNfUxq\n\tT22E4QcTGhTXb3mrFOcxXG1RaYdnQhVXo8QuHl90JbAhY/fZkg8uBZVrTniykzT6B2\n\twBQxco/QBGFxA==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1661767467;\n\tbh=8twypGA1ryQShZKLj+yoixVo829FfaTYwkHXGcLJsMI=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=MrLnFhwAiYXvejaSZLrA367SIzuQMbiQ3hCUyfx30mKZPhdZ4ix4UxsG+fTmnuApi\n\tYpXdXtoGKFmyQuX3Q15A6+ZObVbdp1S4Q64+JqZ2gyjWjZwMx+4XoBaTHQXTRPkUzn\n\t/DmPEkAtpRdEb1Fu5QqtS3HhrmUhnR+OjHzCou4c=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"MrLnFhwA\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 29 Aug 2022 13:04:13 +0300", "Message-Id": "<20220829100414.28404-3-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.35.1", "In-Reply-To": "<20220829100414.28404-1-laurent.pinchart@ideasonboard.com>", "References": "<20220829100414.28404-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 2/3] qcam: Pass color space to\n\tViewFinder::setFormat()", "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>", "From": "Laurent Pinchart via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "To prepare for color space support in the viewfinder, pass the color\nspace to the setFormat() function.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/qcam/main_window.cpp | 6 +++++-\n src/qcam/viewfinder.h | 2 ++\n src/qcam/viewfinder_gl.cpp | 5 +++--\n src/qcam/viewfinder_gl.h | 1 +\n src/qcam/viewfinder_qt.cpp | 5 +++--\n src/qcam/viewfinder_qt.h | 1 +\n 6 files changed, 15 insertions(+), 5 deletions(-)", "diff": "diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp\nindex 7433d647e8a0..addf0d96daf4 100644\n--- a/src/qcam/main_window.cpp\n+++ b/src/qcam/main_window.cpp\n@@ -447,9 +447,13 @@ int MainWindow::startCapture()\n \telse\n \t\trawStream_ = nullptr;\n \n-\t/* Configure the viewfinder. */\n+\t/*\n+\t * Configure the viewfinder. If no color space is reported, default to\n+\t * sYCC.\n+\t */\n \tret = viewfinder_->setFormat(vfConfig.pixelFormat,\n \t\t\t\t QSize(vfConfig.size.width, vfConfig.size.height),\n+\t\t\t\t vfConfig.colorSpace.value_or(ColorSpace::Sycc),\n \t\t\t\t vfConfig.stride);\n \tif (ret < 0) {\n \t\tqInfo() << \"Failed to set viewfinder format\";\ndiff --git a/src/qcam/viewfinder.h b/src/qcam/viewfinder.h\nindex 260074aed440..a57446e85951 100644\n--- a/src/qcam/viewfinder.h\n+++ b/src/qcam/viewfinder.h\n@@ -11,6 +11,7 @@\n #include <QList>\n #include <QSize>\n \n+#include <libcamera/color_space.h>\n #include <libcamera/formats.h>\n #include <libcamera/framebuffer.h>\n \n@@ -24,6 +25,7 @@ public:\n \tvirtual const QList<libcamera::PixelFormat> &nativeFormats() const = 0;\n \n \tvirtual int setFormat(const libcamera::PixelFormat &format, const QSize &size,\n+\t\t\t const libcamera::ColorSpace &colorSpace,\n \t\t\t unsigned int stride) = 0;\n \tvirtual void render(libcamera::FrameBuffer *buffer, Image *image) = 0;\n \tvirtual void stop() = 0;\ndiff --git a/src/qcam/viewfinder_gl.cpp b/src/qcam/viewfinder_gl.cpp\nindex 3ae8b03accb5..ec295b6de0dd 100644\n--- a/src/qcam/viewfinder_gl.cpp\n+++ b/src/qcam/viewfinder_gl.cpp\n@@ -71,8 +71,9 @@ const QList<libcamera::PixelFormat> &ViewFinderGL::nativeFormats() const\n \treturn supportedFormats;\n }\n \n-int ViewFinderGL::setFormat(const libcamera::PixelFormat &format,\n-\t\t\t const QSize &size, unsigned int stride)\n+int ViewFinderGL::setFormat(const libcamera::PixelFormat &format, const QSize &size,\n+\t\t\t [[maybe_unused]] const libcamera::ColorSpace &colorSpace,\n+\t\t\t unsigned int stride)\n {\n \tif (format != format_) {\n \t\t/*\ndiff --git a/src/qcam/viewfinder_gl.h b/src/qcam/viewfinder_gl.h\nindex 0a9275baf9b9..798830a31cd2 100644\n--- a/src/qcam/viewfinder_gl.h\n+++ b/src/qcam/viewfinder_gl.h\n@@ -39,6 +39,7 @@ public:\n \tconst QList<libcamera::PixelFormat> &nativeFormats() const override;\n \n \tint setFormat(const libcamera::PixelFormat &format, const QSize &size,\n+\t\t const libcamera::ColorSpace &colorSpace,\n \t\t unsigned int stride) override;\n \tvoid render(libcamera::FrameBuffer *buffer, Image *image) override;\n \tvoid stop() override;\ndiff --git a/src/qcam/viewfinder_qt.cpp b/src/qcam/viewfinder_qt.cpp\nindex 7a6a60c96393..c20fd6bc8fc2 100644\n--- a/src/qcam/viewfinder_qt.cpp\n+++ b/src/qcam/viewfinder_qt.cpp\n@@ -54,8 +54,9 @@ const QList<libcamera::PixelFormat> &ViewFinderQt::nativeFormats() const\n \treturn formats;\n }\n \n-int ViewFinderQt::setFormat(const libcamera::PixelFormat &format,\n-\t\t\t const QSize &size, unsigned int stride)\n+int ViewFinderQt::setFormat(const libcamera::PixelFormat &format, const QSize &size,\n+\t\t\t [[maybe_unused]] const libcamera::ColorSpace &colorSpace,\n+\t\t\t unsigned int stride)\n {\n \timage_ = QImage();\n \ndiff --git a/src/qcam/viewfinder_qt.h b/src/qcam/viewfinder_qt.h\nindex 8c62145211d1..eb3a99882d19 100644\n--- a/src/qcam/viewfinder_qt.h\n+++ b/src/qcam/viewfinder_qt.h\n@@ -32,6 +32,7 @@ public:\n \tconst QList<libcamera::PixelFormat> &nativeFormats() const override;\n \n \tint setFormat(const libcamera::PixelFormat &format, const QSize &size,\n+\t\t const libcamera::ColorSpace &colorSpace,\n \t\t unsigned int stride) override;\n \tvoid render(libcamera::FrameBuffer *buffer, Image *image) override;\n \tvoid stop() override;\n", "prefixes": [ "libcamera-devel", "2/3" ] }