{"id":2626,"url":"https://patchwork.libcamera.org/api/1.1/patches/2626/?format=json","web_url":"https://patchwork.libcamera.org/patch/2626/","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":"<20200113164245.52535-12-jacopo@jmondi.org>","date":"2020-01-13T16:42:33","name":"[libcamera-devel,11/23] libcamera: controls: Add support for float controls","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"ea74a79acf0dabf4635b63a53f1e8cbc71b2bb22","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2626/mbox/","series":[{"id":618,"url":"https://patchwork.libcamera.org/api/1.1/series/618/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=618","date":"2020-01-13T16:42:22","name":"Properties and compound controls","version":1,"mbox":"https://patchwork.libcamera.org/series/618/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2626/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2626/checks/","tags":{},"headers":{"Return-Path":"","Received":["from relay11.mail.gandi.net (relay11.mail.gandi.net\n\t[217.70.178.231])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8440C606EA\n\tfor ;\n\tMon, 13 Jan 2020 17:40:33 +0100 (CET)","from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay11.mail.gandi.net (Postfix) with ESMTPSA id 224C110000E;\n\tMon, 13 Jan 2020 16:40:32 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 13 Jan 2020 17:42:33 +0100","Message-Id":"<20200113164245.52535-12-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.24.0","In-Reply-To":"<20200113164245.52535-1-jacopo@jmondi.org>","References":"<20200113164245.52535-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 11/23] libcamera: controls: Add support\n\tfor float 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":"Mon, 13 Jan 2020 16:40:33 -0000"},"content":"Add support for float values in Control<> and ControlValue classes.\n\nSigned-off-by: Jacopo Mondi \n---\n include/libcamera/controls.h | 3 +++\n src/libcamera/control_serializer.cpp | 13 ++++++++++\n src/libcamera/controls.cpp | 36 ++++++++++++++++++++++++++++\n 3 files changed, 52 insertions(+)","diff":"diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h\nindex 458b84e8fa8c..8fa33d93b088 100644\n--- a/include/libcamera/controls.h\n+++ b/include/libcamera/controls.h\n@@ -20,6 +20,7 @@ enum ControlType {\n \tControlTypeBool,\n \tControlTypeInteger32,\n \tControlTypeInteger64,\n+\tControlTypeFloat,\n };\n \n class ControlValue\n@@ -29,6 +30,7 @@ public:\n \tControlValue(bool value);\n \tControlValue(int32_t value);\n \tControlValue(int64_t value);\n+\tControlValue(float value);\n \n \tControlType type() const { return type_; }\n \tbool isNone() const { return type_ == ControlTypeNone; }\n@@ -53,6 +55,7 @@ private:\n \t\tbool bool_;\n \t\tint32_t integer32_;\n \t\tint64_t integer64_;\n+\t\tfloat float_;\n \t};\n };\n \ndiff --git a/src/libcamera/control_serializer.cpp b/src/libcamera/control_serializer.cpp\nindex a5d6d875c76f..fd91baf15156 100644\n--- a/src/libcamera/control_serializer.cpp\n+++ b/src/libcamera/control_serializer.cpp\n@@ -34,6 +34,7 @@ static constexpr size_t ControlValueSize[] = {\n \t[ControlTypeBool]\t= sizeof(bool),\n \t[ControlTypeInteger32]\t= sizeof(int32_t),\n \t[ControlTypeInteger64]\t= sizeof(int64_t),\n+\t[ControlTypeFloat]\t= sizeof(float),\n };\n \n } /* namespace */\n@@ -176,6 +177,12 @@ void ControlSerializer::store(const ControlValue &value,\n \t\tbreak;\n \t}\n \n+\tcase ControlTypeFloat: {\n+\t\tfloat data = value.get();\n+\t\tbuffer.write(&data);\n+\t\tbreak;\n+\t}\n+\n \tdefault:\n \t\tbreak;\n \t}\n@@ -348,6 +355,12 @@ ControlValue ControlSerializer::load(ControlType type,\n \t\treturn ControlValue(value);\n \t}\n \n+\tcase ControlTypeFloat: {\n+\t\tfloat value;\n+\t\tb.read(&value);\n+\t\treturn ControlValue(value);\n+\t}\n+\n \tdefault:\n \t\treturn ControlValue();\n \t}\ndiff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\nindex 123a6f19974a..74ce5d0ba4f1 100644\n--- a/src/libcamera/controls.cpp\n+++ b/src/libcamera/controls.cpp\n@@ -58,6 +58,8 @@ LOG_DEFINE_CATEGORY(Controls)\n * The control stores a 32-bit integer value\n * \\var ControlTypeInteger64\n * The control stores a 64-bit integer value\n+ * \\var ControlTypeFloat\n+ * The control stores a 32-bit floating point value\n */\n \n /**\n@@ -100,6 +102,15 @@ ControlValue::ControlValue(int64_t value)\n {\n }\n \n+/**\n+ * \\brief Construct a float ControlValue\n+ * \\param[in] value Float value to store\n+ */\n+ControlValue::ControlValue(float value)\n+\t: type_(ControlTypeFloat), float_(value)\n+{\n+}\n+\n /**\n * \\fn ControlValue::type()\n * \\brief Retrieve the data type of the value\n@@ -153,6 +164,14 @@ const int64_t &ControlValue::get() const\n \treturn integer64_;\n }\n \n+template<>\n+const float &ControlValue::get() const\n+{\n+\tASSERT(type_ == ControlTypeFloat);\n+\n+\treturn float_;\n+}\n+\n template<>\n void ControlValue::set(const bool &value)\n {\n@@ -173,6 +192,13 @@ void ControlValue::set(const int64_t &value)\n \ttype_ = ControlTypeInteger64;\n \tinteger64_ = value;\n }\n+\n+template<>\n+void ControlValue::set(const float &value)\n+{\n+\ttype_ = ControlTypeFloat;\n+\tfloat_ = value;\n+}\n #endif /* __DOXYGEN__ */\n \n /**\n@@ -190,6 +216,8 @@ std::string ControlValue::toString() const\n \t\treturn std::to_string(integer32_);\n \tcase ControlTypeInteger64:\n \t\treturn std::to_string(integer64_);\n+\tcase ControlTypeFloat:\n+\t\treturn std::to_string(float_);\n \t}\n \n \treturn \"\";\n@@ -211,6 +239,8 @@ bool ControlValue::operator==(const ControlValue &other) const\n \t\treturn integer32_ == other.integer32_;\n \tcase ControlTypeInteger64:\n \t\treturn integer64_ == other.integer64_;\n+\tcase ControlTypeFloat:\n+\t\treturn float_ == other.float_;\n \tdefault:\n \t\treturn false;\n \t}\n@@ -341,6 +371,12 @@ Control::Control(unsigned int id, const char *name)\n \t: ControlId(id, name, ControlTypeInteger64)\n {\n }\n+\n+template<>\n+Control::Control(unsigned int id, const char *name)\n+\t: ControlId(id, name, ControlTypeFloat)\n+{\n+}\n #endif /* __DOXYGEN__ */\n \n /**\n","prefixes":["libcamera-devel","11/23"]}