{"id":2005,"url":"https://patchwork.libcamera.org/api/1.1/patches/2005/?format=json","web_url":"https://patchwork.libcamera.org/patch/2005/","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-7-jacopo@jmondi.org>","date":"2019-09-24T17:24:48","name":"[libcamera-devel,06/21] libcamera: controls: Implement ControlInfoMap serialization","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"f2dee3489c1933448a8753f4fa95e827df07b08c","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/2005/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/2005/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2005/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 84DBE62378\n\tfor ;\n\tTue, 24 Sep 2019 19:23:32 +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 2E07460005\n\tfor ;\n\tTue, 24 Sep 2019 17:23:31 +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:48 +0200","Message-Id":"<20190924172503.30864-7-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 06/21] libcamera: controls: Implement\n\tControlInfoMap 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:32 -0000"},"content":"Make ControlInfoMap class implement the Serializable interface and\nimplement the serializable() and deserialize() operations that dumps all\ncontrol info to a memory blob and re-create a ControlInfoMap from a\nmemory buffer.\n\nSigned-off-by: Jacopo Mondi \n---\n include/libcamera/controls.h | 5 ++-\n src/libcamera/controls.cpp | 67 ++++++++++++++++++++++++++++++++++++\n 2 files changed, 71 insertions(+), 1 deletion(-)","diff":"diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h\nindex 79731c4932ae..a5b5f245ef60 100644\n--- a/include/libcamera/controls.h\n+++ b/include/libcamera/controls.h\n@@ -42,7 +42,7 @@ private:\n \tconst struct ControlMetadata *meta_;\n };\n \n-class ControlInfoMap\n+class ControlInfoMap : public Serializable\n {\n private:\n \tusing InfoMap = std::unordered_map;\n@@ -62,6 +62,9 @@ public:\n \tvoid emplace(const ControlId id, const DataValue &min,\n \t\t const DataValue &max);\n \n+\tstd::unique_ptr serialize() const override;\n+\tint deserialize(uint8_t *data, size_t len) override;\n+\n private:\n \tInfoMap map_;\n };\ndiff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\nindex ec7ac7ba9ed6..4d51efd53fab 100644\n--- a/src/libcamera/controls.cpp\n+++ b/src/libcamera/controls.cpp\n@@ -239,6 +239,73 @@ void ControlInfoMap::emplace(const ControlId id, const DataValue &min,\n \t\t std::forward_as_tuple(id, min, max));\n }\n \n+/**\n+ * \\brief Serialize a ControlInfoMap to a memory buffer\n+ *\n+ * Serialize the control info map 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+ * info map\n+ */\n+std::unique_ptr ControlInfoMap::serialize() const\n+{\n+\tunsigned int bufferSize = 0;\n+\tfor (auto it : map_)\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 : map_)\n+\t\tb += Serializer::serialize(it.first, it.second, b);\n+\n+\treturn blob;\n+}\n+\n+/**\n+ * \\brief De-serialize a ControlInfoMap 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 info map from a memory buffer. The\n+ * memory buffer is expected to having been serialized from the\n+ * ControlInfoMap::serialize() operation.\n+ *\n+ * \\sa Serializer::deserializeInfo()\n+ *\n+ * \\return 0 on success, a negative error code otherwise\n+ */\n+int ControlInfoMap::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\tDataInfo info;\n+\t\tsize_t size;\n+\t\tstd::tie(id, info, size) = Serializer::deserializeInfo(b);\n+\n+\t\tControlId cId = static_cast(id);\n+\t\tmap_.emplace(std::piecewise_construct,\n+\t\t\t std::forward_as_tuple(cId),\n+\t\t\t std::forward_as_tuple(cId, info.min(), info.max()));\n+\n+\t\tdataSize += size;\n+\t\tb += size;\n+\t}\n+\n+\treturn 0;\n+}\n+\n /**\n * \\typedef ControlValue\n * \\brief A control value stored in the ControlList class\n","prefixes":["libcamera-devel","06/21"]}