Patch Detail
Show a patch.
GET /api/1.1/patches/15038/?format=api
{ "id": 15038, "url": "https://patchwork.libcamera.org/api/1.1/patches/15038/?format=api", "web_url": "https://patchwork.libcamera.org/patch/15038/", "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": "<20211206054918.2467049-1-hiroh@chromium.org>", "date": "2021-12-06T05:49:16", "name": "[libcamera-devel,v10,1/3] libcamera: camera_sensor: Reference test pattern modes by enum type", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "ded355e1f0fefcab4b34d29a0dd5a57d54f4cc5a", "submitter": { "id": 63, "url": "https://patchwork.libcamera.org/api/1.1/people/63/?format=api", "name": "Hirokazu Honda", "email": "hiroh@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/15038/mbox/", "series": [ { "id": 2816, "url": "https://patchwork.libcamera.org/api/1.1/series/2816/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2816", "date": "2021-12-06T05:49:16", "name": "[libcamera-devel,v10,1/3] libcamera: camera_sensor: Reference test pattern modes by enum type", "version": 10, "mbox": "https://patchwork.libcamera.org/series/2816/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/15038/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/15038/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 ABBE5BDB13\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 6 Dec 2021 05:49:29 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D268F6086A;\n\tMon, 6 Dec 2021 06:49:28 +0100 (CET)", "from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com\n\t[IPv6:2607:f8b0:4864:20::62a])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9A6D360224\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 6 Dec 2021 06:49:26 +0100 (CET)", "by mail-pl1-x62a.google.com with SMTP id u11so6368618plf.3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun, 05 Dec 2021 21:49:26 -0800 (PST)", "from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:203:749e:cfe6:fd85:77b7])\n\tby smtp.gmail.com with ESMTPSA id\n\ta1sm11492368pfv.99.2021.12.05.21.49.22\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tSun, 05 Dec 2021 21:49:23 -0800 (PST)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"btDz0jRW\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; h=from:to:cc:subject:date:message-id:mime-version\n\t:content-transfer-encoding;\n\tbh=HWVakCseTmApR8POV7cSLk9Fe28Jm4ZGfdfI2CCeE+4=;\n\tb=btDz0jRWlF7ZMyDMwdThIZxFMRUc78llkuqeXhNRwqlGpWtTeD8cafg38xJoxWMZGu\n\ttuWHzdBh4A8uuw6stm3YVmpOKRG+Q9hE/fjJtbvYckkE7R9QED+/gfbN3iMiXFLhGVrF\n\tYWKIwFv9On4JWb3cFLcwIkX1zgMEGikyg4Cdw=", "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:mime-version\n\t:content-transfer-encoding;\n\tbh=HWVakCseTmApR8POV7cSLk9Fe28Jm4ZGfdfI2CCeE+4=;\n\tb=LBRqP216jjHMp+f2eyvyikqHkso/O1Ni1cTVRgPEyuLcG0oy1abO5WnpIIUotw9mZP\n\tdvtE1PQwcZB72Yul2Lha9Q6qYl7Q6CtoBIxoQqADxICcoOl7Eq7VydWsYXfQ9wO6sZ3I\n\tY0tPcnnQ4Xh8wdAnWmkXm5fn8+D85u1tBrCWZkkwyT+iO0bWfNQHrYx+b7dACW8GZPtD\n\tnso4pGxqZ/eEf/hIfAOmogRQg6WtRmJC+Y8igFTR2m7vtnniECpLtwSwPxJ9rQZMYaky\n\tivRh1s/mT2UkeIlK3woDUJw1Oh9S2ihP6iUg6LktQF5HTAwq7j8AXr8M49/jxJJuZc4o\n\t+0WQ==", "X-Gm-Message-State": "AOAM533Wtz2cuXu4qQHdN/jQjSnvxC2a+cQE+r5v7AoAsWs7PbvEnAft\n\tvoiVux8FmNq+QJ95jTY/VtZecge0wZtJYg==", "X-Google-Smtp-Source": "ABdhPJxLtdmgC9CysKpnhc6rehMeXROjTxVYbNAyly9IpzfrX82DN0qr2bVku1bJLz+vKC2L+rl2Mg==", "X-Received": "by 2002:a17:902:d34d:b0:143:c927:dc48 with SMTP id\n\tl13-20020a170902d34d00b00143c927dc48mr41672917plk.71.1638769764323; \n\tSun, 05 Dec 2021 21:49:24 -0800 (PST)", "From": "Hirokazu Honda <hiroh@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 6 Dec 2021 14:49:16 +0900", "Message-Id": "<20211206054918.2467049-1-hiroh@chromium.org>", "X-Mailer": "git-send-email 2.34.1.400.ga245620fadb-goog", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v10 1/3] libcamera: camera_sensor:\n\tReference test pattern modes by enum type", "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": "The CameraSensor stores TestPatternModes as an int32_t. This prevents\nthe compiler from verifying the usage against the defined enum types.\n\nFix references to the TestPatternMode to store the value as the\nTestPatternModeEnum type which is defined by the control generator.\n\nSigned-off-by: Hirokazu Honda <hiroh@chromium.org>\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n include/libcamera/internal/camera_sensor.h | 10 +++++++---\n include/libcamera/internal/camera_sensor_properties.h | 3 ++-\n src/libcamera/camera_sensor.cpp | 4 ++--\n src/libcamera/pipeline/ipu3/ipu3.cpp | 7 ++++---\n 4 files changed, 15 insertions(+), 9 deletions(-)", "diff": "diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\nindex 2facbf3c..310571ca 100644\n--- a/include/libcamera/internal/camera_sensor.h\n+++ b/include/libcamera/internal/camera_sensor.h\n@@ -14,8 +14,10 @@\n #include <libcamera/base/class.h>\n #include <libcamera/base/log.h>\n \n+#include <libcamera/control_ids.h>\n #include <libcamera/controls.h>\n #include <libcamera/geometry.h>\n+\n #include <libcamera/ipa/core_ipa_interface.h>\n \n #include \"libcamera/internal/formats.h\"\n@@ -40,7 +42,8 @@ public:\n \tconst std::vector<unsigned int> &mbusCodes() const { return mbusCodes_; }\n \tconst std::vector<Size> sizes(unsigned int mbusCode) const;\n \tSize resolution() const;\n-\tconst std::vector<int32_t> &testPatternModes() const\n+\tconst std::vector<controls::draft::TestPatternModeEnum>\n+\t\t&testPatternModes() const\n \t{\n \t\treturn testPatternModes_;\n \t}\n@@ -71,7 +74,8 @@ private:\n \tvoid initVimcDefaultProperties();\n \tvoid initStaticProperties();\n \tvoid initTestPatternModes(\n-\t\tconst std::map<int32_t, int32_t> &testPatternModeMap);\n+\t\tconst std::map<controls::draft::TestPatternModeEnum, int32_t>\n+\t\t\t&testPatternModeMap);\n \tint initProperties();\n \n \tconst MediaEntity *entity_;\n@@ -84,7 +88,7 @@ private:\n \tV4L2Subdevice::Formats formats_;\n \tstd::vector<unsigned int> mbusCodes_;\n \tstd::vector<Size> sizes_;\n-\tstd::vector<int32_t> testPatternModes_;\n+\tstd::vector<controls::draft::TestPatternModeEnum> testPatternModes_;\n \n \tSize pixelArraySize_;\n \tRectangle activeArea_;\ndiff --git a/include/libcamera/internal/camera_sensor_properties.h b/include/libcamera/internal/camera_sensor_properties.h\nindex af381a12..1ee3cb99 100644\n--- a/include/libcamera/internal/camera_sensor_properties.h\n+++ b/include/libcamera/internal/camera_sensor_properties.h\n@@ -10,6 +10,7 @@\n #include <map>\n #include <string>\n \n+#include <libcamera/control_ids.h>\n #include <libcamera/geometry.h>\n \n namespace libcamera {\n@@ -18,7 +19,7 @@ struct CameraSensorProperties {\n \tstatic const CameraSensorProperties *get(const std::string &sensor);\n \n \tSize unitCellSize;\n-\tstd::map<int32_t, int32_t> testPatternModes;\n+\tstd::map<controls::draft::TestPatternModeEnum, int32_t> testPatternModes;\n };\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\nindex 9fdb8c09..f0aa9f24 100644\n--- a/src/libcamera/camera_sensor.cpp\n+++ b/src/libcamera/camera_sensor.cpp\n@@ -311,7 +311,7 @@ void CameraSensor::initStaticProperties()\n }\n \n void CameraSensor::initTestPatternModes(\n-\tconst std::map<int32_t, int32_t> &testPatternModes)\n+\tconst std::map<controls::draft::TestPatternModeEnum, int32_t> &testPatternModes)\n {\n \tconst auto &v4l2TestPattern = controls().find(V4L2_CID_TEST_PATTERN);\n \tif (v4l2TestPattern == controls().end()) {\n@@ -327,7 +327,7 @@ void CameraSensor::initTestPatternModes(\n \t * control index is supported in the below for loop that creates the\n \t * list of supported test patterns.\n \t */\n-\tstd::map<int32_t, int32_t> indexToTestPatternMode;\n+\tstd::map<int32_t, controls::draft::TestPatternModeEnum> indexToTestPatternMode;\n \tfor (const auto &it : testPatternModes)\n \t\tindexToTestPatternMode[it.second] = it.first;\n \ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex c65afdb2..25490dcf 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -982,13 +982,14 @@ int PipelineHandlerIPU3::updateControls(IPU3CameraData *data)\n \t\treturn ret;\n \n \tControlInfoMap::Map controls = IPU3Controls;\n-\tconst std::vector<int32_t> &testPatternModes = sensor->testPatternModes();\n+\tconst std::vector<controls::draft::TestPatternModeEnum>\n+\t\t&testPatternModes = sensor->testPatternModes();\n \tif (!testPatternModes.empty()) {\n \t\tstd::vector<ControlValue> values;\n \t\tvalues.reserve(testPatternModes.size());\n \n-\t\tfor (int32_t pattern : testPatternModes)\n-\t\t\tvalues.emplace_back(pattern);\n+\t\tfor (auto pattern : testPatternModes)\n+\t\t\tvalues.emplace_back(static_cast<int32_t>(pattern));\n \n \t\tcontrols[&controls::draft::TestPatternMode] = ControlInfo(values);\n \t}\n", "prefixes": [ "libcamera-devel", "v10", "1/3" ] }