{"id":2992,"url":"https://patchwork.libcamera.org/api/1.1/patches/2992/?format=json","web_url":"https://patchwork.libcamera.org/patch/2992/","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":"<20200306160002.30549-21-laurent.pinchart@ideasonboard.com>","date":"2020-03-06T15:59:50","name":"[libcamera-devel,v2,20/32] libcamera: controls: Add support for byte controls","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"ef526be30005ef49d46c0b477e38ac07c92d9215","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/2992/mbox/","series":[{"id":703,"url":"https://patchwork.libcamera.org/api/1.1/series/703/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=703","date":"2020-03-06T15:59:30","name":"libcamera: Add support for array controls","version":2,"mbox":"https://patchwork.libcamera.org/series/703/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2992/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2992/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 9C7C4628EB\n\tfor ;\n\tFri, 6 Mar 2020 17:00:23 +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 36EFA312;\n\tFri, 6 Mar 2020 17:00:23 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1583510423;\n\tbh=3Qe0zeavKfJ3kqqGx0bBLZZl6OnW0KiJm9k1mN6Gd3Q=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=BL3chhN+4z18osz2qR1ZWNk7f8DyaPqWwjny+UGJwnj/l0wGD4zjb5nWXmaiNtp+Z\n\tlHl3T1vI9osS/waMRn29YWm7xq0sxk/NaQFXFx6CTL2yuHzPcp4Av96VZHBS8hkaRB\n\tJ9+a9bwLYPePxq4z5ljBPRBnRa9KLCuv9j0Tzi5U=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 6 Mar 2020 17:59:50 +0200","Message-Id":"<20200306160002.30549-21-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.24.1","In-Reply-To":"<20200306160002.30549-1-laurent.pinchart@ideasonboard.com>","References":"<20200306160002.30549-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 20/32] libcamera: controls: Add support\n\tfor byte 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":"Fri, 06 Mar 2020 16:00:24 -0000"},"content":"From: Jacopo Mondi \n\nAdd support for byte values to the control framework and to the control\nserializer.\n\nSigned-off-by: Jacopo Mondi \nSigned-off-by: Laurent Pinchart \nReviewed-by: Kieran Bingham \n---\nChanges since v1:\n\n- Renamed Integer8 to Byte\n- Turned the underlying type to uint8_t\n---\n include/libcamera/controls.h | 6 ++++++\n src/libcamera/control_serializer.cpp | 12 ++++++++++++\n src/libcamera/controls.cpp | 14 +++++++++++---\n 3 files changed, 29 insertions(+), 3 deletions(-)","diff":"diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h\nindex 0ad442b9e192..4767e2d3fc8c 100644\n--- a/include/libcamera/controls.h\n+++ b/include/libcamera/controls.h\n@@ -22,6 +22,7 @@ class ControlValidator;\n enum ControlType {\n \tControlTypeNone,\n \tControlTypeBool,\n+\tControlTypeByte,\n \tControlTypeInteger32,\n \tControlTypeInteger64,\n \tControlTypeFloat,\n@@ -43,6 +44,11 @@ struct control_type {\n \tstatic constexpr ControlType value = ControlTypeBool;\n };\n \n+template<>\n+struct control_type {\n+\tstatic constexpr ControlType value = ControlTypeByte;\n+};\n+\n template<>\n struct control_type {\n \tstatic constexpr ControlType value = ControlTypeInteger32;\ndiff --git a/src/libcamera/control_serializer.cpp b/src/libcamera/control_serializer.cpp\nindex 5feaaa965cc5..6c676811ebf3 100644\n--- a/src/libcamera/control_serializer.cpp\n+++ b/src/libcamera/control_serializer.cpp\n@@ -153,6 +153,12 @@ void ControlSerializer::store(const ControlValue &value,\n \t\tbreak;\n \t}\n \n+\tcase ControlTypeByte: {\n+\t\tuint8_t data = value.get();\n+\t\tbuffer.write(&data);\n+\t\tbreak;\n+\t}\n+\n \tcase ControlTypeInteger32: {\n \t\tint32_t data = value.get();\n \t\tbuffer.write(&data);\n@@ -331,6 +337,12 @@ ControlValue ControlSerializer::load(ControlType type,\n \t\treturn ControlValue(value);\n \t}\n \n+\tcase ControlTypeByte: {\n+\t\tuint8_t value;\n+\t\tb.read(&value);\n+\t\treturn ControlValue(value);\n+\t}\n+\n \tcase ControlTypeInteger32: {\n \t\tint32_t value;\n \t\tb.read(&value);\ndiff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\nindex d095efd45b91..0663a2201609 100644\n--- a/src/libcamera/controls.cpp\n+++ b/src/libcamera/controls.cpp\n@@ -53,6 +53,7 @@ namespace {\n static constexpr size_t ControlValueSize[] = {\n \t[ControlTypeNone]\t\t= 0,\n \t[ControlTypeBool]\t\t= sizeof(bool),\n+\t[ControlTypeByte]\t\t= sizeof(uint8_t),\n \t[ControlTypeInteger32]\t\t= sizeof(int32_t),\n \t[ControlTypeInteger64]\t\t= sizeof(int64_t),\n \t[ControlTypeFloat]\t\t= sizeof(float),\n@@ -67,6 +68,8 @@ static constexpr size_t ControlValueSize[] = {\n * Invalid type, for empty values\n * \\var ControlTypeBool\n * The control stores a boolean value\n+ * \\var ControlTypeByte\n+ * The control stores a byte value as an unsigned 8-bit integer\n * \\var ControlTypeInteger32\n * The control stores a 32-bit integer value\n * \\var ControlTypeInteger64\n@@ -198,6 +201,11 @@ std::string ControlValue::toString() const\n \t\t\tstr += *value ? \"True\" : \"False\";\n \t\t\tbreak;\n \t\t}\n+\t\tcase ControlTypeByte: {\n+\t\t\tconst uint8_t *value = reinterpret_cast(data);\n+\t\t\tstr += std::to_string(*value);\n+\t\t\tbreak;\n+\t\t}\n \t\tcase ControlTypeInteger32: {\n \t\t\tconst int32_t *value = reinterpret_cast(data);\n \t\t\tstr += std::to_string(*value);\n@@ -382,9 +390,9 @@ void ControlValue::set(ControlType type, bool isArray, const void *data,\n * instead of Control.\n *\n * Controls of any type can be defined through template specialisation, but\n- * libcamera only supports the bool, int32_t, int64_t and float types natively\n- * (this includes types that are equivalent to the supported types, such as int\n- * and long int).\n+ * libcamera only supports the bool, uint8_t, int32_t, int64_t and float types\n+ * natively (this includes types that are equivalent to the supported types,\n+ * such as int and long int).\n *\n * Controls IDs shall be unique. While nothing prevents multiple instances of\n * the Control class to be created with the same ID for the same object, doing\n","prefixes":["libcamera-devel","v2","20/32"]}