Patch Detail
Show a patch.
GET /api/1.1/patches/2012/?format=api
{ "id": 2012, "url": "https://patchwork.libcamera.org/api/1.1/patches/2012/?format=api", "web_url": "https://patchwork.libcamera.org/patch/2012/", "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-14-jacopo@jmondi.org>", "date": "2019-09-24T17:24:55", "name": "[libcamera-devel,13/21] test: serialization: Add control info serialization test", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "49cf3cf9e4bf8a0e8f73f06cb85f25e762305b4b", "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/2012/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/2012/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/2012/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 0170162378\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 24 Sep 2019 19:23:37 +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 5A31560006\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 24 Sep 2019 17:23:36 +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:55 +0200", "Message-Id": "<20190924172503.30864-14-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 13/21] test: serialization: Add control\n\tinfo serialization test", "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:37 -0000" }, "content": "Test the serialization procedure of a ControlInfoMap by manually\nunwrapping a serialized data blob containing control info and validate\nthem against the sensor subdevice reported ones.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n test/serialization/control_info_list.cpp | 122 ++++++++++++++++++++++\n test/serialization/meson.build | 1 +\n test/serialization/serialization_test.cpp | 103 ++++++++++++++++++\n test/serialization/serialization_test.h | 21 ++++\n 4 files changed, 247 insertions(+)\n create mode 100644 test/serialization/control_info_list.cpp", "diff": "diff --git a/test/serialization/control_info_list.cpp b/test/serialization/control_info_list.cpp\nnew file mode 100644\nindex 000000000000..270f84cf7422\n--- /dev/null\n+++ b/test/serialization/control_info_list.cpp\n@@ -0,0 +1,122 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2019, Google Inc.\n+ *\n+ * control_info.cpp - Serialize and de-serialize a list of control info\n+ */\n+\n+#include <iostream>\n+\n+#include <libcamera/camera.h>\n+#include <libcamera/camera_manager.h>\n+#include <libcamera/controls.h>\n+\n+#include \"device_enumerator.h\"\n+#include \"media_device.h\"\n+#include \"serializer.h\"\n+#include \"test.h\"\n+#include \"v4l2_subdevice.h\"\n+\n+#include \"serialization_test.h\"\n+\n+using namespace std;\n+using namespace libcamera;\n+\n+class ControlInfoListSerializeTest : public SerializationTest\n+{\n+public:\n+\tControlInfoListSerializeTest()\n+\t\t: SerializationTest()\n+\t{\n+\t}\n+\n+private:\n+\tvoid initValidationMatrix()\n+\t{\n+\t\tconst V4L2ControlInfoMap &controls = sensor_->controls();\n+\n+\t\tunsigned int i = 0;\n+\t\tfor (const auto &ctrl : controls) {\n+\t\t\tunsigned int v4l2Id = ctrl.first;\n+\t\t\tconst V4L2ControlInfo &info = ctrl.second;\n+\t\t\tControlId id;\n+\n+\t\t\tswitch (v4l2Id) {\n+\t\t\tcase V4L2_CID_BRIGHTNESS:\n+\t\t\t\tid = Brightness;\n+\t\t\t\tbreak;\n+\t\t\tcase V4L2_CID_CONTRAST:\n+\t\t\t\tid = Contrast;\n+\t\t\t\tbreak;\n+\t\t\tcase V4L2_CID_SATURATION:\n+\t\t\t\tid = Saturation;\n+\t\t\t\tbreak;\n+\t\t\tdefault:\n+\t\t\t\tcontinue;\n+\t\t\t}\n+\n+\t\t\tinfoValidationMatrix[i][INFO_CTRL_ID] = id;\n+\t\t\t/* \\todo Assume all controls have integers values. */\n+\t\t\tinfoValidationMatrix[i][INFO_CTRL_MIN] = info.min().getInt();\n+\t\t\tinfoValidationMatrix[i][INFO_CTRL_MAX] = info.max().getInt();\n+\t\t\tinfoValidationMatrix[i][INFO_CTRL_FLAG] = 0;\n+\n+\t\t\tnumCtrls_++;\n+\t\t\ti++;\n+\t\t}\n+\t}\n+\n+\tint init()\n+\t{\n+\t\tint ret = SerializationTest::init();\n+\t\tif (ret != TestPass)\n+\t\t\treturn ret;\n+\n+\t\tret = initSubdevice();\n+\t\tif (ret < 0)\n+\t\t\treturn ret;\n+\n+\t\tinitValidationMatrix();\n+\n+\t\treturn TestPass;\n+\t}\n+\n+\tint run()\n+\t{\n+\t\tconst ControlInfoMap &controls = camera_->controls();\n+\n+\t\tstd::unique_ptr<DataBlob> blob = controls.serialize();\n+\t\tif (!blob) {\n+\t\t\tcerr << \"Failed to serialize the control info\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tint ret = validateInfoBlobSize(blob.get());\n+\t\tif (ret != TestPass)\n+\t\t\treturn ret;\n+\n+\t\t/* Validate each serialized info data. */\n+\t\tuint8_t *b = blob->data();\n+\t\tfor (unsigned int i = 0; i < numCtrls_; ++i) {\n+\t\t\tif (!validateInfoBlob(b))\n+\t\t\t\treturn TestFail;\n+\n+\t\t\tb += INFO_BLOB_SIZE;\n+\t\t}\n+\n+\t\t/* De-serialize a control info list and re-validate it. */\n+\t\tControlInfoMap newInfoMap;\n+\t\tnewInfoMap.deserialize(blob->data(), blob->size());\n+\t\tfor (auto it : newInfoMap) {\n+\t\t\tControlId id = it.first;\n+\t\t\tControlInfo &info = it.second;\n+\n+\t\t\tif (!validateInfoValue(id, info))\n+\t\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\treturn TestPass;\n+\t}\n+};\n+\n+TEST_REGISTER(ControlInfoListSerializeTest)\ndiff --git a/test/serialization/meson.build b/test/serialization/meson.build\nindex 511f05cbbd1f..510bd8c30d38 100644\n--- a/test/serialization/meson.build\n+++ b/test/serialization/meson.build\n@@ -1,5 +1,6 @@\n serialization_tests = [\n [ 'control_list', 'control_list.cpp' ],\n+ [ 'control_info_list', 'control_info_list.cpp' ],\n ]\n \n foreach t : serialization_tests\ndiff --git a/test/serialization/serialization_test.cpp b/test/serialization/serialization_test.cpp\nindex 8db70bb1de02..f0a9427d7b79 100644\n--- a/test/serialization/serialization_test.cpp\n+++ b/test/serialization/serialization_test.cpp\n@@ -187,3 +187,106 @@ bool SerializationTest::validateDataValue(unsigned int id, const DataValue &data\n \n \treturn true;\n }\n+\n+int SerializationTest::validateInfoBlobSize(DataBlob *blob)\n+{\n+\tsize_t blobSize = blob->size();\n+\tif (blobSize % Serializer::BLOB_ALIGN_BYTES) {\n+\t\tcerr << \"Serialized control info has incorrect alignement\"\n+\t\t << endl;\n+\t\treturn TestFail;\n+\t}\n+\n+\tsize_t expectedSize = INFO_BLOB_SIZE * numCtrls_;\n+\tif (blobSize != expectedSize) {\n+\t\tcerr << \"Serialized info list has incorrect size: \"\n+\t\t << \" expected size \" << expectedSize\n+\t\t << \" got \" << blobSize << endl;\n+\t\treturn TestFail;\n+\t}\n+\n+\treturn TestPass;\n+}\n+\n+bool SerializationTest::validateInfoBlob(uint8_t *info)\n+{\n+\tuint32_t id = *(reinterpret_cast<uint32_t *>(info));\n+\tuint32_t size = *(reinterpret_cast<uint32_t *>(Serializer::INFO_BLOB_SIZE(info)));\n+\n+\t/* Manually access min and max assuming they're 32-bits integers. */\n+\tuint32_t min = *(reinterpret_cast<uint32_t *>(info + 16));\n+\tuint32_t max = *(reinterpret_cast<uint32_t *>(info + 24));\n+\tbool found = false;\n+\n+\tcout << \"Testing serialized info: \" << id << \" - \"\n+\t << size << \" - \" << min << \" - \" << max << endl;\n+\n+\tfor (unsigned int i = 0; i < numCtrls_; ++i) {\n+\t\tif (infoValidationMatrix[i][INFO_CTRL_ID] != id)\n+\t\t\tcontinue;\n+\n+\t\tfound = true;\n+\n+\t\tunsigned int *entry = infoValidationMatrix[i];\n+\t\tif (entry[INFO_CTRL_FLAG]) {\n+\t\t\tcerr << \"The info with id \" << id\n+\t\t\t << \" has been serialized twice\" << endl;\n+\t\t\treturn false;\n+\t\t}\n+\t\tentry[INFO_CTRL_FLAG] = true;\n+\n+\t\tif (entry[INFO_CTRL_MIN] != min ||\n+\t\t entry[INFO_CTRL_MAX] != max ||\n+\t\t size != INFO_BLOB_DATA_SIZE) {\n+\t\t\tcerr << \"The info with id \" << id\n+\t\t\t << \" has been wrongly serialized\" << endl;\n+\t\t\treturn false;\n+\t\t}\n+\t}\n+\n+\tif (!found) {\n+\t\tcerr << \"Non-existing info with id \" << id << endl;\n+\t\treturn false;\n+\t}\n+\n+\tcout << \"Serialization of info: \" << id << \" = Success.\"\n+\t << endl;\n+\n+\treturn true;\n+}\n+\n+bool SerializationTest::validateInfoValue(unsigned int id,\n+\t\t\t\t\t const DataInfo &info)\n+{\n+\tbool found = false;\n+\tuint32_t min = info.min().getInt();\n+\tuint32_t max = info.max().getInt();\n+\n+\tcout << \"Testing de-serialized info: \" << id\n+\t << \" - \" << min << \" - \" << max << endl;\n+\n+\tfor (unsigned int i = 0; i < numCtrls_; ++i) {\n+\t\tif (infoValidationMatrix[i][INFO_CTRL_ID] != id)\n+\t\t\tcontinue;\n+\n+\t\tfound = true;\n+\n+\t\tunsigned int *controlValidation = infoValidationMatrix[i];\n+\t\tif (controlValidation[INFO_CTRL_MIN] != min ||\n+\t\t controlValidation[INFO_CTRL_MAX] != max) {\n+\t\t\tcerr << \"The info with id \" << id\n+\t\t\t << \" has been wrongly serialized\" << endl;\n+\t\t\treturn false;\n+\t\t}\n+\t}\n+\n+\tif (!found) {\n+\t\tcerr << \"Non-existing info with id \" << id << endl;\n+\t\treturn false;\n+\t}\n+\n+\tcout << \"De-serialization of info: \" << id << \" = Success.\"\n+\t << endl;\n+\n+\treturn true;\n+}\ndiff --git a/test/serialization/serialization_test.h b/test/serialization/serialization_test.h\nindex 87dc5a84a505..7085f79ac0a7 100644\n--- a/test/serialization/serialization_test.h\n+++ b/test/serialization/serialization_test.h\n@@ -45,6 +45,23 @@ protected:\n \tstatic constexpr unsigned int VALUE_BLOB_DATA_SIZE\t= 8;\n \tstatic constexpr unsigned int VALUE_BLOB_SIZE\t\t= 24;\n \n+\t/* Info validation matrix */\n+\tunsigned int infoValidationMatrix[CTRL_MAX][4];\n+\n+\t/* Indices on the info validation matrix fields. */\n+\tstatic constexpr unsigned int INFO_CTRL_ID\t\t= 0;\n+\tstatic constexpr unsigned int INFO_CTRL_MIN\t\t= 1;\n+\tstatic constexpr unsigned int INFO_CTRL_MAX\t\t= 2;\n+\tstatic constexpr unsigned int INFO_CTRL_FLAG\t\t= 3;\n+\n+\t/*\n+\t * Serialized info sizes.\n+\t * \\todo Assume a serialized info is 32 bytes in total (header +\n+\t * DataInfo), as values are simple integers.\n+\t */\n+\tstatic constexpr unsigned int INFO_BLOB_DATA_SIZE\t= 16;\n+\tstatic constexpr unsigned int INFO_BLOB_SIZE\t\t= 32;\n+\n \tint init();\n \tvoid cleanup();\n \n@@ -54,6 +71,10 @@ protected:\n \tbool validateValueBlob(uint8_t *dataBlob);\n \tbool validateDataValue(unsigned int id, const DataValue &dataValue);\n \n+\tint validateInfoBlobSize(DataBlob *blob);\n+\tbool validateInfoBlob(uint8_t *infoBlob);\n+\tbool validateInfoValue(unsigned int id, const DataInfo &dataInfo);\n+\n \tstd::unique_ptr<DeviceEnumerator> enumerator_;\n \tstd::shared_ptr<MediaDevice> media_;\n \tstd::shared_ptr<Camera> camera_;\n", "prefixes": [ "libcamera-devel", "13/21" ] }