{"id":10138,"url":"https://patchwork.libcamera.org/api/patches/10138/?format=json","web_url":"https://patchwork.libcamera.org/patch/10138/","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":"<20201020180534.36855-6-jacopo@jmondi.org>","date":"2020-10-20T18:05:26","name":"[libcamera-devel,v2,05/13] libcamera: controls: Generate a vector of enumerated values","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"d6595861b86c52da3d8b80b30b6cf0641011006d","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/10138/mbox/","series":[{"id":1391,"url":"https://patchwork.libcamera.org/api/series/1391/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1391","date":"2020-10-20T18:05:21","name":"libcamera: Introduce draft controls","version":2,"mbox":"https://patchwork.libcamera.org/series/1391/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10138/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10138/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 9DE6DBDB20\n\tfor ;\n\tTue, 20 Oct 2020 16:05:20 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3811C61DE0;\n\tTue, 20 Oct 2020 18:05:20 +0200 (CEST)","from relay10.mail.gandi.net (relay10.mail.gandi.net\n\t[217.70.178.230])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A1A2D61D8B\n\tfor ;\n\tTue, 20 Oct 2020 18:05:17 +0200 (CEST)","from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay10.mail.gandi.net (Postfix) with ESMTPSA id 33CD1240012;\n\tTue, 20 Oct 2020 16:05:17 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 20 Oct 2020 20:05:26 +0200","Message-Id":"<20201020180534.36855-6-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20201020180534.36855-1-jacopo@jmondi.org>","References":"<20201020180534.36855-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 05/13] libcamera: controls: Generate a\n\tvector of enumerated 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 support enumerated values generate a vector\nof ControlValues which contains the full list of 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\nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/control_ids.cpp.in | 2 ++\n utils/gen-controls.py | 10 ++++++++++\n 2 files changed, 12 insertions(+)","diff":"diff --git a/src/libcamera/control_ids.cpp.in b/src/libcamera/control_ids.cpp.in\nindex 056645cfbdfb..ca0b5b22f899 100644\n--- a/src/libcamera/control_ids.cpp.in\n+++ b/src/libcamera/control_ids.cpp.in\n@@ -6,8 +6,10 @@\n *\n * This file is auto-generated. Do not edit.\n */\n+#include \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 93cb3885c3da..87036fe7dec1 100755\n--- a/utils/gen-controls.py\n+++ b/utils/gen-controls.py\n@@ -100,6 +100,8 @@ ${description}\n def generate_h(controls):\n enum_template_start = string.Template('''enum ${name}Values {''')\n enum_value_template = string.Template('''\\t${name} = ${value},''')\n+ enum_list_start = string.Template('''static const std::vector ${name}List = {''')\n+ enum_list_values = string.Template('''\\tstatic_cast(${name}),''')\n template = string.Template('''extern const Control<${type}> ${name};''')\n \n ctrls = []\n@@ -140,6 +142,14 @@ def generate_h(controls):\n target_ctrls.append(enum_value_template.substitute(value_info))\n target_ctrls.append(\"};\")\n \n+ target_ctrls.append(enum_list_start.substitute(info))\n+ for entry in enum:\n+ value_info = {\n+ 'name': entry['name'],\n+ }\n+ target_ctrls.append(enum_list_values.substitute(value_info))\n+ target_ctrls.append(\"};\")\n+\n target_ctrls.append(template.substitute(info))\n id_value += 1\n \n","prefixes":["libcamera-devel","v2","05/13"]}