summaryrefslogtreecommitdiff
path: root/src
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 /src
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 'src')
-rw-r--r--src/libcamera/meson.build21
-rw-r--r--src/libcamera/property_ids.cpp.in43
-rw-r--r--src/libcamera/property_ids.yaml28
3 files changed, 84 insertions, 8 deletions
diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
index 68d89559..1e5b54b3 100644
--- a/src/libcamera/meson.build
+++ b/src/libcamera/meson.build
@@ -69,14 +69,19 @@ endif
gen_controls = files('gen-controls.py')
-control_ids_cpp = custom_target('control_ids_cpp',
- input : files('control_ids.yaml', 'control_ids.cpp.in'),
- output : 'control_ids.cpp',
- depend_files : gen_controls,
- command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@'])
-
-libcamera_sources += control_ids_cpp
-libcamera_sources += control_ids_h
+control_sources = []
+
+foreach source : control_source_files
+ input_files = files(source +'.yaml', source + '.cpp.in')
+ control_sources += custom_target(source + '_cpp',
+ input : input_files,
+ output : source + '.cpp',
+ depend_files : gen_controls,
+ command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@'])
+endforeach
+
+libcamera_sources += control_headers
+libcamera_sources += control_sources
gen_version = join_paths(meson.source_root(), 'utils', 'gen-version.sh')
diff --git a/src/libcamera/property_ids.cpp.in b/src/libcamera/property_ids.cpp.in
new file mode 100644
index 00000000..bfdd823f
--- /dev/null
+++ b/src/libcamera/property_ids.cpp.in
@@ -0,0 +1,43 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2019, Google Inc.
+ *
+ * property_ids.cpp : Property ID list
+ *
+ * This file is auto-generated. Do not edit.
+ */
+
+#include <libcamera/property_ids.h>
+
+/**
+ * \file property_ids.h
+ * \brief Camera property identifiers
+ */
+
+namespace libcamera {
+
+/**
+ * \brief Namespace for libcamera properties
+ */
+namespace properties {
+
+${controls_doc}
+
+#ifndef __DOXYGEN__
+/*
+ * Keep the properties definitions hidden from doxygen as it incorrectly parses
+ * them as functions.
+ */
+${controls_def}
+#endif
+
+/**
+ * \brief List of all supported libcamera properties
+ */
+extern const ControlIdMap properties {
+${controls_map}
+};
+
+} /* namespace properties */
+
+} /* namespace libcamera */
diff --git a/src/libcamera/property_ids.yaml b/src/libcamera/property_ids.yaml
new file mode 100644
index 00000000..625161d9
--- /dev/null
+++ b/src/libcamera/property_ids.yaml
@@ -0,0 +1,28 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# Copyright (C) 2019, Google Inc.
+#
+%YAML 1.2
+---
+controls:
+ - Location:
+ type: int32_t
+ description: |
+ Camera mounting location
+ enum:
+ - name: CameraLocationFront
+ value: 0
+ description: |
+ The camera is mounted on the front side of the device, facing the
+ user
+ - name: CameraLocationBack
+ value: 1
+ description: |
+ The camera is mounted on the back side of the device, facing away
+ from the user
+ - name: CameraLocationExternal
+ value: 2
+ description: |
+ The camera is attached to the device in a way that allows it to
+ be moved freely
+...