Patch Detail
Show a patch.
GET /api/1.1/patches/15097/?format=api
{ "id": 15097, "url": "https://patchwork.libcamera.org/api/1.1/patches/15097/?format=api", "web_url": "https://patchwork.libcamera.org/patch/15097/", "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": "<20211209101245.6187-8-david.plowman@raspberrypi.com>", "date": "2021-12-09T10:12:44", "name": "[libcamera-devel,v10,7/8] libcamera: Add validateColorSpaces to CameraConfiguration class", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "dedd8c15897d3a55a70c3aaa851ca8fde047f702", "submitter": { "id": 42, "url": "https://patchwork.libcamera.org/api/1.1/people/42/?format=api", "name": "David Plowman", "email": "david.plowman@raspberrypi.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/15097/mbox/", "series": [ { "id": 2830, "url": "https://patchwork.libcamera.org/api/1.1/series/2830/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2830", "date": "2021-12-09T10:12:37", "name": "Colour spaces", "version": 10, "mbox": "https://patchwork.libcamera.org/series/2830/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/15097/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/15097/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 8886DC324B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 9 Dec 2021 10:13:41 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1E7EB6088B;\n\tThu, 9 Dec 2021 11:13:41 +0100 (CET)", "from mail-wm1-x330.google.com (mail-wm1-x330.google.com\n\t[IPv6:2a00:1450:4864:20::330])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 73FE36086A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 9 Dec 2021 11:13:36 +0100 (CET)", "by mail-wm1-x330.google.com with SMTP id\n\to19-20020a1c7513000000b0033a93202467so3661628wmc.2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 09 Dec 2021 02:13:36 -0800 (PST)", "from pi4-davidp.pitowers.org\n\t([2a00:1098:3142:14:e4a2:3070:eea4:e434])\n\tby smtp.gmail.com with ESMTPSA id\n\tj8sm5079449wrh.16.2021.12.09.02.13.35\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 09 Dec 2021 02:13:35 -0800 (PST)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=raspberrypi.com header.i=@raspberrypi.com\n\theader.b=\"PmevTKvg\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=R1YEICgfdgsmW9t4ujB9VSgCIG1ak5d76cb+q5rcH2M=;\n\tb=PmevTKvgqticNKUuX1s7g3oqZtnlnX1X0H5nFvPg3jJg3TAORQErKCQyKk0z0YYibV\n\tNChP36fJhQ6AK6avwaOFBE0F+18Nrj2S9GNz3egr4FXabi6qwTX8mtjBLcM8ZoWJnQZi\n\tUq1va0qjq08bvzkzZ2HiCnuZc+uU06+X3mXP1rBj20cI1DlwEAT3oTl0160mT15yUfo0\n\trk21DBIEF7IXMpluLrKFSYAMIsK2CC0yzMPeNjH56S6gxZkvo01GZ/0pKQBgqwff8rjW\n\tDMKzELNLBwlnBcnNapJ5TNXCGnP2ZNyNvlHoJWF4avAW0ohc0aPjXSvnl+6A1hzTjRKL\n\t615w==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=R1YEICgfdgsmW9t4ujB9VSgCIG1ak5d76cb+q5rcH2M=;\n\tb=OoEfORGJosNmnnSJEIu580h9R9Sc0D9PcpGiwK2q5YdwJWbZe/EGwkqA1EXzWFWWGb\n\tY35snhH1ytXL6Flgywqo26UAXr8vJkgh/qy2r1S5jZD1ZpTpF/2ih7Ut2G/feToDqqmp\n\t/PPz6MGrM2FIQQCLKKWXdEnHWhBNvRlTHEGQvgZyPUvEhCg3H3mGZroZuuJ+0wlrsZ8l\n\tCq2n9BdlF73o4nLq5QmRfG2iciZcGyTyhIDrDG27qAGpeuH5rRWtXBofflzbyNYZ2tLx\n\tnSFVOgVUHWPFNSa/o6g/w+pA/DmvWZotEKblU+bktGHhq83RPn2mx2RVSOqUksYLj+qb\n\tG7+g==", "X-Gm-Message-State": "AOAM533tv0eqit+MoHHG+8bIPo3oAzb1+ORYZbAFuT9850tMY0I1lLUu\n\tNLpe7tQAsKRq9baj0buJBQE8Fo0dYjlgBSPT", "X-Google-Smtp-Source": "ABdhPJxmgj8JfyawN5UJsPeaYUXA7Qfrw0KrMHONTsJ88pr1+fNMQ1k3bf0r+NDzCZ52XbiLp3puiw==", "X-Received": "by 2002:a1c:208b:: with SMTP id\n\tg133mr6002527wmg.128.1639044815908; \n\tThu, 09 Dec 2021 02:13:35 -0800 (PST)", "From": "David Plowman <david.plowman@raspberrypi.com>", "To": "libcamera-devel@lists.libcamera.org,\n\tLaurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tKieran Bingham <kieran.bingham@ideasonboard.com>,\n\tHans Verkuil <hverkuil-cisco@xs4all.nl>, Tomasz Figa <tfiga@google.com>, \n\tJacopo Mondi <jacopo@jmondi.org>, Naushir Patuck <naush@raspberrypi.com>", "Date": "Thu, 9 Dec 2021 10:12:44 +0000", "Message-Id": "<20211209101245.6187-8-david.plowman@raspberrypi.com>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20211209101245.6187-1-david.plowman@raspberrypi.com>", "References": "<20211209101245.6187-1-david.plowman@raspberrypi.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v10 7/8] libcamera: Add\n\tvalidateColorSpaces to CameraConfiguration class", "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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "This method forces raw streams to have the \"raw\" color space, and also\noptionally makes all output streams to share the same color space as\nsome platforms may require this.\n\nSigned-off-by: David Plowman <david.plowman@raspberrypi.com>\n---\n include/libcamera/camera.h | 10 +++++\n src/libcamera/camera.cpp | 84 ++++++++++++++++++++++++++++++++++++++\n 2 files changed, 94 insertions(+)", "diff": "diff --git a/include/libcamera/camera.h b/include/libcamera/camera.h\nindex a7759ccb..5bb06584 100644\n--- a/include/libcamera/camera.h\n+++ b/include/libcamera/camera.h\n@@ -13,6 +13,7 @@\n #include <string>\n \n #include <libcamera/base/class.h>\n+#include <libcamera/base/flags.h>\n #include <libcamera/base/object.h>\n #include <libcamera/base/signal.h>\n \n@@ -69,6 +70,15 @@ public:\n protected:\n \tCameraConfiguration();\n \n+\tenum class ColorSpaceFlag {\n+\t\tNone,\n+\t\tStreamsShareColorSpace,\n+\t};\n+\n+\tusing ColorSpaceFlags = Flags<ColorSpaceFlag>;\n+\n+\tStatus validateColorSpaces(ColorSpaceFlags flags = ColorSpaceFlag::None);\n+\n \tstd::vector<StreamConfiguration> config_;\n };\n \ndiff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\nindex 400a7cf0..87ef8d72 100644\n--- a/src/libcamera/camera.cpp\n+++ b/src/libcamera/camera.cpp\n@@ -14,12 +14,14 @@\n #include <libcamera/base/log.h>\n #include <libcamera/base/thread.h>\n \n+#include <libcamera/color_space.h>\n #include <libcamera/framebuffer_allocator.h>\n #include <libcamera/request.h>\n #include <libcamera/stream.h>\n \n #include \"libcamera/internal/camera.h\"\n #include \"libcamera/internal/camera_controls.h\"\n+#include \"libcamera/internal/formats.h\"\n #include \"libcamera/internal/pipeline_handler.h\"\n \n /**\n@@ -314,6 +316,88 @@ std::size_t CameraConfiguration::size() const\n \treturn config_.size();\n }\n \n+namespace {\n+\n+bool isRaw(const PixelFormat &pixFmt)\n+{\n+\tconst PixelFormatInfo &info = PixelFormatInfo::info(pixFmt);\n+\treturn info.isValid() &&\n+\t info.colourEncoding == PixelFormatInfo::ColourEncodingRAW;\n+}\n+\n+} /* namespace */\n+\n+/**\n+ * \\enum CameraConfiguration::ColorSpaceFlag\n+ * \\brief Specify the behaviour of validateColorSpaces\n+ * \\var ColorSpaceFlag::None\n+ * \\brief No extra validation of color spaces is required\n+ * \\var ColorSpaceFlag::StreamsShareColorSpace\n+ * \\brief Non-raw output streams must share the same color space\n+ */\n+\n+/**\n+ * \\typedef CameraConfiguration::ColorSpaceFlags\n+ * \\brief A bitwise combination of ColorSpaceFlag values\n+ */\n+\n+/**\n+ * \\brief Check the color spaces requested for each stream\n+ * \\param[in] flags Flags to control the behaviour of this function\n+ *\n+ * This function performs certain consistency checks on the color spaces of\n+ * the streams and may adjust them so that:\n+ *\n+ * - Any raw streams have the Raw color space\n+ * - If shareOutputColorSpaces is set, all output streams are forced to share\n+ * the same color space (this may be a constraint on some platforms).\n+ *\n+ * It is optional for a pipeline handler to use this method.\n+ *\n+ * \\return A CameraConfiguration::Status value that describes the validation\n+ * status.\n+ * \\retval CameraConfiguration::Invalid The configuration is invalid and can't\n+ * be adjusted. This may only occur in extreme cases such as when the\n+ * configuration is empty.\n+ * \\retval CameraConfigutation::Adjusted The configuration has been adjusted\n+ * and is now valid. Parameters may have changed for any stream, and stream\n+ * configurations may have been removed. The caller shall check the\n+ * configuration carefully.\n+ * \\retval CameraConfiguration::Valid The configuration was already valid and\n+ * hasn't been adjusted.\n+ */\n+CameraConfiguration::Status CameraConfiguration::validateColorSpaces(ColorSpaceFlags flags)\n+{\n+\tStatus status = Valid;\n+\n+\t/*\n+\t * Set all raw streams to the Raw color space, and make a note of the largest\n+\t * non-raw stream with a defined color space (if there is one).\n+\t */\n+\tint index = -1;\n+\tfor (auto [i, cfg] : utils::enumerate(config_)) {\n+\t\tif (isRaw(cfg.pixelFormat) && cfg.colorSpace != ColorSpace::Raw) {\n+\t\t\tcfg.colorSpace = ColorSpace::Raw;\n+\t\t\tstatus = Adjusted;\n+\t\t} else if (cfg.colorSpace && (index == -1 || cfg.size > config_[i].size))\n+\t\t\tindex = i;\n+\t}\n+\n+\tif (index < 0 || !(flags & ColorSpaceFlag::StreamsShareColorSpace))\n+\t\treturn status;\n+\n+\t/* Make all output color spaces the same, if requested. */\n+\tfor (auto &cfg : config_) {\n+\t\tif (!isRaw(cfg.pixelFormat) &&\n+\t\t cfg.colorSpace != config_[index].colorSpace) {\n+\t\t\tcfg.colorSpace = config_[index].colorSpace;\n+\t\t\tstatus = Adjusted;\n+\t\t}\n+\t}\n+\n+\treturn status;\n+}\n+\n /**\n * \\var CameraConfiguration::transform\n * \\brief User-specified transform to be applied to the image\n", "prefixes": [ "libcamera-devel", "v10", "7/8" ] }