From 09c1b081baa215874545eaa35b081be06fea25b6 Mon Sep 17 00:00:00 2001
From: Christian Rauch <Rauch.Christian@gmx.de>
Date: Tue, 2 Aug 2022 23:03:24 +0200
Subject: libcamera: controls: Generate and use fixed-sized Span types

Define Span types explicitly as either variable- or fixed-sized. This
introduces a new convention for defining Span dimensions in the property
and control value definitions and generates Span types as variable-sized
Span<T> or as fixed-sized Span<T,N>.

Signed-off-by: Christian Rauch <Rauch.Christian@gmx.de>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 utils/gen-controls.py | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

(limited to 'utils')

diff --git a/utils/gen-controls.py b/utils/gen-controls.py
index 3f99b5e2..46ba4394 100755
--- a/utils/gen-controls.py
+++ b/utils/gen-controls.py
@@ -7,6 +7,8 @@
 # gen-controls.py - Generate control definitions from YAML
 
 import argparse
+from functools import reduce
+import operator
 import string
 import sys
 import yaml
@@ -22,6 +24,24 @@ def format_description(description):
     return '\n'.join([(line and ' * ' or ' *') + line for line in description])
 
 
+def get_ctrl_type(ctrl):
+    ctrl_type = ctrl['type']
+    ctrl_size_arr = ctrl.get('size')
+
+    if ctrl_type == 'string':
+        return 'std::string'
+    elif ctrl_size_arr is not None:
+        if len(ctrl_size_arr) > 0:
+            # fixed-sized Span
+            ctrl_span_size = reduce(operator.mul, ctrl_size_arr)
+            return f"Span<const {ctrl_type}, {ctrl_span_size}>"
+        else:
+            # variable-sized Span
+            return f"Span<const {ctrl_type}>"
+    else:
+        return ctrl_type
+
+
 def generate_cpp(controls):
     enum_doc_start_template = string.Template('''/**
  * \\enum ${name}Enum
@@ -50,11 +70,7 @@ ${description}
         name, ctrl = ctrl.popitem()
         id_name = snake_case(name).upper()
 
-        ctrl_type = ctrl['type']
-        if ctrl_type == 'string':
-            ctrl_type = 'std::string'
-        elif ctrl.get('size'):
-            ctrl_type = 'Span<const %s>' % ctrl_type
+        ctrl_type = get_ctrl_type(ctrl)
 
         info = {
             'name': name,
@@ -135,11 +151,7 @@ def generate_h(controls):
 
         ids.append('\t' + id_name + ' = ' + str(id_value) + ',')
 
-        ctrl_type = ctrl['type']
-        if ctrl_type == 'string':
-            ctrl_type = 'std::string'
-        elif ctrl.get('size'):
-            ctrl_type = 'Span<const %s>' % ctrl_type
+        ctrl_type = get_ctrl_type(ctrl)
 
         info = {
             'name': name,
-- 
cgit v1.2.1