Patch Detail
Show a patch.
GET /api/1.1/patches/13595/?format=api
{ "id": 13595, "url": "https://patchwork.libcamera.org/api/1.1/patches/13595/?format=api", "web_url": "https://patchwork.libcamera.org/patch/13595/", "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": "<20210901143800.119118-6-jacopo@jmondi.org>", "date": "2021-09-01T14:37:59", "name": "[libcamera-devel,5/6] libcamera: controls: Rationalize idMap() function", "commit_ref": null, "pull_url": null, "state": "not-applicable", "archived": false, "hash": "cbea93ad574b84ace9349fd38da75d663080125b", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/1.1/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": { "id": 15, "url": "https://patchwork.libcamera.org/api/1.1/users/15/?format=api", "username": "jmondi", "first_name": "Jacopo", "last_name": "Mondi", "email": "jacopo@jmondi.org" }, "mbox": "https://patchwork.libcamera.org/patch/13595/mbox/", "series": [ { "id": 2434, "url": "https://patchwork.libcamera.org/api/1.1/series/2434/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2434", "date": "2021-09-01T14:37:54", "name": "libcamera: control serializer fixes", "version": 1, "mbox": "https://patchwork.libcamera.org/series/2434/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/13595/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/13595/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 CEE80C3244\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 1 Sep 2021 14:37:22 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7BC3869173;\n\tWed, 1 Sep 2021 16:37:22 +0200 (CEST)", "from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net\n\t[217.70.183.198])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 27EF969174\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 1 Sep 2021 16:37:20 +0200 (CEST)", "(Authenticated sender: jacopo@jmondi.org)\n\tby relay6-d.mail.gandi.net (Postfix) with ESMTPSA id B6667C000C;\n\tWed, 1 Sep 2021 14:37:19 +0000 (UTC)" ], "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 1 Sep 2021 16:37:59 +0200", "Message-Id": "<20210901143800.119118-6-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.32.0", "In-Reply-To": "<20210901143800.119118-1-jacopo@jmondi.org>", "References": "<20210901143800.119118-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 5/6] libcamera: controls: Rationalize\n\tidMap() function", "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 ControlList class has a pair of accessor functions with a similar\nsignature:\n\n\tconst ControlInfoMap *infoMap() const { return infoMap_; }\n\tconst ControlIdMap *idMap() const { return idmap_; }\n\nAs ControlList::infoMap_ can be nullptr, the two functions returns the\nclass members as pointers and not references.\n\nThe ControlInfoMap class has instead:\n\n\tconst ControlIdMap &idmap() const { return *idmap_; }\n\nWhich is disturbingly different in the signature and return type.\n\nRationalize the accessor function names by stabilizing on:\n\n\tconst ControlIdMap *idMap() const { return idmap_; }\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n include/libcamera/controls.h | 2 +-\n src/libcamera/camera_sensor.cpp | 2 +-\n src/libcamera/control_serializer.cpp | 4 ++--\n src/libcamera/controls.cpp | 4 ++--\n src/libcamera/delayed_controls.cpp | 4 ++--\n 5 files changed, 8 insertions(+), 8 deletions(-)", "diff": "diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h\nindex 8e5bc8b70b94..de6faf600e19 100644\n--- a/include/libcamera/controls.h\n+++ b/include/libcamera/controls.h\n@@ -338,7 +338,7 @@ public:\n \titerator find(unsigned int key);\n \tconst_iterator find(unsigned int key) const;\n \n-\tconst ControlIdMap &idmap() const { return *idmap_; }\n+\tconst ControlIdMap *idMap() const { return idmap_; }\n \n private:\n \tbool validate();\ndiff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\nindex 876685097f76..48af3a617ee1 100644\n--- a/src/libcamera/camera_sensor.cpp\n+++ b/src/libcamera/camera_sensor.cpp\n@@ -176,7 +176,7 @@ int CameraSensor::validateSensorDriver()\n \t\tV4L2_CID_CAMERA_SENSOR_ROTATION,\n \t};\n \n-\tconst ControlIdMap &controls = subdev_->controls().idmap();\n+\tconst ControlIdMap &controls = *subdev_->controls().idMap();\n \tfor (uint32_t ctrl : optionalControls) {\n \t\tif (!controls.count(ctrl))\n \t\t\tLOG(CameraSensor, Debug)\ndiff --git a/src/libcamera/control_serializer.cpp b/src/libcamera/control_serializer.cpp\nindex d4377c024079..7eef041a16ee 100644\n--- a/src/libcamera/control_serializer.cpp\n+++ b/src/libcamera/control_serializer.cpp\n@@ -190,7 +190,7 @@ int ControlSerializer::serialize(const ControlInfoMap &infoMap,\n \tfor (const auto &ctrl : infoMap)\n \t\tvaluesSize += binarySize(ctrl.second);\n \n-\tconst ControlIdMap *idmap = &infoMap.idmap();\n+\tconst ControlIdMap *idmap = infoMap.idMap();\n \tenum ipa_controls_id_map_type idMapType;\n \tif (idmap == &controls::controls)\n \t\tidMapType = IPA_CONTROL_ID_MAP_CONTROLS;\n@@ -530,7 +530,7 @@ ControlList ControlSerializer::deserialize<ControlList>(ByteStreamBuffer &buffer\n \t\t}\n \n \t\tconst ControlInfoMap *infoMap = iter->first;\n-\t\tidMap = &infoMap->idmap();\n+\t\tidMap = infoMap->idMap();\n \t} else {\n \t\tswitch (hdr->id_map_type) {\n \t\tcase IPA_CONTROL_ID_MAP_CONTROLS:\ndiff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\nindex 96625edb1380..9b9bad212db3 100644\n--- a/src/libcamera/controls.cpp\n+++ b/src/libcamera/controls.cpp\n@@ -778,7 +778,7 @@ ControlInfoMap::const_iterator ControlInfoMap::find(unsigned int id) const\n }\n \n /**\n- * \\fn const ControlIdMap &ControlInfoMap::idmap() const\n+ * \\fn const ControlIdMap *ControlInfoMap::idMap() const\n * \\brief Retrieve the ControlId map\n *\n * Constructing ControlList instances for V4L2 controls requires a ControlIdMap\n@@ -832,7 +832,7 @@ ControlList::ControlList(const ControlIdMap &idmap, ControlValidator *validator)\n * \\param[in] validator The validator (may be null)\n */\n ControlList::ControlList(const ControlInfoMap &infoMap, ControlValidator *validator)\n-\t: validator_(validator), idmap_(&infoMap.idmap()), infoMap_(&infoMap)\n+\t: validator_(validator), idmap_(infoMap.idMap()), infoMap_(&infoMap)\n {\n }\n \ndiff --git a/src/libcamera/delayed_controls.cpp b/src/libcamera/delayed_controls.cpp\nindex 90ce7e0b5b52..763021ef09bb 100644\n--- a/src/libcamera/delayed_controls.cpp\n+++ b/src/libcamera/delayed_controls.cpp\n@@ -130,7 +130,7 @@ void DelayedControls::reset()\n \t/* Seed the control queue with the controls reported by the device. */\n \tvalues_.clear();\n \tfor (const auto &ctrl : controls) {\n-\t\tconst ControlId *id = device_->controls().idmap().at(ctrl.first);\n+\t\tconst ControlId *id = device_->controls().idMap()->at(ctrl.first);\n \t\t/*\n \t\t * Do not mark this control value as updated, it does not need\n \t\t * to be written to to device on startup.\n@@ -158,7 +158,7 @@ bool DelayedControls::push(const ControlList &controls)\n \t}\n \n \t/* Update with new controls. */\n-\tconst ControlIdMap &idmap = device_->controls().idmap();\n+\tconst ControlIdMap &idmap = *device_->controls().idMap();\n \tfor (const auto &control : controls) {\n \t\tconst auto &it = idmap.find(control.first);\n \t\tif (it == idmap.end()) {\n", "prefixes": [ "libcamera-devel", "5/6" ] }