Patch Detail
Show a patch.
GET /api/1.1/patches/14980/?format=api
{ "id": 14980, "url": "https://patchwork.libcamera.org/api/1.1/patches/14980/?format=api", "web_url": "https://patchwork.libcamera.org/patch/14980/", "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": "<20211201154434.23127-8-david.plowman@raspberrypi.com>", "date": "2021-12-01T15:44:33", "name": "[libcamera-devel,v8,7/8] libcamera: Add validateColorSpaces to CameraConfiguration class", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "32da93bfbcdd64ab36f74c8b89e58b32dbcc1dca", "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/14980/mbox/", "series": [ { "id": 2797, "url": "https://patchwork.libcamera.org/api/1.1/series/2797/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2797", "date": "2021-12-01T15:44:26", "name": "Colour spaces", "version": 8, "mbox": "https://patchwork.libcamera.org/series/2797/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/14980/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/14980/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 C606CC3252\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 1 Dec 2021 15:45:12 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6572560820;\n\tWed, 1 Dec 2021 16:45:12 +0100 (CET)", "from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com\n\t[IPv6:2a00:1450:4864:20::42e])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7BCD460746\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 1 Dec 2021 16:45:08 +0100 (CET)", "by mail-wr1-x42e.google.com with SMTP id t9so36266397wrx.7\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 01 Dec 2021 07:45:08 -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\ty7sm148209wrw.55.2021.12.01.07.45.07\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 01 Dec 2021 07:45:07 -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=\"O4Tizd0u\"; 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=hdblI0WBXeyTejRYwVT6qZCUGz4IKvH5clh91jOGakA=;\n\tb=O4Tizd0ufv8BPCCjyRZQwG0k7nQK+CIq2C8R6lANccuvIxA4dew6KWhWaijcnTiDJq\n\txTObLvyCzJonU+4Z3fAJhtfia1Y7kxqwJ4/hTVw727tUQmwxNfrnXhwtCeqIsOkid8r4\n\t/9P3cCOWmQxAk5YyIVXhwvZjwaWBDneEzXfkiO2q4633qfpZ1gxfx+HUtqprCEXrSAbU\n\taw/jIEpkkdu8fmRKlzOZpmQ5j/RzEeOVsBCKPZkJ+HvTVoC0+Qf1xWRU8o99jwuMzjna\n\tKHuxG8E3KTIxKTkI/cy8XEHOyK4MtX0oEPImhdWsRe+f0e9L4gJ1fI0XpYEHnD0RxCcX\n\tmeVw==", "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=hdblI0WBXeyTejRYwVT6qZCUGz4IKvH5clh91jOGakA=;\n\tb=BqxTk4/J1Vw2+vk6IdJT7ehJXvu4GA0yRmXbJpW7t/FDJXGf2TlLxKpaqhwXjxtlOs\n\t2VB3iGRWSiEA1q8M0tMZkf1yGWSdEp2wr28WEqJfPl5iutTdSN/n1F9uhVe8quyuZH2g\n\tdv15zldsegpnWxwPQD5FzO8SvF4gk6TBilp6+P32i9ACB7vYuR9Nfxxpnc6bzk6vS5X4\n\tqly+l9qVqd44sJyZRM0Kj4uuEhKF01DUDe6+eEaI/R3kIanV0OQg91YxDh/oQmwtIVwH\n\t2mli2d8MJdIxh02/uL/xfjph8NCnT3ay+NnoCt2Qp6Xdj0SOibscWxT+rVjjWHaemdCZ\n\tIsjQ==", "X-Gm-Message-State": "AOAM530LVOMTQL1j0beF3zBHNxKj0STCR+joj0s/Iyd6mrSFmITVfxUk\n\tCgsNl3ugHjxTE1HbPl7lWVMCTfezTUy7jUkY", "X-Google-Smtp-Source": "ABdhPJyT5wRzPpQCPtL9exMksCcsQ65Dmyqxf4Az/sFoep42HO+20b1XEsVCrCqO9FJQlAtkg+IgUQ==", "X-Received": "by 2002:a5d:648e:: with SMTP id\n\to14mr7477279wri.141.1638373508039; \n\tWed, 01 Dec 2021 07:45:08 -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\tJacopo Mondi <jacopo@jmondi.org>,\n\tHans Verkuil <hverkuil-cisco@xs4all.nl>, \n\tTomasz Figa <tfiga@google.com>, Naushir Patuck <naush@raspberrypi.com>", "Date": "Wed, 1 Dec 2021 15:44:33 +0000", "Message-Id": "<20211201154434.23127-8-david.plowman@raspberrypi.com>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20211201154434.23127-1-david.plowman@raspberrypi.com>", "References": "<20211201154434.23127-1-david.plowman@raspberrypi.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v8 7/8] libcamera: Add validateColorSpaces\n\tto 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 | 2 ++\n src/libcamera/camera.cpp | 69 ++++++++++++++++++++++++++++++++++++++\n 2 files changed, 71 insertions(+)", "diff": "diff --git a/include/libcamera/camera.h b/include/libcamera/camera.h\nindex a7759ccb..fdcb66ab 100644\n--- a/include/libcamera/camera.h\n+++ b/include/libcamera/camera.h\n@@ -69,6 +69,8 @@ public:\n protected:\n \tCameraConfiguration();\n \n+\tStatus validateColorSpaces(bool shareOutputColorSpaces);\n+\n \tstd::vector<StreamConfiguration> config_;\n };\n \ndiff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\nindex 400a7cf0..a6a93dd0 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,73 @@ std::size_t CameraConfiguration::size() const\n \treturn config_.size();\n }\n \n+static 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+/**\n+ * \\brief Check the color spaces requested for each stream\n+ * \\param[in] shareOutputColorSpaces Force all output streams to share the same\n+ * color space\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(bool shareOutputColorSpaces)\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)) {\n+\t\t\tif (cfg.colorSpace != ColorSpace::Raw) {\n+\t\t\t\tcfg.colorSpace = ColorSpace::Raw;\n+\t\t\t\tstatus = Adjusted;\n+\t\t}\n+\t\telse if (cfg.colorSpace && (index == -1 || cfg.size > config_[i].size))\n+\t\t\tindex = i;\n+\t}\n+\n+\tif (index < 0 || !shareOutputColorSpaces)\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", "v8", "7/8" ] }