{"id":2164,"url":"https://patchwork.libcamera.org/api/patches/2164/?format=json","web_url":"https://patchwork.libcamera.org/patch/2164/","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":"<20191012184407.31684-4-laurent.pinchart@ideasonboard.com>","date":"2019-10-12T18:43:56","name":"[libcamera-devel,v2,03/14] libcamera: control_ids: Generate map of all supported controls","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"2433d6ec339c9d2d32652c94cdd610897dc5b1f0","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/2164/mbox/","series":[{"id":531,"url":"https://patchwork.libcamera.org/api/series/531/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=531","date":"2019-10-12T18:43:53","name":"Use ControlList for both libcamera and V4L2 controls","version":2,"mbox":"https://patchwork.libcamera.org/series/531/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2164/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2164/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 8A20361563\n\tfor ;\n\tSat, 12 Oct 2019 20:44:17 +0200 (CEST)","from pendragon.bb.dnainternet.fi\n\t(dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id AD08B33A\n\tfor ;\n\tSat, 12 Oct 2019 20:44:16 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1570905857;\n\tbh=SafN5xzragEoQRgOVMscoYT6s79il8oVw21JGF3HcSY=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=W7g+oTO6IHv7ijteDLVqjOqvVG6srNnUBP1zCHYX6YIH+YqFo0NbB7nc9T2nMD+nA\n\tECjBGCiKofqtgwIIlab0dEgnTnEMT1fyHDTxI3ufVB8RAq6oauqKgvD30ybEZ87npX\n\tXTXiWQIfrajK+Y01HZ/LoeDBnK5Q78/AxgZCf+zQ=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 12 Oct 2019 21:43:56 +0300","Message-Id":"<20191012184407.31684-4-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.21.0","In-Reply-To":"<20191012184407.31684-1-laurent.pinchart@ideasonboard.com>","References":"<20191012184407.31684-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 03/14] libcamera: control_ids: Generate\n\tmap of all supported controls","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":"Sat, 12 Oct 2019 18:44:17 -0000"},"content":"In order to deserialise a ControlList, we will need to lookup ControlId\ninstances based on their numerical ID. Generate a global map from the\ncontrols definitions to support such a lookup.\n\nSigned-off-by: Laurent Pinchart \n---\nChanges since v1:\n\n- Add ControlIdMap type\n---\n include/libcamera/control_ids.h.in | 2 ++\n include/libcamera/controls.h | 1 +\n src/libcamera/control_ids.cpp.in | 7 +++++++\n src/libcamera/controls.cpp | 9 +++++++++\n src/libcamera/gen-controls.py | 3 +++\n 5 files changed, 22 insertions(+)","diff":"diff --git a/include/libcamera/control_ids.h.in b/include/libcamera/control_ids.h.in\nindex 1d0bc791e559..6ff0e4186983 100644\n--- a/include/libcamera/control_ids.h.in\n+++ b/include/libcamera/control_ids.h.in\n@@ -24,6 +24,8 @@ ${ids}\n \n ${controls}\n \n+extern const ControlIdMap controls;\n+\n } /* namespace controls */\n \n } /* namespace libcamera */\ndiff --git a/include/libcamera/controls.h b/include/libcamera/controls.h\nindex 90426753f40f..d8acd800b143 100644\n--- a/include/libcamera/controls.h\n+++ b/include/libcamera/controls.h\n@@ -111,6 +111,7 @@ private:\n \tControlValue max_;\n };\n \n+using ControlIdMap = std::unordered_map;\n using ControlInfoMap = std::unordered_map;\n \n class ControlList\ndiff --git a/src/libcamera/control_ids.cpp.in b/src/libcamera/control_ids.cpp.in\nindex dd5433820a8b..99c511d0e712 100644\n--- a/src/libcamera/control_ids.cpp.in\n+++ b/src/libcamera/control_ids.cpp.in\n@@ -31,6 +31,13 @@ ${controls_doc}\n ${controls_def}\n #endif\n \n+/**\n+ * \\brief List of all supported libcamera controls\n+ */\n+extern const ControlIdMap controls {\n+${controls_map}\n+};\n+\n } /* namespace controls */\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\nindex f3260edce0bc..70c1af481af2 100644\n--- a/src/libcamera/controls.cpp\n+++ b/src/libcamera/controls.cpp\n@@ -355,6 +355,15 @@ std::string ControlRange::toString() const\n \treturn ss.str();\n }\n \n+/**\n+ * \\typedef ControlIdMap\n+ * \\brief A map of numerical control ID to ControlId\n+ *\n+ * The map is used by ControlList instances to access controls by numerical\n+ * IDs. A global map of all libcamera controls is provided by\n+ * controls::controls.\n+ */\n+\n /**\n * \\typedef ControlInfoMap\n * \\brief A map of ControlId to ControlRange\ndiff --git a/src/libcamera/gen-controls.py b/src/libcamera/gen-controls.py\nindex a3e52fb36f7a..940386cc68c8 100755\n--- a/src/libcamera/gen-controls.py\n+++ b/src/libcamera/gen-controls.py\n@@ -25,6 +25,7 @@ ${description}\n \n ctrls_doc = []\n ctrls_def = []\n+ ctrls_map = []\n \n for ctrl in controls:\n name, ctrl = ctrl.popitem()\n@@ -43,10 +44,12 @@ ${description}\n \n ctrls_doc.append(doc_template.substitute(info))\n ctrls_def.append(def_template.substitute(info))\n+ ctrls_map.append('\\t{ ' + id_name + ', &' + name + ' },')\n \n return {\n 'controls_doc': '\\n\\n'.join(ctrls_doc),\n 'controls_def': '\\n'.join(ctrls_def),\n+ 'controls_map': '\\n'.join(ctrls_map),\n }\n \n \n","prefixes":["libcamera-devel","v2","03/14"]}