From patchwork Fri Oct 23 17:11:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 10224 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 89147BDB13 for ; Fri, 23 Oct 2020 17:11:32 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4CF77619A2; Fri, 23 Oct 2020 19:11:32 +0200 (CEST) Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 337D4615D3 for ; Fri, 23 Oct 2020 19:11:27 +0200 (CEST) X-Originating-IP: 93.34.118.233 Received: from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233]) (Authenticated sender: jacopo@jmondi.org) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id A24BD1C0007; Fri, 23 Oct 2020 17:11:26 +0000 (UTC) From: Jacopo Mondi To: libcamera-devel@lists.libcamera.org Date: Fri, 23 Oct 2020 19:11:09 +0200 Message-Id: <20201023171116.24899-6-jacopo@jmondi.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201023171116.24899-1-jacopo@jmondi.org> References: <20201023171116.24899-1-jacopo@jmondi.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 05/12] libcamera: controls: Generate an array of valid values X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" For each Control that support enumerated values generate a vector of ControlValues which contains the full list of values. At the expense of a slight increase in memory occupation this change allows the construction of the ControlInfo associated with a Control from the values list, defaulting the minimum and maximum values reported by the ControlInfo. Reviewed-by: Kieran Bingham Signed-off-by: Jacopo Mondi Reviewed-by: Laurent Pinchart --- include/libcamera/control_ids.h.in | 1 + src/libcamera/control_ids.cpp.in | 1 + utils/gen-controls.py | 30 ++++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+) diff --git a/include/libcamera/control_ids.h.in b/include/libcamera/control_ids.h.in index baadca83b103..7edeb6b65e32 100644 --- a/include/libcamera/control_ids.h.in +++ b/include/libcamera/control_ids.h.in @@ -10,6 +10,7 @@ #ifndef __LIBCAMERA_CONTROL_IDS_H__ #define __LIBCAMERA_CONTROL_IDS_H__ +#include #include #include diff --git a/src/libcamera/control_ids.cpp.in b/src/libcamera/control_ids.cpp.in index 056645cfbdfb..5fb1c2c30558 100644 --- a/src/libcamera/control_ids.cpp.in +++ b/src/libcamera/control_ids.cpp.in @@ -8,6 +8,7 @@ */ #include +#include /** * \file control_ids.h diff --git a/utils/gen-controls.py b/utils/gen-controls.py index bf681503f86a..a0bd43fabc31 100755 --- a/utils/gen-controls.py +++ b/utils/gen-controls.py @@ -33,6 +33,12 @@ ${description}''') ${description} */''') def_template = string.Template('extern const Control<${type}> ${name}(${id_name}, "${name}");') + enum_values_doc = string.Template('''/** + * \\var ${name}Values + * \\brief List of all $name supported values + */''') + enum_values_start = string.Template('''extern const std::array ${name}Values = {''') + enum_values_values = string.Template('''\tstatic_cast(${name}),''') ctrls_doc = [] ctrls_def = [] @@ -68,6 +74,7 @@ ${description} enum_doc = [] enum_doc.append(enum_doc_start_template.substitute(info)) + num_entries = 0; for entry in enum: value_info = { 'name' : name, @@ -75,11 +82,25 @@ ${description} 'description': format_description(entry['description']), } enum_doc.append(enum_doc_value_template.substitute(value_info)) + num_entries += 1 enum_doc = '\n *\n'.join(enum_doc) enum_doc += '\n */' target_doc.append(enum_doc) + values_info = { + 'name' : info['name'], + 'size' : num_entries, + } + target_doc.append(enum_values_doc.substitute(values_info)) + target_def.append(enum_values_start.substitute(values_info)) + for entry in enum: + value_info = { + 'name' : entry['name'] + } + target_def.append(enum_values_values.substitute(value_info)) + target_def.append("};") + target_doc.append(doc_template.substitute(info)) target_def.append(def_template.substitute(info)) @@ -100,6 +121,7 @@ ${description} def generate_h(controls): enum_template_start = string.Template('''enum ${name}Enum {''') enum_value_template = string.Template('''\t${name} = ${value},''') + enum_values_template = string.Template('''extern const std::array ${name}Values;''') template = string.Template('''extern const Control<${type}> ${name};''') ctrls = [] @@ -132,14 +154,22 @@ def generate_h(controls): if enum: target_ctrls.append(enum_template_start.substitute(info)) + num_entries = 0 for entry in enum: value_info = { 'name': entry['name'], 'value': entry['value'], } target_ctrls.append(enum_value_template.substitute(value_info)) + num_entries += 1 target_ctrls.append("};") + values_info = { + 'name' : info['name'], + 'size' : num_entries, + } + target_ctrls.append(enum_values_template.substitute(values_info)) + target_ctrls.append(template.substitute(info)) id_value += 1