{"id":2947,"url":"https://patchwork.libcamera.org/api/patches/2947/?format=json","web_url":"https://patchwork.libcamera.org/patch/2947/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20200229164254.23604-30-laurent.pinchart@ideasonboard.com>","date":"2020-02-29T16:42:52","name":"[libcamera-devel,29/31] DNI: test array controls","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"fce247d16acd88ba8bfe536f630f4bf03473dd5e","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2947/mbox/","series":[{"id":696,"url":"https://patchwork.libcamera.org/api/series/696/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=696","date":"2020-02-29T16:42:23","name":"libcamera: Add support for array controls","version":1,"mbox":"https://patchwork.libcamera.org/series/696/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2947/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2947/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 A73DD627AB\n\tfor ;\n\tSat, 29 Feb 2020 17:43:32 +0100 (CET)","from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 38742A28;\n\tSat, 29 Feb 2020 17:43:32 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1582994612;\n\tbh=0dCmsokvOcYVUCdhUmP3Cy39eRfW/7lNRK5xMNbW5WI=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=bufR7iu9YzbfkIPUlFim0BBc+VIdptVZ9o0guabSFkzrIaxfCuPOrBMQVzyIoAe3z\n\t27UxqzZUXaRDNsfaLfT2/rBD3KrmXRCoIAkHKQdVXhlcvvJmbnVc7gTXcLCAo9gBqB\n\tu1YqMsDx15C2Z4GzWdC9xm+7VKZBhGhU39UM/N00=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 29 Feb 2020 18:42:52 +0200","Message-Id":"<20200229164254.23604-30-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.24.1","In-Reply-To":"<20200229164254.23604-1-laurent.pinchart@ideasonboard.com>","References":"<20200229164254.23604-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 29/31] DNI: test array controls","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, 29 Feb 2020 16:43:36 -0000"},"content":"From: Jacopo Mondi \n\nDefine a fictional array control and register it in the VIMC\npipeline handler. Add a test to exercise it.\n\nDo not include, just a proof of concept. The test could be included once\nwe'll have real array controls defined.\n\nSigned-off-by: Laurent Pinchart \nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/control_ids.yaml | 5 ++\n src/libcamera/pipeline/vimc.cpp | 5 ++\n test/controls/array_controls.cpp | 107 +++++++++++++++++++++++++++++++\n test/controls/meson.build | 1 +\n 4 files changed, 118 insertions(+)\n create mode 100644 test/controls/array_controls.cpp","diff":"diff --git a/src/libcamera/control_ids.yaml b/src/libcamera/control_ids.yaml\nindex 4befec746a59..14adb0dc78e8 100644\n--- a/src/libcamera/control_ids.yaml\n+++ b/src/libcamera/control_ids.yaml\n@@ -50,4 +50,9 @@ controls:\n type: int32_t\n description: Specify a fixed gain parameter\n \n+ - BayerGains:\n+ type: float\n+ description: Gains to apply to the four Bayer colour components for white balance\n+ size: [4]\n+\n ...\ndiff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\nindex 5d3d12fef30b..3fa4d222e06e 100644\n--- a/src/libcamera/pipeline/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc.cpp\n@@ -451,6 +451,11 @@ int VimcCameraData::init(MediaDevice *media)\n \t\tctrls.emplace(id, range);\n \t}\n \n+\t/* Register a compound control. */\n+\tctrls.emplace(std::piecewise_construct,\n+\t\t std::forward_as_tuple(&controls::BayerGains),\n+\t\t std::forward_as_tuple(0.5f, 4.0f));\n+\n \tcontrolInfo_ = std::move(ctrls);\n \n \t/* Initialize the camera properties. */\ndiff --git a/test/controls/array_controls.cpp b/test/controls/array_controls.cpp\nnew file mode 100644\nindex 000000000000..b75219d82c37\n--- /dev/null\n+++ b/test/controls/array_controls.cpp\n@@ -0,0 +1,107 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2019, Google Inc.\n+ *\n+ * array_controls.cpp - Array controls test\n+ */\n+\n+#include \n+#include \n+#include \n+\n+#include \n+#include \n+#include \n+#include \n+#include \n+\n+#include \"camera_controls.h\"\n+\n+#include \"camera_test.h\"\n+#include \"test.h\"\n+\n+using namespace std;\n+using namespace libcamera;\n+\n+class ArrayControlsTest : public CameraTest, public Test\n+{\n+public:\n+\tArrayControlsTest()\n+\t\t: CameraTest(\"VIMC Sensor B\")\n+\t{\n+\t}\n+\n+protected:\n+\tint init() override\n+\t{\n+\t\treturn status_;\n+\t}\n+\n+\ttemplate\n+\tint compareValues(const Span &span, const R &value)\n+\t{\n+\t\tif (value.size() != span.size()) {\n+\t\t\tcerr << \"set(\" << typeid(T).name() << \") and get() dimension mismatch\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tfor (unsigned int i = 0; i < value.size(); ++i) {\n+\t\t\tif (value[i] != span[i]) {\n+\t\t\t\tcerr << \"set(\" << typeid(T).name() << \") and get() value mismatch\" << endl;\n+\t\t\t\treturn TestFail;\n+\t\t\t}\n+\t\t}\n+\n+\t\treturn TestPass;\n+\t}\n+\n+\tint run() override\n+\t{\n+\t\tCameraControlValidator validator(camera_.get());\n+\t\tControlList list(controls::controls, &validator);\n+\n+\t\t/*\n+\t\t * Test array control get and set. set() is tested using\n+\t\t * std::initializer_list, std::array, std::vector, and Span()\n+\t\t * constructed from both an array and a vector as from a plain\n+\t\t * C array. Const and non-const versions are compile-tested.\n+\t\t */\n+\t\tconstexpr float const_array[4] = { 1.1, 1.0, 1.2, 0.9 };\n+\t\tfloat array[4] = { 1.1, 1.0, 1.2, 0.9 };\n+\n+\t\tlist.set(controls::BayerGains, { 1.1f, 1.0f, 1.2f, 0.9f });\n+\t\tlist.set(controls::BayerGains, Span(const_array));\n+\t\tlist.set(controls::BayerGains, Span(array));\n+\t\tlist.set(controls::BayerGains, const_array);\n+\t\tlist.set(controls::BayerGains, array);\n+\n+\t\tif (compareValues(list.get(controls::BayerGains), Span(array)) == TestFail)\n+\t\t\treturn TestFail;\n+\n+\t\tconstexpr std::array const_std_array{ 1.3, 0.9, 1.5, 0.8 };\n+\t\tstd::array std_array{ 1.3, 0.9, 1.5, 0.8 };\n+\n+\t\tlist.set(controls::BayerGains, Span(const_std_array));\n+\t\tlist.set(controls::BayerGains, Span(std_array));\n+\t\tlist.set(controls::BayerGains, const_std_array);\n+\t\tlist.set(controls::BayerGains, std_array);\n+\n+\t\tif (compareValues(list.get(controls::BayerGains), std_array) == TestFail)\n+\t\t\treturn TestFail;\n+\n+\t\tconst std::vector const_vector{ 1.0, 1.0, 1.0, 1.0 };\n+\t\tstd::vector vector{ 1.0, 1.0, 1.0, 1.0 };\n+\n+\t\tlist.set(controls::BayerGains, Span(const_vector));\n+\t\tlist.set(controls::BayerGains, Span(vector));\n+\t\tlist.set(controls::BayerGains, const_vector);\n+\t\tlist.set(controls::BayerGains, vector);\n+\n+\t\tif (compareValues(list.get(controls::BayerGains), const_vector) == TestFail)\n+\t\t\treturn TestFail;\n+\n+\t\treturn TestPass;\n+\t}\n+};\n+\n+TEST_REGISTER(ArrayControlsTest)\ndiff --git a/test/controls/meson.build b/test/controls/meson.build\nindex f0850df28c8a..9d9b6ed1d666 100644\n--- a/test/controls/meson.build\n+++ b/test/controls/meson.build\n@@ -1,4 +1,5 @@\n control_tests = [\n+ [ 'array_controls', 'array_controls.cpp'],\n [ 'control_info', 'control_info.cpp' ],\n [ 'control_list', 'control_list.cpp' ],\n [ 'control_range', 'control_range.cpp' ],\n","prefixes":["libcamera-devel","29/31"]}