Patch Detail
Show a patch.
GET /api/1.1/patches/2011/?format=api
{ "id": 2011, "url": "https://patchwork.libcamera.org/api/1.1/patches/2011/?format=api", "web_url": "https://patchwork.libcamera.org/patch/2011/", "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-13-jacopo@jmondi.org>", "date": "2019-09-24T17:24:54", "name": "[libcamera-devel,12/21] test: serialization: Add control serialization test", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "49f318bcda66d7a083fdb62905f0bac27caa6540", "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/2011/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/2011/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/2011/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 2EB6662378\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 24 Sep 2019 19:23:36 +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 77B0D60006\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 24 Sep 2019 17:23:35 +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:54 +0200", "Message-Id": "<20190924172503.30864-13-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 12/21] test: serialization: Add control\n\tserialization 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:36 -0000" }, "content": "Test the serialization procedure of a ControlList by manually\nunwrapping a serialized data blob containing controls supported by\nthe VIMC camera and verify its content.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n test/meson.build | 1 +\n test/serialization/control_list.cpp | 101 ++++++++++++\n test/serialization/meson.build | 11 ++\n test/serialization/serialization_test.cpp | 189 ++++++++++++++++++++++\n test/serialization/serialization_test.h | 65 ++++++++\n 5 files changed, 367 insertions(+)\n create mode 100644 test/serialization/control_list.cpp\n create mode 100644 test/serialization/meson.build\n create mode 100644 test/serialization/serialization_test.cpp\n create mode 100644 test/serialization/serialization_test.h", "diff": "diff --git a/test/meson.build b/test/meson.build\nindex 19e3031244a3..6d43273ca112 100644\n--- a/test/meson.build\n+++ b/test/meson.build\n@@ -8,6 +8,7 @@ subdir('log')\n subdir('media_device')\n subdir('pipeline')\n subdir('process')\n+subdir('serialization')\n subdir('stream')\n subdir('v4l2_subdevice')\n subdir('v4l2_videodevice')\ndiff --git a/test/serialization/control_list.cpp b/test/serialization/control_list.cpp\nnew file mode 100644\nindex 000000000000..2cefec0cdc00\n--- /dev/null\n+++ b/test/serialization/control_list.cpp\n@@ -0,0 +1,101 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2019, Google Inc.\n+ *\n+ * control_list.cpp - Serialize and de-serialize a list of controls\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 \"serialization_test.h\"\n+#include \"serializer.h\"\n+#include \"test.h\"\n+\n+using namespace std;\n+using namespace libcamera;\n+\n+class ControlListSerializeTest : public SerializationTest\n+{\n+private:\n+\tvoid initializeValidationMatrix()\n+\t{\n+\t\tvalueValidationMatrix[0][0] = Saturation;\n+\t\tvalueValidationMatrix[0][1] = DataTypeInteger;\n+\t\tvalueValidationMatrix[0][2] = 8;\n+\t\tvalueValidationMatrix[0][3] = 50;\n+\t\tvalueValidationMatrix[0][4] = false;\n+\t\tvalueValidationMatrix[1][0] = Contrast;\n+\t\tvalueValidationMatrix[1][1] = DataTypeInteger;\n+\t\tvalueValidationMatrix[1][2] = 8;\n+\t\tvalueValidationMatrix[1][3] = 128;\n+\t\tvalueValidationMatrix[1][4] = false;\n+\t\tvalueValidationMatrix[2][0] = Brightness;\n+\t\tvalueValidationMatrix[2][1] = DataTypeInteger;\n+\t\tvalueValidationMatrix[2][2] = 8;\n+\t\tvalueValidationMatrix[2][3] = 255;\n+\t\tvalueValidationMatrix[2][4] = false;\n+\n+\t\tnumCtrls_ = 3;\n+\t}\n+\n+\tint init()\n+\t{\n+\t\treturn SerializationTest::init();\n+\t}\n+\n+\tint run()\n+\t{\n+\t\tControlList list(camera_->controls());\n+\n+\t\t/*\n+\t\t * Set a 3 controls and manually unroll the serialized\n+\t\t * buffer to verify its content.\n+\t\t *\n+\t\t * \\todo Test less trivial control types once we have them.\n+\t\t */\n+\t\tlist[Brightness] = 255;\n+\t\tlist[Contrast] = 128;\n+\t\tlist[Saturation] = 50;\n+\n+\t\tinitializeValidationMatrix();\n+\n+\t\t/* Serialize and verify the produced blob size. */\n+\t\tstd::unique_ptr<DataBlob> blob = list.serialize();\n+\t\tif (!blob) {\n+\t\t\tcerr << \"Failed to serialize the control list\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tint ret = validateValueBlobSize(blob.get());\n+\t\tif (ret)\n+\t\t\treturn ret;\n+\n+\t\t/* Validate each serialized data value. */\n+\t\tuint8_t *b = blob->data();\n+\t\tfor (unsigned int i = 0; i < numCtrls_; ++i) {\n+\t\t\tif (!validateValueBlob(b))\n+\t\t\t\treturn TestFail;\n+\n+\t\t\tb += VALUE_BLOB_SIZE;\n+\t\t}\n+\n+\t\t/* De-serialize a control list and re-validate it. */\n+\t\tControlList newList(camera_->controls());\n+\t\tnewList.deserialize(blob->data(), blob->size());\n+\t\tfor (auto it : newList) {\n+\t\t\tconst ControlInfo *info = it.first;\n+\t\t\tControlValue &control = it.second;\n+\n+\t\t\tif (!validateDataValue(info->id(), control))\n+\t\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\treturn TestPass;\n+\t}\n+};\n+\n+TEST_REGISTER(ControlListSerializeTest)\ndiff --git a/test/serialization/meson.build b/test/serialization/meson.build\nnew file mode 100644\nindex 000000000000..511f05cbbd1f\n--- /dev/null\n+++ b/test/serialization/meson.build\n@@ -0,0 +1,11 @@\n+serialization_tests = [\n+ [ 'control_list', 'control_list.cpp' ],\n+]\n+\n+foreach t : serialization_tests\n+ exe = executable(t[0], [t[1], 'serialization_test.cpp'],\n+ dependencies : libcamera_dep,\n+ link_with : test_libraries,\n+ include_directories : test_includes_internal)\n+ test(t[0], exe, suite : 'serialization', is_parallel : true)\n+endforeach\ndiff --git a/test/serialization/serialization_test.cpp b/test/serialization/serialization_test.cpp\nnew file mode 100644\nindex 000000000000..8db70bb1de02\n--- /dev/null\n+++ b/test/serialization/serialization_test.cpp\n@@ -0,0 +1,189 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2019, Google Inc.\n+ *\n+ * serialization_test.cpp - Base class for serialization tests\n+ */\n+\n+#include \"serialization_test.h\"\n+\n+#include <iostream>\n+\n+#include <libcamera/camera.h>\n+#include <libcamera/camera_manager.h>\n+#include <libcamera/controls.h>\n+\n+#include \"test.h\"\n+#include \"serializer.h\"\n+\n+using namespace std;\n+using namespace libcamera;\n+\n+SerializationTest::SerializationTest()\n+\t: sensor_(nullptr), numCtrls_(0), cm_(nullptr)\n+{\n+}\n+\n+int SerializationTest::init()\n+{\n+\tcm_ = new CameraManager();\n+\n+\tif (cm_->start()) {\n+\t\tcerr << \"Failed to start camera manager\" << endl;\n+\t\treturn TestFail;\n+\t}\n+\n+\tcamera_ = cm_->get(\"VIMC Sensor B\");\n+\tif (!camera_) {\n+\t\tcerr << \"Can not find VIMC camera\" << endl;\n+\t\treturn TestSkip;\n+\t}\n+\n+\treturn TestPass;\n+}\n+\n+void SerializationTest::cleanup()\n+{\n+\tdelete sensor_;\n+\n+\tif (camera_) {\n+\t\tcamera_->release();\n+\t\tcamera_.reset();\n+\t}\n+\n+\tcm_->stop();\n+\tdelete cm_;\n+}\n+\n+int SerializationTest::initSubdevice()\n+{\n+\tenumerator_ = DeviceEnumerator::create();\n+\tif (!enumerator_) {\n+\t\tcerr << \"Failed to create device enumerator\" << endl;\n+\t\treturn TestFail;\n+\t}\n+\n+\tif (enumerator_->enumerate()) {\n+\t\tcerr << \"Failed to enumerate media devices\" << endl;\n+\t\treturn TestFail;\n+\t}\n+\n+\tDeviceMatch dm(\"vimc\");\n+\tmedia_ = enumerator_->search(dm);\n+\tif (!media_) {\n+\t\tcerr << \"Unable to find \\'vimc\\' media device node\" << endl;\n+\t\treturn TestSkip;\n+\t}\n+\n+\tsensor_ = V4L2Subdevice::fromEntityName(media_.get(), \"Sensor B\");\n+\tif (sensor_->open()) {\n+\t\tcerr << \"Unable to open video subdevice \\\"Sensor B\\\"\"\n+\t\t << endl;\n+\t\treturn TestFail;\n+\t}\n+\n+\treturn TestPass;\n+}\n+\n+int SerializationTest::validateValueBlobSize(DataBlob *blob)\n+{\n+\tsize_t blobSize = blob->size();\n+\tif (blobSize % Serializer::BLOB_ALIGN_BYTES) {\n+\t\tcerr << \"Serialized control list has incorrect alignement\"\n+\t\t << endl;\n+\t\treturn TestFail;\n+\t}\n+\n+\tsize_t expectedSize = VALUE_BLOB_SIZE * numCtrls_;\n+\tif (blobSize != expectedSize) {\n+\t\tcerr << \"Serialized control 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::validateValueBlob(uint8_t *blob)\n+{\n+\tuint32_t id = *(reinterpret_cast<uint32_t *>(blob));\n+\tuint32_t type = *(reinterpret_cast<uint32_t *>(Serializer::VALUE_BLOB_TYPE(blob)));\n+\tuint32_t size = *(reinterpret_cast<uint32_t *>(Serializer::VALUE_BLOB_SIZE(blob)));\n+\tuint32_t value = *(reinterpret_cast<uint32_t*>(Serializer::VALUE_BLOB_DATA(blob)));\n+\tbool found = false;\n+\n+\tcout << \"Testing serialized control: \" << id << \" - \"\n+\t << type << \" - \" << size << \" - \" << value << endl;\n+\n+\tfor (unsigned int i = 0; i < numCtrls_; ++i) {\n+\t\tif (valueValidationMatrix[i][VALUE_CTRL_ID] != id)\n+\t\t\tcontinue;\n+\n+\t\tfound = true;\n+\n+\t\tunsigned int *entry = valueValidationMatrix[i];\n+\t\tif (entry[VALUE_CTRL_FLAG]) {\n+\t\t\tcerr << \"The control with id \" << id\n+\t\t\t << \" has been serialized twice\" << endl;\n+\t\t\treturn false;\n+\t\t}\n+\t\tentry[VALUE_CTRL_FLAG] = true;\n+\n+\t\tif (entry[VALUE_CTRL_TYPE] != type ||\n+\t\t entry[VALUE_CTRL_SIZE] != size ||\n+\t\t entry[VALUE_CTRL_VALUE] != value) {\n+\t\t\tcerr << \"The control 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 control with id \" << id << endl;\n+\t\treturn false;\n+\t}\n+\n+\tcout << \"Serialization of control: \" << id << \" = Success.\"\n+\t << endl;\n+\n+\treturn true;\n+}\n+\n+bool SerializationTest::validateDataValue(unsigned int id, const DataValue &dataValue)\n+{\n+\tuint32_t value = dataValue.getInt();\n+\tDataType type = dataValue.type();\n+\tsize_t dataSize = DataSize[type];\n+\tsize_t size = dataValue.size();\n+\tbool found = false;\n+\n+\tcout << \"Testing de-serialized control: \" << id << \" - \"\n+\t << type << \" - \" << size << \" - \" << value << endl;\n+\n+\tfor (unsigned int i = 0; i < numCtrls_; ++i) {\n+\t\tif (valueValidationMatrix[i][VALUE_CTRL_ID] != id)\n+\t\t\tcontinue;\n+\n+\t\tfound = true;\n+\n+\t\tunsigned int *entry = valueValidationMatrix[i];\n+\t\tif (entry[VALUE_CTRL_TYPE] != dataValue.type() ||\n+\t\t dataSize != dataValue.size() ||\n+\t\t entry[VALUE_CTRL_VALUE] != value) {\n+\t\t\tcerr << \"The control with id \" << id\n+\t\t\t << \" has been wrongly de-serialized\" << endl;\n+\t\t\treturn false;\n+\t\t}\n+\t}\n+\n+\tif (!found) {\n+\t\tcerr << \"Non-existing control with id \" << id << endl;\n+\t\treturn false;\n+\t}\n+\n+\tcout << \"De-serialization of control: \" << id << \" = Success.\"\n+\t << endl;\n+\n+\treturn true;\n+}\ndiff --git a/test/serialization/serialization_test.h b/test/serialization/serialization_test.h\nnew file mode 100644\nindex 000000000000..87dc5a84a505\n--- /dev/null\n+++ b/test/serialization/serialization_test.h\n@@ -0,0 +1,65 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2019, Google Inc.\n+ *\n+ * serialization_test.h - Base class for serialization tests\n+ */\n+#ifndef __LIBCAMERA_SERIALIZATION_TEST_H__\n+#define __LIBCAMERA_SERIALIZATION_TEST_H__\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+using namespace libcamera;\n+\n+class SerializationTest : public Test\n+{\n+public:\n+\tSerializationTest();\n+\n+protected:\n+\tstatic constexpr unsigned int CTRL_MAX\t\t\t= 10;\n+\n+\t/* Value validation matrix */\n+\tunsigned int valueValidationMatrix[3][5];\n+\n+\t/* Indices on the validation matrix */\n+\tstatic constexpr unsigned int VALUE_CTRL_ID\t\t= 0;\n+\tstatic constexpr unsigned int VALUE_CTRL_TYPE\t\t= 1;\n+\tstatic constexpr unsigned int VALUE_CTRL_SIZE\t\t= 2;\n+\tstatic constexpr unsigned int VALUE_CTRL_VALUE\t\t= 3;\n+\tstatic constexpr unsigned int VALUE_CTRL_FLAG\t\t= 4;\n+\n+\t/*\n+\t * Serialized values sizes.\n+\t * \\todo Assume a serialized value is 24 bytes as all control\n+\t * values are simple integers.\n+\t */\n+\tstatic constexpr unsigned int VALUE_BLOB_DATA_SIZE\t= 8;\n+\tstatic constexpr unsigned int VALUE_BLOB_SIZE\t\t= 24;\n+\n+\tint init();\n+\tvoid cleanup();\n+\n+\tint initSubdevice();\n+\n+\tint validateValueBlobSize(DataBlob *blob);\n+\tbool validateValueBlob(uint8_t *dataBlob);\n+\tbool validateDataValue(unsigned int id, const DataValue &dataValue);\n+\n+\tstd::unique_ptr<DeviceEnumerator> enumerator_;\n+\tstd::shared_ptr<MediaDevice> media_;\n+\tstd::shared_ptr<Camera> camera_;\n+\tV4L2Subdevice *sensor_;\n+\tunsigned int numCtrls_;\n+\tCameraManager *cm_;\n+};\n+\n+#endif /* __LIBCAMERA_SERIALIZATION_TEST_H__ */\n", "prefixes": [ "libcamera-devel", "12/21" ] }