Patch Detail
Show a patch.
GET /api/1.1/patches/1630/?format=api
{ "id": 1630, "url": "https://patchwork.libcamera.org/api/1.1/patches/1630/?format=api", "web_url": "https://patchwork.libcamera.org/patch/1630/", "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": "<20190704225334.26170-10-jacopo@jmondi.org>", "date": "2019-07-04T22:53:34", "name": "[libcamera-devel,9/9,HACK] test: v4l2_videodevice: Add buffer import test", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "18a77bf9a071fa8cef753c1e3f23ae37057fedbc", "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/1630/mbox/", "series": [ { "id": 407, "url": "https://patchwork.libcamera.org/api/1.1/series/407/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=407", "date": "2019-07-04T22:53:25", "name": "Add support for external bufferes", "version": 1, "mbox": "https://patchwork.libcamera.org/series/407/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/1630/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/1630/checks/", "tags": {}, "headers": { "Return-Path": "<jacopo@jmondi.org>", "Received": [ "from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[217.70.183.197])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 380BD6156F\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 5 Jul 2019 00:52:33 +0200 (CEST)", "from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay5-d.mail.gandi.net (Postfix) with ESMTPSA id C49471C0008;\n\tThu, 4 Jul 2019 22:52:32 +0000 (UTC)" ], "X-Originating-IP": "2.224.242.101", "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 5 Jul 2019 00:53:34 +0200", "Message-Id": "<20190704225334.26170-10-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20190704225334.26170-1-jacopo@jmondi.org>", "References": "<20190704225334.26170-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 9/9] [HACK] test: v4l2_videodevice: Add\n\tbuffer import test", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.23", "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": "Thu, 04 Jul 2019 22:52:33 -0000" }, "content": "Test buffer importing by streaming the camera to a video output device\nperforming zero-copy memory sharing using dmabuf file descriptors.\n\nNot-yet-Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n\n---\nNot suitable for merge yes. More a test utility for development at the\nmoment. To be morhped into a camera test from a video device one.\n---\n test/v4l2_videodevice/buffer_import.cpp | 234 ++++++++++++++++++++++++\n test/v4l2_videodevice/meson.build | 1 +\n 2 files changed, 235 insertions(+)\n create mode 100644 test/v4l2_videodevice/buffer_import.cpp", "diff": "diff --git a/test/v4l2_videodevice/buffer_import.cpp b/test/v4l2_videodevice/buffer_import.cpp\nnew file mode 100644\nindex 000000000000..0a294b055af5\n--- /dev/null\n+++ b/test/v4l2_videodevice/buffer_import.cpp\n@@ -0,0 +1,234 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2019, Google Inc.\n+ *\n+ * libcamera V4L2 API tests\n+ *\n+ * Test importing buffers exported from an output device into a camera\n+ */\n+\n+#include <iostream>\n+\n+#include <libcamera/buffer.h>\n+#include <libcamera/camera.h>\n+#include <libcamera/camera_manager.h>\n+#include <libcamera/event_dispatcher.h>\n+#include <libcamera/timer.h>\n+\n+#include \"v4l2_videodevice_test.h\"\n+\n+using namespace libcamera;\n+using namespace std;\n+\n+class BufferImportTest : public V4L2VideoDeviceTest\n+{\n+public:\n+\tBufferImportTest()\n+\t\t: V4L2VideoDeviceTest(\"vivid\", \"vivid-000-vid-out\")\n+\t{\n+\t}\n+\n+protected:\n+\tvoid cameraBufferComplete(Request *request, Buffer *buffer)\n+\t{\n+\t\tif (buffer->status() != Buffer::BufferSuccess)\n+\t\t\treturn;\n+\n+\t\tcapture_->queueBuffer(buffer);\n+\t}\n+\n+\tvoid requestComplete(Request *request, const std::map<Stream *, Buffer *> &buffers)\n+\t{\n+\t\tif (request->status() != Request::RequestComplete)\n+\t\t\treturn;\n+\n+\t\t/* Reuse the buffers for a new request. */\n+\t\trequest = camera_->createRequest();\n+\t\trequest->setBuffers(buffers);\n+\t\tcamera_->queueRequest(request);\n+\t}\n+\n+\tint init()\n+\t{\n+\t\tconstexpr unsigned int bufferCount = 4;\n+\n+\t\t/* Get a camera where to capture frames from. */\n+\t\tcm_ = CameraManager::instance();\n+\n+\t\tif (cm_->start()) {\n+\t\t\tcout << \"Failed to start camera manager\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tcamera_ = cm_->get(\"Integrated Camera: Integrated C\");\n+\t\tif (!camera_) {\n+\t\t\tcout << \"Can not find VIMC camera\" << endl;\n+\t\t\treturn TestSkip;\n+\t\t}\n+\n+\t\tif (camera_->acquire()) {\n+\t\t\tcout << \"Failed to acquire the camera\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\t/*\n+\t\t * Initialize the output device and export buffers in a pool.\n+\t\t * The 'output' device is actually called capture_ by the base\n+\t\t * class.\n+\t\t */\n+\t\tint ret = V4L2VideoDeviceTest::init();\n+\t\tif (ret) {\n+\t\t\tcerr << \"Failed to initialize output device\" << endl;\n+\t\t\treturn ret;\n+\t\t}\n+\n+\t\t/*\n+\t\t * Set a known format on the output devices, then apply it\n+\t\t * to the camera.\n+\t\t */\n+\t\tV4L2DeviceFormat format = {};\n+\t\tif (capture_->getFormat(&format)) {\n+\t\t\tcleanup();\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tformat.size.width = 640;\n+\t\tformat.size.height = 480;\n+\t\tformat.fourcc = V4L2_PIX_FMT_YUYV;\n+\t\tformat.planesCount = 1;\n+\t\tformat.planes[0].size = 640 * 480 * 2;\n+\t\tformat.planes[0].bpl = 640 * 2;\n+\t\tif (capture_->setFormat(&format)) {\n+\t\t\tcleanup();\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tcout << \"Output format: \" << format.toString();\n+\n+\t\tconfig_ = camera_->generateConfiguration({ StreamRole::VideoRecording });\n+\t\tif (!config_ || config_->size() != 1) {\n+\t\t\tcout << \"Failed to generate default configuration\" << endl;\n+\t\t\tcleanup();\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\t/*\n+\t\t * Configure the Stream to work with externally allocated\n+\t\t * buffers by setting the memoryType to ExternalMemory.\n+\t\t */\n+\t\tStreamConfiguration &cfg = config_->at(0);\n+\t\tcfg.size = format.size;\n+\t\tcfg.pixelFormat = format.fourcc;\n+\t\tcfg.memoryType = ExternalMemory;\n+\n+\t\tif (camera_->configure(config_.get())) {\n+\t\t\tcout << \"Failed to set modified configuration\" << endl;\n+\t\t\tcleanup();\n+\t\t\treturn TestFail;\n+\t\t}\n+\t\tcout << \"Capture format: \" << format.toString();\n+\n+\t\t/*\n+\t\t * Export the output buffers to a pool and then import\n+\t\t * them before setting up buffers in the Camera.\n+\t\t */\n+\t\tpool_.createBuffers(bufferCount);\n+\t\tret = capture_->exportBuffers(&pool_);\n+\t\tif (ret) {\n+\t\t\tstd::cout << \"Failed to export buffers\" << std::endl;\n+\t\t\tcleanup();\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (camera_->allocateBuffers()) {\n+\t\t\tcout << \"Failed to allocate buffers\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\treturn TestPass;\n+\t}\n+\n+\tint run()\n+\t{\n+\t\tstd::vector<Request *> requests;\n+\t\tStreamConfiguration &cfg = config_->at(0);\n+\t\tStream *stream = cfg.stream();\n+\t\t/* Create one request for each output video buffer. */\n+\t\tfor (Buffer &buffer : pool_.buffers()) {\n+\t\t\tRequest *request = camera_->createRequest();\n+\t\t\tif (!request) {\n+\t\t\t\tcout << \"Failed to create request\" << endl;\n+\t\t\t\treturn TestFail;\n+\t\t\t}\n+\n+\t\t\tstd::map<Stream *, Buffer *> map = { { stream, &buffer } };\n+\t\t\tif (request->setBuffers(map)) {\n+\t\t\t\tcout << \"Failed to associating buffer with request\" << endl;\n+\t\t\t\treturn TestFail;\n+\t\t\t}\n+\n+\t\t\trequests.push_back(request);\n+\t\t}\n+\n+\t\t/* Connect the buffer ready signals of camera and output */\n+\t\tcamera_->bufferCompleted.connect(this,\n+\t\t\t\t&BufferImportTest::cameraBufferComplete);\n+\n+\t\t/* Connect the request ready signal to re-queue requests. */\n+\t\tcamera_->requestCompleted.connect(this,\n+\t\t\t\t&BufferImportTest::requestComplete);\n+\n+\t\tcapture_->streamOn();\n+\t\tif (camera_->start()) {\n+\t\t\tcout << \"Failed to start camera\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tfor (Request *request : requests) {\n+\t\t\tif (camera_->queueRequest(request)) {\n+\t\t\t\tcout << \"Failed to queue request\" << endl;\n+\t\t\t\tcamera_->stop();\n+\t\t\t\tcapture_->streamOff();\n+\t\t\t\tcleanup();\n+\t\t\t\treturn TestFail;\n+\t\t\t}\n+\t\t}\n+\n+\t\tEventDispatcher *dispatcher = CameraManager::instance()->eventDispatcher();\n+\n+\t\tTimer timer;\n+\t\ttimer.start(2000);\n+\t\twhile (timer.isRunning())\n+\t\t\tdispatcher->processEvents();\n+\n+\t\tif (camera_->stop()) {\n+\t\t\tcout << \"Failed to stop camera\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tcapture_->streamOff();\n+\n+\t\treturn TestPass;\n+\t}\n+\n+\tvoid cleanup()\n+\t{\n+\t\tcamera_->freeBuffers();\n+\n+\t\tif (camera_) {\n+\t\t\tcamera_->release();\n+\t\t\tcamera_.reset();\n+\t\t}\n+\n+\t\tcm_->stop();\n+\n+\t\tV4L2VideoDeviceTest::cleanup();\n+\t}\n+\n+private:\n+\tCameraManager *cm_;\n+\tstd::shared_ptr<Camera> camera_;\n+\tstd::unique_ptr<CameraConfiguration> config_;\n+};\n+\n+TEST_REGISTER(BufferImportTest);\ndiff --git a/test/v4l2_videodevice/meson.build b/test/v4l2_videodevice/meson.build\nindex 76be5e142bb6..15169abe48d3 100644\n--- a/test/v4l2_videodevice/meson.build\n+++ b/test/v4l2_videodevice/meson.build\n@@ -7,6 +7,7 @@ v4l2_videodevice_tests = [\n [ 'stream_on_off', 'stream_on_off.cpp' ],\n [ 'capture_async', 'capture_async.cpp' ],\n [ 'buffer_sharing', 'buffer_sharing.cpp' ],\n+ [ 'buffer_import', 'buffer_import.cpp' ],\n ]\n \n foreach t : v4l2_videodevice_tests\n", "prefixes": [ "libcamera-devel", "9/9", "HACK" ] }