summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKieran Bingham <kieran.bingham@ideasonboard.com>2020-10-07 19:57:18 +0100
committerJacopo Mondi <jacopo@jmondi.org>2020-10-26 17:51:54 +0100
commit89916a486cbdf352ba55bbe595942f2a3f9a1349 (patch)
tree7c3db889b06530048d034ad9c5c38f75bd4b2328
parent581bb274956fcf7e781384342e88cd8fa35b1336 (diff)
libcamera: Support draft controls and properties
Extend the control and property framework to support exposing draft controls and properties in a scoped namespace. The controls/properties themselves will retain the same ordering in the relevant enum/id maps - but the access to any draft control will require explicitly referencing through its' draft:: namespace prefix. Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com> [Added missing hunk in control_ids.cpp.in and changed subject] Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
-rw-r--r--include/libcamera/control_ids.h.in6
-rw-r--r--include/libcamera/property_ids.h.in6
-rw-r--r--src/libcamera/control_ids.cpp.in15
-rw-r--r--src/libcamera/property_ids.cpp.in15
-rwxr-xr-xutils/gen-controls.py39
5 files changed, 73 insertions, 8 deletions
diff --git a/include/libcamera/control_ids.h.in b/include/libcamera/control_ids.h.in
index 95a7a7f1..baadca83 100644
--- a/include/libcamera/control_ids.h.in
+++ b/include/libcamera/control_ids.h.in
@@ -26,6 +26,12 @@ ${controls}
extern const ControlIdMap controls;
+namespace draft {
+
+${draft_controls}
+
+} /* namespace draft */
+
} /* namespace controls */
} /* namespace libcamera */
diff --git a/include/libcamera/property_ids.h.in b/include/libcamera/property_ids.h.in
index e4dea335..52646c1f 100644
--- a/include/libcamera/property_ids.h.in
+++ b/include/libcamera/property_ids.h.in
@@ -24,6 +24,12 @@ ${ids}
${controls}
+namespace draft {
+
+${draft_controls}
+
+} /* namespace draft */
+
extern const ControlIdMap properties;
} /* namespace properties */
diff --git a/src/libcamera/control_ids.cpp.in b/src/libcamera/control_ids.cpp.in
index cba6258d..056645cf 100644
--- a/src/libcamera/control_ids.cpp.in
+++ b/src/libcamera/control_ids.cpp.in
@@ -23,12 +23,27 @@ namespace controls {
${controls_doc}
+/**
+ * \brief Namespace for libcamera draft controls
+ */
+namespace draft {
+
+${draft_controls_doc}
+
+} /* namespace draft */
+
#ifndef __DOXYGEN__
/*
* Keep the controls definitions hidden from doxygen as it incorrectly parses
* them as functions.
*/
${controls_def}
+
+namespace draft {
+
+${draft_controls_def}
+
+} /* namespace draft */
#endif
/**
diff --git a/src/libcamera/property_ids.cpp.in b/src/libcamera/property_ids.cpp.in
index bfdd823f..f917e334 100644
--- a/src/libcamera/property_ids.cpp.in
+++ b/src/libcamera/property_ids.cpp.in
@@ -23,12 +23,27 @@ namespace properties {
${controls_doc}
+/**
+ * \brief Namespace for libcamera draft properties
+ */
+namespace draft {
+
+${draft_controls_doc}
+
+} /* namespace draft */
+
#ifndef __DOXYGEN__
/*
* Keep the properties definitions hidden from doxygen as it incorrectly parses
* them as functions.
*/
${controls_def}
+
+namespace draft {
+
+${draft_controls_def}
+
+} /* namespace draft */
#endif
/**
diff --git a/utils/gen-controls.py b/utils/gen-controls.py
index 87c3d52a..93cb3885 100755
--- a/utils/gen-controls.py
+++ b/utils/gen-controls.py
@@ -36,6 +36,8 @@ ${description}
ctrls_doc = []
ctrls_def = []
+ draft_ctrls_doc = []
+ draft_ctrls_def = []
ctrls_map = []
for ctrl in controls:
@@ -55,6 +57,12 @@ ${description}
'id_name': id_name,
}
+ target_doc = ctrls_doc
+ target_def = ctrls_def
+ if ctrl.get('draft'):
+ target_doc = draft_ctrls_doc
+ target_def = draft_ctrls_def
+
enum = ctrl.get('enum')
if enum:
enum_doc = []
@@ -70,15 +78,21 @@ ${description}
enum_doc = '\n *\n'.join(enum_doc)
enum_doc += '\n */'
- ctrls_doc.append(enum_doc)
+ target_doc.append(enum_doc)
+
+ target_doc.append(doc_template.substitute(info))
+ target_def.append(def_template.substitute(info))
+
+ if ctrl.get('draft'):
+ name = 'draft::' + name
- ctrls_doc.append(doc_template.substitute(info))
- ctrls_def.append(def_template.substitute(info))
ctrls_map.append('\t{ ' + id_name + ', &' + name + ' },')
return {
'controls_doc': '\n\n'.join(ctrls_doc),
'controls_def': '\n'.join(ctrls_def),
+ 'draft_controls_doc': '\n\n'.join(draft_ctrls_doc),
+ 'draft_controls_def': '\n\n'.join(draft_ctrls_def),
'controls_map': '\n'.join(ctrls_map),
}
@@ -89,6 +103,7 @@ def generate_h(controls):
template = string.Template('''extern const Control<${type}> ${name};''')
ctrls = []
+ draft_ctrls = []
ids = []
id_value = 1
@@ -109,22 +124,30 @@ def generate_h(controls):
'type': ctrl_type,
}
+ target_ctrls = ctrls
+ if ctrl.get('draft'):
+ target_ctrls = draft_ctrls
+
enum = ctrl.get('enum')
if enum:
- ctrls.append(enum_template_start.substitute(info))
+ target_ctrls.append(enum_template_start.substitute(info))
for entry in enum:
value_info = {
'name': entry['name'],
'value': entry['value'],
}
- ctrls.append(enum_value_template.substitute(value_info))
- ctrls.append("};")
+ target_ctrls.append(enum_value_template.substitute(value_info))
+ target_ctrls.append("};")
- ctrls.append(template.substitute(info))
+ target_ctrls.append(template.substitute(info))
id_value += 1
- return {'ids': '\n'.join(ids), 'controls': '\n'.join(ctrls)}
+ return {
+ 'ids': '\n'.join(ids),
+ 'controls': '\n'.join(ctrls),
+ 'draft_controls': '\n'.join(draft_ctrls)
+ }
def fill_template(template, data):