{"id":2387,"url":"https://patchwork.libcamera.org/api/1.1/patches/2387/?format=json","web_url":"https://patchwork.libcamera.org/patch/2387/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20191204132106.21582-4-jacopo@jmondi.org>","date":"2019-12-04T13:20:59","name":"[libcamera-devel,03/10] libcamera: properties: Generate libcamera properties","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"e22c3fbfcc366e2f34b219e8c050a8383143b7ab","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2387/mbox/","series":[{"id":581,"url":"https://patchwork.libcamera.org/api/1.1/series/581/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=581","date":"2019-12-04T13:20:56","name":"Introduce camera properties","version":1,"mbox":"https://patchwork.libcamera.org/series/581/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2387/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2387/checks/","tags":{},"headers":{"Return-Path":"","Received":["from relay10.mail.gandi.net (relay10.mail.gandi.net\n\t[217.70.178.230])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 69E2261CC6\n\tfor ;\n\tWed, 4 Dec 2019 14:21:21 +0100 (CET)","from uno.lan (93-34-114-233.ip49.fastwebnet.it [93.34.114.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay10.mail.gandi.net (Postfix) with ESMTPSA id F3B4724000F;\n\tWed, 4 Dec 2019 13:21:20 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 4 Dec 2019 14:20:59 +0100","Message-Id":"<20191204132106.21582-4-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.23.0","In-Reply-To":"<20191204132106.21582-1-jacopo@jmondi.org>","References":"<20191204132106.21582-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 03/10] libcamera: properties: Generate\n\tlibcamera properties","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Wed, 04 Dec 2019 13:21:21 -0000"},"content":"Re-use the Control generation infrastructure to generate libcamera properties.\n\nIntroduce three additional files, one that enumerates the properties ids\n(include/libcamera/property_ids.h) and one the defines Control<> instances,\none for each property (src/libcamera/property_ids.cpp) and provide\nproperties definitions in src/libcamera/property_ids.yaml\n\nSigned-off-by: Jacopo Mondi \n---\n include/libcamera/meson.build | 9 ++++++\n include/libcamera/property_ids.h.in | 33 ++++++++++++++++++++++\n src/libcamera/meson.build | 6 ++++\n src/libcamera/property_ids.cpp.in | 43 +++++++++++++++++++++++++++++\n src/libcamera/property_ids.yaml | 34 +++++++++++++++++++++++\n 5 files changed, 125 insertions(+)\n create mode 100644 include/libcamera/property_ids.h.in\n create mode 100644 src/libcamera/property_ids.cpp.in\n create mode 100644 src/libcamera/property_ids.yaml","diff":"diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build\nindex 99abf0609940..0ec32ad84c96 100644\n--- a/include/libcamera/meson.build\n+++ b/include/libcamera/meson.build\n@@ -31,7 +31,16 @@ control_ids_h = custom_target('control_ids_h',\n install : true,\n install_dir : join_paths('include', include_dir))\n \n+property_ids_h = custom_target('property_ids_h',\n+ input : files('../../src/libcamera/property_ids.yaml', 'property_ids.h.in'),\n+ output : 'property_ids.h',\n+ depend_files : gen_controls,\n+ command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@'],\n+ install : true,\n+ install_dir : join_paths('include', include_dir))\n+\n libcamera_api += control_ids_h\n+libcamera_api += property_ids_h\n \n gen_header = files('gen-header.sh')\n \ndiff --git a/include/libcamera/property_ids.h.in b/include/libcamera/property_ids.h.in\nnew file mode 100644\nindex 000000000000..62799b3e8c54\n--- /dev/null\n+++ b/include/libcamera/property_ids.h.in\n@@ -0,0 +1,33 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2019, Google Inc.\n+ *\n+ * property_ids.h : Property ID list\n+ *\n+ * This file is auto-generated. Do not edit.\n+ */\n+\n+#ifndef __LIBCAMERA_PROPERTY_IDS_H__\n+#define __LIBCAMERA_PROPERTY_IDS_H__\n+\n+#include \n+\n+#include \n+\n+namespace libcamera {\n+\n+namespace properties {\n+\n+enum {\n+${ids}\n+};\n+\n+${controls}\n+\n+extern const ControlIdMap properties;\n+\n+} /* namespace propertiess */\n+\n+} /* namespace libcamera */\n+\n+#endif // __LIBCAMERA_PROPERTY_IDS_H__\ndiff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\nindex c4f965bd7413..abd7046bd95d 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -73,7 +73,13 @@ control_ids_cpp = custom_target('control_ids_cpp',\n depend_files : gen_controls,\n command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@'])\n \n+property_ids_cpp = custom_target('property_ids_cpp',\n+ input : files('property_ids.yaml', 'property_ids.cpp.in'),\n+ output : 'property_ids.cpp',\n+ depend_files : gen_controls,\n+ command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@'])\n libcamera_sources += control_ids_cpp\n+libcamera_sources += property_ids_cpp\n libcamera_sources += control_ids_h\n \n gen_version = join_paths(meson.source_root(), 'utils', 'gen-version.sh')\ndiff --git a/src/libcamera/property_ids.cpp.in b/src/libcamera/property_ids.cpp.in\nnew file mode 100644\nindex 000000000000..635a56f7d647\n--- /dev/null\n+++ b/src/libcamera/property_ids.cpp.in\n@@ -0,0 +1,43 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2019, Google Inc.\n+ *\n+ * property_ids.cpp : Property ID list\n+ *\n+ * This file is auto-generated. Do not edit.\n+ */\n+\n+#include \n+\n+/**\n+ * \\file property_ids.h\n+ * \\brief Camera property identifiers\n+ */\n+\n+namespace libcamera {\n+\n+/**\n+ * \\brief Namespace for libcamera controls\n+ */\n+namespace properties {\n+\n+${controls_doc}\n+\n+#ifndef __DOXYGEN__\n+/*\n+ * Keep the properties definitions hidden from doxygen as it incorrectly parses\n+ * them as functions.\n+ */\n+${controls_def}\n+#endif\n+\n+/**\n+ * \\brief List of all supported libcamera properties\n+ */\n+extern const ControlIdMap properties {\n+${controls_map}\n+};\n+\n+} /* namespace properties */\n+\n+} /* namespace libcamera */\ndiff --git a/src/libcamera/property_ids.yaml b/src/libcamera/property_ids.yaml\nnew file mode 100644\nindex 000000000000..61be2ab5298c\n--- /dev/null\n+++ b/src/libcamera/property_ids.yaml\n@@ -0,0 +1,34 @@\n+# SPDX-License-Identifier: LGPL-2.1-or-later\n+#\n+# Copyright (C) 2019, Google Inc.\n+#\n+%YAML 1.2\n+---\n+controls:\n+ - Location:\n+ type: int32_t\n+ description: |\n+ Camera mounting location\n+ values:\n+ - name: \"CAMERA_LOCATION_FRONT\"\n+ value: 0\n+ description: |\n+ The camera is mounted on the front side of the device, facing the\n+ user\n+ - name: \"CAMERA_LOCATION_BACK\"\n+ value: 1\n+ description: |\n+ The camera is mounted on the back facing side of the device\n+ - name: \"CAMERA_LOCATION_EXTERNAL\"\n+ value: 2\n+ description: |\n+ The camera is attached to the device in a way that allows it to\n+ move freely\n+\n+ - Rotation:\n+ type: int32_t\n+ description: |\n+ Camera mounting rotation expressed as counterclockwise rotation degrees\n+ towards the axis perpendicular to the sensor surface and directed away\n+ from it\n+...\n","prefixes":["libcamera-devel","03/10"]}