{"id":2305,"url":"https://patchwork.libcamera.org/api/patches/2305/?format=json","web_url":"https://patchwork.libcamera.org/patch/2305/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20191108205409.18845-10-laurent.pinchart@ideasonboard.com>","date":"2019-11-08T20:53:54","name":"[libcamera-devel,v2,09/24] libcamera: controls: Store reference to the InfoMap","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"391774f1ca8f65d470428f08eec9b7824779fc77","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2305/mbox/","series":[{"id":568,"url":"https://patchwork.libcamera.org/api/series/568/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=568","date":"2019-11-08T20:53:45","name":"Control serialization and IPA C API","version":2,"mbox":"https://patchwork.libcamera.org/series/568/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2305/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2305/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DCB7E61518\n\tfor ;\n\tFri, 8 Nov 2019 21:54:25 +0100 (CET)","from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 170EA31D;\n\tFri, 8 Nov 2019 21:54:25 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1573246465;\n\tbh=0Ef+VMEo12M3yvF5ZfP5KQ4/VIdqLLwg5eVgLy7S4KY=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=IOr02YPEp2ANx4kr8nbPn0K77tDfmwuzwM/L4mF62bbsg7j527pd2eI9iqI4Ysip3\n\t46slNV25RQZZ1Mp4uKjF0zNc9UCH35xDvP1w4EPqNL4h/rQDxgg9157Cew2JCPeyZM\n\tDmthr/yTvBRRvAkOaGN1Rs7CbzzEX8Mz1Tkyh7Bg=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 8 Nov 2019 22:53:54 +0200","Message-Id":"<20191108205409.18845-10-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.23.0","In-Reply-To":"<20191108205409.18845-1-laurent.pinchart@ideasonboard.com>","References":"<20191108205409.18845-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 09/24] libcamera: controls: Store\n\treference to the InfoMap","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Fri, 08 Nov 2019 20:54:26 -0000"},"content":"From: Jacopo Mondi \n\nStore a reference to the ControlInfoMap used to create a ControlList and\nprovide an operation to retrieve it. This will be used to implement\nserialization of ControlList.\n\nSigned-off-by: Jacopo Mondi \n---\n include/libcamera/controls.h | 4 ++++\n src/libcamera/controls.cpp | 16 +++++++++++++---\n 2 files changed, 17 insertions(+), 3 deletions(-)","diff":"diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h\nindex b35e006bc046..baca684444a7 100644\n--- a/include/libcamera/controls.h\n+++ b/include/libcamera/controls.h\n@@ -232,12 +232,16 @@ public:\n \tconst ControlValue &get(unsigned int id) const;\n \tvoid set(unsigned int id, const ControlValue &value);\n \n+\tconst ControlInfoMap *infoMap() const { return infoMap_; }\n+\n private:\n \tconst ControlValue *find(unsigned int id) const;\n \tControlValue *find(unsigned int id);\n \n \tControlValidator *validator_;\n \tconst ControlIdMap *idmap_;\n+\tconst ControlInfoMap *infoMap_;\n+\n \tControlListMap controls_;\n };\n \ndiff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\nindex 178ce3d99bce..eae0250a92e3 100644\n--- a/src/libcamera/controls.cpp\n+++ b/src/libcamera/controls.cpp\n@@ -595,7 +595,7 @@ void ControlInfoMap::generateIdmap()\n * be used directly by application.\n */\n ControlList::ControlList()\n-\t: validator_(nullptr), idmap_(nullptr)\n+\t: validator_(nullptr), idmap_(nullptr), infoMap_(nullptr)\n {\n }\n \n@@ -609,7 +609,7 @@ ControlList::ControlList()\n * argument.\n */\n ControlList::ControlList(const ControlIdMap &idmap, ControlValidator *validator)\n-\t: validator_(validator), idmap_(&idmap)\n+\t: validator_(validator), idmap_(&idmap), infoMap_(nullptr)\n {\n }\n \n@@ -619,7 +619,7 @@ ControlList::ControlList(const ControlIdMap &idmap, ControlValidator *validator)\n * \\param[in] validator The validator (may be null)\n */\n ControlList::ControlList(const ControlInfoMap &info, ControlValidator *validator)\n-\t: validator_(validator), idmap_(&info.idmap())\n+\t: validator_(validator), idmap_(&info.idmap()), infoMap_(&info)\n {\n }\n \n@@ -769,6 +769,16 @@ void ControlList::set(unsigned int id, const ControlValue &value)\n \t*val = value;\n }\n \n+/**\n+ * \\fn ControlList::infoMap()\n+ * \\brief Retrieve the ControlInfoMap used to construct the ControlList\n+ *\n+ * \\return The ControlInfoMap used to construct the ControlList. ControlList\n+ * instances constructed with ControlList() or\n+ * ControlList(const ControlIdMap &idmap, ControlValidator *validator) have no\n+ * associated ControlInfoMap, nullptr is returned in that case.\n+ */\n+\n const ControlValue *ControlList::find(unsigned int id) const\n {\n \tconst auto iter = controls_.find(id);\n","prefixes":["libcamera-devel","v2","09/24"]}