From d711a4c015e74c7a77cfeba17b621909385f4494 Mon Sep 17 00:00:00 2001
From: Yudhistira Erlandinata <yerlandinata@chromium.org>
Date: Tue, 29 Oct 2024 16:07:13 +0000
Subject: libcamera: Extend u16 control type

V4L2 Controls support a wide variety of types not yet supported by the
ControlValue type system.

Extend the libcamera ControlValue types to support an explicit 16 bit
unsigned integer type, and map that to the corresponding
V4L2_CTRL_TYPE_U16 type within the v4l2_device support class.

It's used on some camera metadata that is of length 16-bits,
for example JPEG metadata headers.

Signed-off-by: Yudhistira Erlandinata <yerlandinata@chromium.org>
Co-developed-by: Harvey Yang <chenghaoyang@chromium.org>
Signed-off-by: Harvey Yang <chenghaoyang@chromium.org>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 test/controls/control_value.cpp | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

(limited to 'test/controls')

diff --git a/test/controls/control_value.cpp b/test/controls/control_value.cpp
index 6ca85b73..5084fd0c 100644
--- a/test/controls/control_value.cpp
+++ b/test/controls/control_value.cpp
@@ -109,6 +109,46 @@ protected:
 			return TestFail;
 		}
 
+		/*
+		 * Unsigned Integer16 type.
+		 */
+		value.set(static_cast<uint16_t>(42));
+		if (value.isNone() || value.isArray() ||
+		    value.type() != ControlTypeUnsigned16) {
+			cerr << "Control type mismatch after setting to uint16_t" << endl;
+			return TestFail;
+		}
+
+		if (value.get<uint16_t>() != 42) {
+			cerr << "Control value mismatch after setting to uint16_t" << endl;
+			return TestFail;
+		}
+
+		if (value.toString() != "42") {
+			cerr << "Control string mismatch after setting to uint16_t" << endl;
+			return TestFail;
+		}
+
+		std::array<uint16_t, 4> uint16s{ 3, 14, 15, 9 };
+		value.set(Span<uint16_t>(uint16s));
+		if (value.isNone() || !value.isArray() ||
+		    value.type() != ControlTypeUnsigned16) {
+			cerr << "Control type mismatch after setting to uint16_t array" << endl;
+			return TestFail;
+		}
+
+		Span<const uint16_t> uint16sResult = value.get<Span<const uint16_t>>();
+		if (uint16s.size() != uint16sResult.size() ||
+		    !std::equal(uint16s.begin(), uint16s.end(), uint16sResult.begin())) {
+			cerr << "Control value mismatch after setting to uint16_t array" << endl;
+			return TestFail;
+		}
+
+		if (value.toString() != "[ 3, 14, 15, 9 ]") {
+			cerr << "Control string mismatch after setting to uint16_t array" << endl;
+			return TestFail;
+		}
+
 		/*
 		 * Unsigned Integer32 type.
 		 */
-- 
cgit v1.2.1