{"id":10241,"url":"https://patchwork.libcamera.org/api/1.1/patches/10241/?format=json","web_url":"https://patchwork.libcamera.org/patch/10241/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20201025160434.25664-7-jacopo@jmondi.org>","date":"2020-10-25T16:04:26","name":"[libcamera-devel,v5,06/14] libcamera: controls: Generate an array of valid values","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"681884b590e7f888f49a358a00b91c90096c1b76","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/10241/mbox/","series":[{"id":1414,"url":"https://patchwork.libcamera.org/api/1.1/series/1414/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1414","date":"2020-10-25T16:04:20","name":"libcamera: Introduce draft controls","version":5,"mbox":"https://patchwork.libcamera.org/series/1414/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10241/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10241/checks/","tags":{},"headers":{"Return-Path":"","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 AC25DBDB13\n\tfor ;\n\tSun, 25 Oct 2020 16:04:51 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8AE9661E7D;\n\tSun, 25 Oct 2020 17:04:51 +0100 (CET)","from relay10.mail.gandi.net (relay10.mail.gandi.net\n\t[217.70.178.230])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B02C461D25\n\tfor ;\n\tSun, 25 Oct 2020 17:04:47 +0100 (CET)","from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay10.mail.gandi.net (Postfix) with ESMTPSA id BB54F240007;\n\tSun, 25 Oct 2020 16:04:46 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Sun, 25 Oct 2020 17:04:26 +0100","Message-Id":"<20201025160434.25664-7-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20201025160434.25664-1-jacopo@jmondi.org>","References":"<20201025160434.25664-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v5 06/14] libcamera: controls: Generate an\n\tarray of valid values","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"For each Control that supports enumerated values generate an array\nof ControlValue which contains the full list of valid values.\n\nAt the expense of a slight increase in memory occupation this change\nallows the construction of the ControlInfo associated with a Control\nfrom the values list, defaulting the minimum and maximum values\nreported by the ControlInfo.\n\nReviewed-by: Laurent Pinchart \nReviewed-by: Kieran Bingham \nSigned-off-by: Jacopo Mondi \n---\n include/libcamera/control_ids.h.in | 1 +\n src/libcamera/control_ids.cpp.in | 1 +\n utils/gen-controls.py | 30 ++++++++++++++++++++++++++++++\n 3 files changed, 32 insertions(+)","diff":"diff --git a/include/libcamera/control_ids.h.in b/include/libcamera/control_ids.h.in\nindex baadca83b103..7edeb6b65e32 100644\n--- a/include/libcamera/control_ids.h.in\n+++ b/include/libcamera/control_ids.h.in\n@@ -10,6 +10,7 @@\n #ifndef __LIBCAMERA_CONTROL_IDS_H__\n #define __LIBCAMERA_CONTROL_IDS_H__\n \n+#include \n #include \n \n #include \ndiff --git a/src/libcamera/control_ids.cpp.in b/src/libcamera/control_ids.cpp.in\nindex 056645cfbdfb..5fb1c2c30558 100644\n--- a/src/libcamera/control_ids.cpp.in\n+++ b/src/libcamera/control_ids.cpp.in\n@@ -8,6 +8,7 @@\n */\n \n #include \n+#include \n \n /**\n * \\file control_ids.h\ndiff --git a/utils/gen-controls.py b/utils/gen-controls.py\nindex bf681503f86a..8bdaf4bdf078 100755\n--- a/utils/gen-controls.py\n+++ b/utils/gen-controls.py\n@@ -33,6 +33,12 @@ ${description}''')\n ${description}\n */''')\n def_template = string.Template('extern const Control<${type}> ${name}(${id_name}, \"${name}\");')\n+ enum_values_doc = string.Template('''/**\n+ * \\\\var ${name}Values\n+ * \\\\brief List of all $name supported values\n+ */''')\n+ enum_values_start = string.Template('''extern const std::array ${name}Values = {''')\n+ enum_values_values = string.Template('''\\tstatic_cast(${name}),''')\n \n ctrls_doc = []\n ctrls_def = []\n@@ -68,6 +74,7 @@ ${description}\n enum_doc = []\n enum_doc.append(enum_doc_start_template.substitute(info))\n \n+ num_entries = 0\n for entry in enum:\n value_info = {\n 'name' : name,\n@@ -75,11 +82,25 @@ ${description}\n 'description': format_description(entry['description']),\n }\n enum_doc.append(enum_doc_value_template.substitute(value_info))\n+ num_entries += 1\n \n enum_doc = '\\n *\\n'.join(enum_doc)\n enum_doc += '\\n */'\n target_doc.append(enum_doc)\n \n+ values_info = {\n+ 'name': info['name'],\n+ 'size': num_entries,\n+ }\n+ target_doc.append(enum_values_doc.substitute(values_info))\n+ target_def.append(enum_values_start.substitute(values_info))\n+ for entry in enum:\n+ value_info = {\n+ 'name': entry['name']\n+ }\n+ target_def.append(enum_values_values.substitute(value_info))\n+ target_def.append(\"};\")\n+\n target_doc.append(doc_template.substitute(info))\n target_def.append(def_template.substitute(info))\n \n@@ -100,6 +121,7 @@ ${description}\n def generate_h(controls):\n enum_template_start = string.Template('''enum ${name}Enum {''')\n enum_value_template = string.Template('''\\t${name} = ${value},''')\n+ enum_values_template = string.Template('''extern const std::array ${name}Values;''')\n template = string.Template('''extern const Control<${type}> ${name};''')\n \n ctrls = []\n@@ -132,14 +154,22 @@ def generate_h(controls):\n if enum:\n target_ctrls.append(enum_template_start.substitute(info))\n \n+ num_entries = 0\n for entry in enum:\n value_info = {\n 'name': entry['name'],\n 'value': entry['value'],\n }\n target_ctrls.append(enum_value_template.substitute(value_info))\n+ num_entries += 1\n target_ctrls.append(\"};\")\n \n+ values_info = {\n+ 'name': info['name'],\n+ 'size': num_entries,\n+ }\n+ target_ctrls.append(enum_values_template.substitute(values_info))\n+\n target_ctrls.append(template.substitute(info))\n id_value += 1\n \n","prefixes":["libcamera-devel","v5","06/14"]}