{"id":2053,"url":"https://patchwork.libcamera.org/api/1.1/patches/2053/?format=json","web_url":"https://patchwork.libcamera.org/patch/2053/","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":"<20190928152238.23752-12-laurent.pinchart@ideasonboard.com>","date":"2019-09-28T15:22:37","name":"[libcamera-devel,11/12] libcamera: Add ControlValidator implementation for Camera","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"a798379a0baefd571e2eab7c668f1b96ba1f2df5","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2053/mbox/","series":[{"id":511,"url":"https://patchwork.libcamera.org/api/1.1/series/511/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=511","date":"2019-09-28T15:22:26","name":"Improve the application-facing controls API","version":1,"mbox":"https://patchwork.libcamera.org/series/511/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2053/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2053/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6093061963\n\tfor ;\n\tSat, 28 Sep 2019 17:23:01 +0200 (CEST)","from pendragon.bb.dnainternet.fi\n\t(dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8CBD953B\n\tfor ;\n\tSat, 28 Sep 2019 17:23:00 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1569684181;\n\tbh=w+rCLkiaZMZDH71TSLHGF738ZtzSAtj7/ZQBZzyYqEQ=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=JfOO3RQOgCTEuaQrXGqkp9NltEoCUguLbGq6Ge2V7u5tXB8/Gw+PQqZQC6AlzG8XM\n\tv+EKsfMwrXmggTPO9YHOUNpyGoro8XaFY4GSEbpqjUAp7e/45MWKSfsG/Jk6CJ5Opx\n\tAqUtDNX5kcnRS2z3qC0b9X2osBqjS2Q8E4N6ftFY=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 28 Sep 2019 18:22:37 +0300","Message-Id":"<20190928152238.23752-12-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.21.0","In-Reply-To":"<20190928152238.23752-1-laurent.pinchart@ideasonboard.com>","References":"<20190928152238.23752-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 11/12] libcamera: Add ControlValidator\n\timplementation for Camera","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":"Sat, 28 Sep 2019 15:23:02 -0000"},"content":"Add a new CameraControlValidator class that implements the\nControlValidator interface for a Camera object.\n\nSigned-off-by: Laurent Pinchart \n---\n src/libcamera/camera_controls.cpp | 53 +++++++++++++++++++++++++\n src/libcamera/include/camera_controls.h | 30 ++++++++++++++\n src/libcamera/include/meson.build | 1 +\n src/libcamera/meson.build | 1 +\n 4 files changed, 85 insertions(+)\n create mode 100644 src/libcamera/camera_controls.cpp\n create mode 100644 src/libcamera/include/camera_controls.h","diff":"diff --git a/src/libcamera/camera_controls.cpp b/src/libcamera/camera_controls.cpp\nnew file mode 100644\nindex 000000000000..341da56019f7\n--- /dev/null\n+++ b/src/libcamera/camera_controls.cpp\n@@ -0,0 +1,53 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2019, Google Inc.\n+ *\n+ * camera_controls.cpp - Camera controls\n+ */\n+\n+#include \"camera_controls.h\"\n+\n+#include \n+#include \n+\n+/**\n+ * \\file camera_controls.h\n+ * \\brief Controls for Camera instances\n+ */\n+\n+namespace libcamera {\n+\n+/**\n+ * \\class CameraControlValidator\n+ * \\brief A control validator for Camera instances\n+ *\n+ * This ControlValidator specialisation validates that controls exist in the\n+ * Camera associated with the validator.\n+ */\n+\n+/**\n+ * \\brief Construst a CameraControlValidator for the \\a camera\n+ * \\param[in] camera The camera\n+ */\n+CameraControlValidator::CameraControlValidator(Camera *camera)\n+\t: camera_(camera)\n+{\n+}\n+\n+const std::string &CameraControlValidator::name() const\n+{\n+\treturn camera_->name();\n+}\n+\n+/**\n+ * \\brief Validate a control\n+ * \\param[in] id The control ID\n+ * \\return True if the control is valid, false otherwise\n+ */\n+bool CameraControlValidator::validate(const ControlId &id) const\n+{\n+\tconst ControlInfoMap &controls = camera_->controls();\n+\treturn controls.find(&id) != controls.end();\n+}\n+\n+} /* namespace libcamera */\ndiff --git a/src/libcamera/include/camera_controls.h b/src/libcamera/include/camera_controls.h\nnew file mode 100644\nindex 000000000000..998a2d155a44\n--- /dev/null\n+++ b/src/libcamera/include/camera_controls.h\n@@ -0,0 +1,30 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2019, Google Inc.\n+ *\n+ * camera_controls.h - Camera controls\n+ */\n+#ifndef __LIBCAMERA_CAMERA_CONTROLS_H__\n+#define __LIBCAMERA_CAMERA_CONTROLS_H__\n+\n+#include \"control_validator.h\"\n+\n+namespace libcamera {\n+\n+class Camera;\n+\n+class CameraControlValidator final : public ControlValidator\n+{\n+public:\n+\tCameraControlValidator(Camera *camera);\n+\n+\tconst std::string &name() const override;\n+\tbool validate(const ControlId &id) const override;\n+\n+private:\n+\tCamera *camera_;\n+};\n+\n+} /* namespace libcamera */\n+\n+#endif /* __LIBCAMERA_CAMERA_CONTROLS_H__ */\ndiff --git a/src/libcamera/include/meson.build b/src/libcamera/include/meson.build\nindex 1cf47204f2b5..2c74d29bd925 100644\n--- a/src/libcamera/include/meson.build\n+++ b/src/libcamera/include/meson.build\n@@ -1,4 +1,5 @@\n libcamera_headers = files([\n+ 'camera_controls.h',\n 'camera_sensor.h',\n 'control_validator.h',\n 'device_enumerator.h',\ndiff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\nindex 984cb9985f49..fbfa11d469e4 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -2,6 +2,7 @@ libcamera_sources = files([\n 'bound_method.cpp',\n 'buffer.cpp',\n 'camera.cpp',\n+ 'camera_controls.cpp',\n 'camera_manager.cpp',\n 'camera_sensor.cpp',\n 'controls.cpp',\n","prefixes":["libcamera-devel","11/12"]}