Patch Detail
Show a patch.
GET /api/1.1/patches/2009/?format=api
{ "id": 2009, "url": "https://patchwork.libcamera.org/api/1.1/patches/2009/?format=api", "web_url": "https://patchwork.libcamera.org/patch/2009/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "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-11-jacopo@jmondi.org>", "date": "2019-09-24T17:24:52", "name": "[libcamera-devel,10/21] libcamera: v4l2_controls: Implement V4L2ControlInfoMap serialization", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "b83ac2f0db6e837c0acaaa6837725d72151c7752", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/1.1/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/2009/mbox/", "series": [ { "id": 506, "url": "https://patchwork.libcamera.org/api/1.1/series/506/?format=api", "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/2009/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/2009/checks/", "tags": {}, "headers": { "Return-Path": "<jacopo@jmondi.org>", "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 CE04262387\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 24 Sep 2019 19:23:34 +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 7610D60005\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 24 Sep 2019 17:23:34 +0000 (UTC)" ], "X-Originating-IP": "213.45.248.89", "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 24 Sep 2019 19:24:52 +0200", "Message-Id": "<20190924172503.30864-11-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 10/21] libcamera: v4l2_controls: Implement\n\tV4L2ControlInfoMap serialization", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "X-List-Received-Date": "Tue, 24 Sep 2019 17:23:35 -0000" }, "content": "Make V4L2ControlInfoMap implement the serializable interface and\nimplement the serialization and deserialization operations.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/libcamera/include/v4l2_controls.h | 5 +-\n src/libcamera/v4l2_controls.cpp | 66 +++++++++++++++++++++++++++\n 2 files changed, 70 insertions(+), 1 deletion(-)", "diff": "diff --git a/src/libcamera/include/v4l2_controls.h b/src/libcamera/include/v4l2_controls.h\nindex 5b583b9dfda6..3694bb888f2a 100644\n--- a/src/libcamera/include/v4l2_controls.h\n+++ b/src/libcamera/include/v4l2_controls.h\n@@ -33,7 +33,7 @@ private:\n \tunsigned int id_;\n };\n \n-class V4L2ControlInfoMap\n+class V4L2ControlInfoMap : public Serializable\n {\n private:\n \tusing InfoMap = std::map<unsigned int, V4L2ControlInfo>;\n@@ -52,6 +52,9 @@ public:\n \n \tvoid emplace(unsigned int id, const struct v4l2_query_ext_ctrl &ctrl);\n \n+\tstd::unique_ptr<DataBlob> 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/v4l2_controls.cpp b/src/libcamera/v4l2_controls.cpp\nindex c046f88bc7d3..5e1db79e1b96 100644\n--- a/src/libcamera/v4l2_controls.cpp\n+++ b/src/libcamera/v4l2_controls.cpp\n@@ -167,6 +167,72 @@ void V4L2ControlInfoMap::emplace(unsigned int id,\n \t\t std::forward_as_tuple(ctrl));\n }\n \n+/**\n+ * \\brief Serialize a V4L2ControlInfoMap to a memory buffer\n+ *\n+ * Serialize the v4l2 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<DataBlob> V4L2ControlInfoMap::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<DataBlob> 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 V4L2ControlInfoMap 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+ * V4L2ControlInfoMap::serialize() operation.\n+ *\n+ * \\sa Serializer::deserializeInfo()\n+ *\n+ * \\return 0 on success, a negative error code otherwise\n+ */\n+int V4L2ControlInfoMap::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\tmap_.emplace(std::piecewise_construct,\n+\t\t\t std::forward_as_tuple(id),\n+\t\t\t std::forward_as_tuple(id, info.min(), info.max()));\n+\n+\t\tdataSize += size;\n+\t\tb += size;\n+\t}\n+\n+\treturn 0;\n+}\n+\n /**\n * \\class V4L2Control\n * \\brief A V4L2 control value\n", "prefixes": [ "libcamera-devel", "10/21" ] }