summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJacopo Mondi <jacopo@jmondi.org>2019-11-18 03:27:45 +0100
committerJacopo Mondi <jacopo@jmondi.org>2020-02-14 16:27:42 +0100
commitf870591a9bf5390e817fe15b55544695ec1b6300 (patch)
tree48cb75fc554d09b9eea1ba763878207f82dcebec /include
parentc9104548afd9c9f3f1f43937cc18ad2d7e3095da (diff)
libcamera: properties: Add location property
Re-use the Control generation infrastructure to generate libcamera properties and define the first 'Location' property. Introduce three additional files: - include/libcamera/property_ids.h Defines the properties ids - src/libcamera/property_ids.cpp Defines the properties Control<> instances - src/libcamera/property_ids.yaml Provide the first 'Location' property definition. Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'include')
-rw-r--r--include/libcamera/meson.build26
-rw-r--r--include/libcamera/property_ids.h.in33
2 files changed, 50 insertions, 9 deletions
diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build
index 8db217bb..f58c02d2 100644
--- a/include/libcamera/meson.build
+++ b/include/libcamera/meson.build
@@ -25,15 +25,23 @@ install_headers(libcamera_api,
gen_controls = files('../../src/libcamera/gen-controls.py')
-control_ids_h = custom_target('control_ids_h',
- input : files('../../src/libcamera/control_ids.yaml', 'control_ids.h.in'),
- output : 'control_ids.h',
- depend_files : gen_controls,
- command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@'],
- install : true,
- install_dir : join_paths('include', include_dir))
-
-libcamera_api += control_ids_h
+control_source_files = [
+ 'control_ids',
+ 'property_ids',
+]
+
+control_headers = []
+
+foreach header : control_source_files
+ input_files = files('../../src/libcamera/' + header +'.yaml', header + '.h.in')
+ control_headers += custom_target(header + '_h',
+ input : input_files,
+ output : header + '.h',
+ depend_files : gen_controls,
+ command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@'],
+ install : true,
+ install_dir : join_paths('include', include_dir))
+endforeach
gen_header = files('gen-header.sh')
diff --git a/include/libcamera/property_ids.h.in b/include/libcamera/property_ids.h.in
new file mode 100644
index 00000000..62799b3e
--- /dev/null
+++ b/include/libcamera/property_ids.h.in
@@ -0,0 +1,33 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2019, Google Inc.
+ *
+ * property_ids.h : Property ID list
+ *
+ * This file is auto-generated. Do not edit.
+ */
+
+#ifndef __LIBCAMERA_PROPERTY_IDS_H__
+#define __LIBCAMERA_PROPERTY_IDS_H__
+
+#include <stdint.h>
+
+#include <libcamera/controls.h>
+
+namespace libcamera {
+
+namespace properties {
+
+enum {
+${ids}
+};
+
+${controls}
+
+extern const ControlIdMap properties;
+
+} /* namespace propertiess */
+
+} /* namespace libcamera */
+
+#endif // __LIBCAMERA_PROPERTY_IDS_H__