From e5a9e6e9cd3e12efe9ce078171fbe67d7d41a771 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sun, 1 Mar 2020 22:02:37 +0200 Subject: libcamera: controls: Rename ControlRange to ControlInfo To prepare for storage of additional information in the ControlRange structure, rename it to ControlInfo. Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- test/controls/control_info.cpp | 51 +++++++++++++++++++++++++++++++ test/controls/control_range.cpp | 51 ------------------------------- test/controls/meson.build | 2 +- test/serialization/serialization_test.cpp | 4 +-- test/v4l2_videodevice/controls.cpp | 6 ++-- 5 files changed, 57 insertions(+), 57 deletions(-) create mode 100644 test/controls/control_info.cpp delete mode 100644 test/controls/control_range.cpp (limited to 'test') diff --git a/test/controls/control_info.cpp b/test/controls/control_info.cpp new file mode 100644 index 00000000..1e05e131 --- /dev/null +++ b/test/controls/control_info.cpp @@ -0,0 +1,51 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * control_info.cpp - ControlInfo tests + */ + +#include + +#include +#include + +#include "test.h" + +using namespace std; +using namespace libcamera; + +class ControlInfoTest : public Test +{ +protected: + int run() + { + /* + * Test information retrieval from a range with no minimum and + * maximum. + */ + ControlInfo brightness; + + if (brightness.min().get() != 0 || + brightness.max().get() != 0) { + cout << "Invalid control range for Brightness" << endl; + return TestFail; + } + + /* + * Test information retrieval from a control with a minimum and + * a maximum value. + */ + ControlInfo contrast(10, 200); + + if (contrast.min().get() != 10 || + contrast.max().get() != 200) { + cout << "Invalid control range for Contrast" << endl; + return TestFail; + } + + return TestPass; + } +}; + +TEST_REGISTER(ControlInfoTest) diff --git a/test/controls/control_range.cpp b/test/controls/control_range.cpp deleted file mode 100644 index 06ec3506..00000000 --- a/test/controls/control_range.cpp +++ /dev/null @@ -1,51 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * control_range.cpp - ControlRange tests - */ - -#include - -#include -#include - -#include "test.h" - -using namespace std; -using namespace libcamera; - -class ControlRangeTest : public Test -{ -protected: - int run() - { - /* - * Test information retrieval from a range with no minimum and - * maximum. - */ - ControlRange brightness; - - if (brightness.min().get() != 0 || - brightness.max().get() != 0) { - cout << "Invalid control range for Brightness" << endl; - return TestFail; - } - - /* - * Test information retrieval from a control with a minimum and - * a maximum value. - */ - ControlRange contrast(10, 200); - - if (contrast.min().get() != 10 || - contrast.max().get() != 200) { - cout << "Invalid control range for Contrast" << endl; - return TestFail; - } - - return TestPass; - } -}; - -TEST_REGISTER(ControlRangeTest) diff --git a/test/controls/meson.build b/test/controls/meson.build index 16a7f33f..7fff2413 100644 --- a/test/controls/meson.build +++ b/test/controls/meson.build @@ -1,7 +1,7 @@ control_tests = [ + [ 'control_info', 'control_info.cpp' ], [ 'control_info_map', 'control_info_map.cpp' ], [ 'control_list', 'control_list.cpp' ], - [ 'control_range', 'control_range.cpp' ], [ 'control_value', 'control_value.cpp' ], ] diff --git a/test/serialization/serialization_test.cpp b/test/serialization/serialization_test.cpp index 68e0512a..11d0f0f3 100644 --- a/test/serialization/serialization_test.cpp +++ b/test/serialization/serialization_test.cpp @@ -22,7 +22,7 @@ using namespace libcamera; bool SerializationTest::equals(const ControlInfoMap &lhs, const ControlInfoMap &rhs) { - std::map rlhs; + std::map rlhs; std::transform(lhs.begin(), lhs.end(), std::inserter(rlhs, rlhs.end()), [](const ControlInfoMap::value_type &v) -> decltype(rlhs)::value_type @@ -30,7 +30,7 @@ bool SerializationTest::equals(const ControlInfoMap &lhs, const ControlInfoMap & return { v.first->id(), v.second }; }); - std::map rrhs; + std::map rrhs; std::transform(rhs.begin(), rhs.end(), std::inserter(rrhs, rrhs.end()), [](const ControlInfoMap::value_type &v) -> decltype(rrhs)::value_type diff --git a/test/v4l2_videodevice/controls.cpp b/test/v4l2_videodevice/controls.cpp index 1b71bf06..478de370 100644 --- a/test/v4l2_videodevice/controls.cpp +++ b/test/v4l2_videodevice/controls.cpp @@ -41,9 +41,9 @@ protected: return TestFail; } - const ControlRange &brightness = infoMap.find(V4L2_CID_BRIGHTNESS)->second; - const ControlRange &contrast = infoMap.find(V4L2_CID_CONTRAST)->second; - const ControlRange &saturation = infoMap.find(V4L2_CID_SATURATION)->second; + const ControlInfo &brightness = infoMap.find(V4L2_CID_BRIGHTNESS)->second; + const ControlInfo &contrast = infoMap.find(V4L2_CID_CONTRAST)->second; + const ControlInfo &saturation = infoMap.find(V4L2_CID_SATURATION)->second; /* Test getting controls. */ ControlList ctrls(infoMap); -- cgit v1.2.1