{"id":2003,"url":"https://patchwork.libcamera.org/api/1.1/patches/2003/?format=json","web_url":"https://patchwork.libcamera.org/patch/2003/","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":"<20190924172503.30864-5-jacopo@jmondi.org>","date":"2019-09-24T17:24:46","name":"[libcamera-devel,04/21] libcamera: controls: Implement ControlList serialization","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"cd36e9cbfa696d27e37fed58165cbd8473c9135d","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/2003/mbox/","series":[{"id":506,"url":"https://patchwork.libcamera.org/api/1.1/series/506/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=506","date":"2019-09-24T17:24:42","name":"Implement control serialization","version":1,"mbox":"https://patchwork.libcamera.org/series/506/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2003/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2003/checks/","tags":{},"headers":{"Return-Path":"","Received":["from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net\n\t[217.70.183.195])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3C2ED62381\n\tfor ;\n\tTue, 24 Sep 2019 19:23:31 +0200 (CEST)","from uno.homenet.telecomitalia.it\n\t(host89-248-dynamic.45-213-r.retail.telecomitalia.it [213.45.248.89])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay3-d.mail.gandi.net (Postfix) with ESMTPSA id CA7786000A\n\tfor ;\n\tTue, 24 Sep 2019 17:23:30 +0000 (UTC)"],"X-Originating-IP":"213.45.248.89","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 24 Sep 2019 19:24:46 +0200","Message-Id":"<20190924172503.30864-5-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.23.0","In-Reply-To":"<20190924172503.30864-1-jacopo@jmondi.org>","References":"<20190924172503.30864-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 04/21] libcamera: controls: Implement\n\tControlList serialization","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":"Tue, 24 Sep 2019 17:23:31 -0000"},"content":"Make the ControlList class implement the Serializable interface and\nimplement the serialize() and deserialize() operations to dumps all\ncontrol values registered in the list to a memory blob and to re-create\na ControlList from a memory buffer.\n\nSigned-off-by: Jacopo Mondi \n---\n include/libcamera/controls.h | 7 +++-\n src/libcamera/controls.cpp | 73 ++++++++++++++++++++++++++++++++++++\n 2 files changed, 79 insertions(+), 1 deletion(-)","diff":"diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h\nindex c299ed94d9e2..8a7ddc510497 100644\n--- a/include/libcamera/controls.h\n+++ b/include/libcamera/controls.h\n@@ -15,6 +15,8 @@\n #include \n #include \n \n+#include \n+\n namespace libcamera {\n \n class Camera;\n@@ -44,7 +46,7 @@ using ControlInfoMap = std::unordered_map;\n \n using ControlValue = DataValue;\n \n-class ControlList\n+class ControlList : public Serializable\n {\n private:\n \tusing ControlMap = std::unordered_map;\n@@ -71,6 +73,9 @@ public:\n \n \tbool merge(const ControlList &list);\n \n+\tstd::unique_ptr serialize() const override;\n+\tint deserialize(uint8_t *data, size_t len) override;\n+\n private:\n \tconst ControlInfoMap &infoMap_;\n \tControlMap controls_;\ndiff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\nindex 65001259a3df..ee19eb6dc014 100644\n--- a/src/libcamera/controls.cpp\n+++ b/src/libcamera/controls.cpp\n@@ -10,6 +10,7 @@\n #include \n \n #include \"log.h\"\n+#include \"serializer.h\"\n #include \"utils.h\"\n \n /**\n@@ -398,4 +399,76 @@ bool ControlList::merge(const ControlList &other)\n \treturn true;\n }\n \n+/**\n+ * \\brief Serialize a ControlList to a memory buffer\n+ *\n+ * Serialize the control list to a DataBlob and return the ownership\n+ * of the blob to the caller.\n+ *\n+ * The memory format used to serialize each control to memory is defined by\n+ * the Serializer helper class.\n+ *\n+ * \\sa Serializer::serialize()\n+ *\n+ * \\return A unique pointer to a DataBlob containing the serialized control\n+ * list\n+ */\n+std::unique_ptr ControlList::serialize() const\n+{\n+\tunsigned int bufferSize = 0;\n+\tfor (auto it : controls_)\n+\t\tbufferSize += Serializer::size(it.second);\n+\n+\tstd::unique_ptr blob(new DataBlob(bufferSize));\n+\tif (!blob->valid())\n+\t\treturn nullptr;\n+\n+\tuint8_t *b = blob->data();\n+\tfor (auto it : controls_)\n+\t\tb += Serializer::serialize(it.first->id(), it.second, b);\n+\n+\treturn blob;\n+}\n+\n+/**\n+ * \\brief De-serialize a ControlList from a memory buffer\n+ * \\param[in] data The memory buffer containing serialized control info data\n+ * \\param[in] len The memory buffer length in bytes\n+ *\n+ * De-serialize the content of the control list from a memory buffer. The memory\n+ * buffer is expected to having been serialized from the\n+ * ControlList::serialize() operation.\n+ *\n+ * \\sa Serializer::deserializeData()\n+ *\n+ * \\return 0 on success, a negative error code otherwise\n+ */\n+int ControlList::deserialize(uint8_t *data, size_t len)\n+{\n+\tuint8_t *b = data;\n+\tsize_t dataSize = 0;\n+\n+\twhile (dataSize < len) {\n+\t\tunsigned int id;\n+\t\tDataValue value;\n+\t\tsize_t size;\n+\t\tstd::tie(id, value, size) = Serializer::deserializeValue(b);\n+\n+\t\tconst auto info = infoMap_.find(static_cast(id));\n+\t\tif (info == infoMap_.end()) {\n+\t\t\tLOG(Controls, Error)\n+\t\t\t\t<< \"Control id \" << id << \"not supported: \"\n+\t\t\t\t<< \"Abort deserialization\";\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tcontrols_[&info->second] = value;\n+\n+\t\tdataSize += size;\n+\t\tb += size;\n+\t}\n+\n+\treturn 0;\n+}\n+\n } /* namespace libcamera */\n","prefixes":["libcamera-devel","04/21"]}