Patch Detail
Show a patch.
GET /api/patches/1753/?format=api
{ "id": 1753, "url": "https://patchwork.libcamera.org/api/patches/1753/?format=api", "web_url": "https://patchwork.libcamera.org/patch/1753/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20190808151221.24254-5-kieran.bingham@ideasonboard.com>", "date": "2019-08-08T15:12:19", "name": "[libcamera-devel,4/6] test: v4l2_videodevice: Add M2M device test", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "1a5749b8ff084de05014d51a2073c93ef4af512f", "submitter": { "id": 4, "url": "https://patchwork.libcamera.org/api/people/4/?format=api", "name": "Kieran Bingham", "email": "kieran.bingham@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/1753/mbox/", "series": [ { "id": 449, "url": "https://patchwork.libcamera.org/api/series/449/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=449", "date": "2019-08-08T15:12:15", "name": "V4L2 M2M Support (+RPi PoC)", "version": 1, "mbox": "https://patchwork.libcamera.org/series/449/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/1753/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/1753/checks/", "tags": {}, "headers": { "Return-Path": "<kieran.bingham@ideasonboard.com>", "Received": [ "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9F709615FF\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 8 Aug 2019 17:12:27 +0200 (CEST)", "from localhost.localdomain\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 3CEDCCC;\n\tThu, 8 Aug 2019 17:12:26 +0200 (CEST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1565277147;\n\tbh=dKZdRJSfVfYxD4Lj8YGvNVGI4c2LaIsSy7sDoAsAd9Q=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=TOUlaWGf/miJCQ2ypoidYC4/ORvLuTZNrrUNGAXuqCrsIkuo9CPEzcGbWITX5QcHB\n\tq5YTH2qPX+jLeydgILzgReoErdEXWYTgJKmvY7EH15+cMA20IlbcxKafpGQW4Ly1PJ\n\tueQlRnAsq7+MOOk2eW94uS6Rw3J6SkwB+kB0c7/w=", "From": "Kieran Bingham <kieran.bingham@ideasonboard.com>", "To": "LibCamera Devel <libcamera-devel@lists.libcamera.org>", "Date": "Thu, 8 Aug 2019 16:12:19 +0100", "Message-Id": "<20190808151221.24254-5-kieran.bingham@ideasonboard.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190808151221.24254-1-kieran.bingham@ideasonboard.com>", "References": "<20190808151221.24254-1-kieran.bingham@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 4/6] test: v4l2_videodevice: Add M2M\n\tdevice 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, 08 Aug 2019 15:12:27 -0000" }, "content": "The V4L2M2MDevice requires two pipelines to be configured. This makes it unsuitable\nto reuse the existing V4L2DeviceTest test library in it's current form.\n\nImplement a full test to run the two M2M pipelines through VIM2M.\n\nSigned-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n---\n test/v4l2_videodevice/meson.build | 1 +\n test/v4l2_videodevice/v4l2_m2mdevice.cpp | 210 +++++++++++++++++++++++\n 2 files changed, 211 insertions(+)\n create mode 100644 test/v4l2_videodevice/v4l2_m2mdevice.cpp", "diff": "diff --git a/test/v4l2_videodevice/meson.build b/test/v4l2_videodevice/meson.build\nindex 76be5e142bb6..ad41898b5f8b 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+ [ 'v4l2_m2mdevice', 'v4l2_m2mdevice.cpp' ],\n ]\n \n foreach t : v4l2_videodevice_tests\ndiff --git a/test/v4l2_videodevice/v4l2_m2mdevice.cpp b/test/v4l2_videodevice/v4l2_m2mdevice.cpp\nnew file mode 100644\nindex 000000000000..7a730f695ab7\n--- /dev/null\n+++ b/test/v4l2_videodevice/v4l2_m2mdevice.cpp\n@@ -0,0 +1,210 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2019, Google Inc.\n+ *\n+ * libcamera V4L2 API tests\n+ */\n+\n+#include <libcamera/buffer.h>\n+#include <libcamera/camera_manager.h>\n+#include <libcamera/event_dispatcher.h>\n+#include <libcamera/timer.h>\n+\n+#include <iostream>\n+#include <memory>\n+\n+#include \"device_enumerator.h\"\n+#include \"media_device.h\"\n+#include \"v4l2_videodevice.h\"\n+\n+#include \"test.h\"\n+\n+using namespace std;\n+using namespace libcamera;\n+\n+class V4L2M2MDeviceTest : public Test\n+{\n+public:\n+\tV4L2M2MDeviceTest()\n+\t\t: vim2m_(nullptr), outputFrames_(0), captureFrames_(0)\n+\t{\n+\t}\n+\n+\tvoid outputBufferComplete(Buffer *buffer)\n+\t{\n+\t\tstd::cout << \"Received output buffer \" << buffer->index()\n+\t\t\t << std::endl;\n+\n+\t\toutputFrames_++;\n+\n+\t\t/* Requeue the buffer for further use. */\n+\t\tvim2m_->output()->queueBuffer(buffer);\n+\t}\n+\n+\tvoid receiveCaptureBuffer(Buffer *buffer)\n+\t{\n+\t\tstd::cout << \"Received capture buffer \" << buffer->index()\n+\t\t\t << std::endl;\n+\n+\t\tcaptureFrames_++;\n+\n+\t\t/* Requeue the buffer for further use. */\n+\t\tvim2m_->capture()->queueBuffer(buffer);\n+\t}\n+\n+protected:\n+\tint init()\n+\t{\n+\t\tenumerator_ = DeviceEnumerator::create();\n+\t\tif (!enumerator_) {\n+\t\t\tcerr << \"Failed to create device enumerator\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (enumerator_->enumerate()) {\n+\t\t\tcerr << \"Failed to enumerate media devices\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tDeviceMatch dm(\"vim2m\");\n+\t\tdm.add(\"vim2m-source\");\n+\t\tdm.add(\"vim2m-sink\");\n+\n+\t\tmedia_ = enumerator_->search(dm);\n+\t\tif (!media_) {\n+\t\t\tcerr << \"Failed to match device\" << endl;\n+\t\t\treturn TestSkip;\n+\t\t}\n+\n+\t\tMediaEntity *entity = media_->getEntityByName(\"vim2m-source\");\n+\t\tif (!entity) {\n+\t\t\tcerr << \"Failed to get device entity\" << endl;\n+\t\t\treturn TestSkip;\n+\t\t}\n+\n+\t\tvim2m_ = new V4L2M2MDevice(entity->deviceNode());\n+\t\tif (vim2m_->status())\n+\t\t\treturn TestFail;\n+\n+\t\tV4L2DeviceFormat format = {};\n+\t\tif (vim2m_->capture()->getFormat(&format))\n+\t\t\treturn TestFail;\n+\n+\t\tformat.size.width = 640;\n+\t\tformat.size.height = 480;\n+\n+\t\tif (vim2m_->capture()->setFormat(&format))\n+\t\t\treturn TestFail;\n+\n+\t\tif (vim2m_->output()->setFormat(&format))\n+\t\t\treturn TestFail;\n+\n+\t\tcerr << \"Initialised M2M ...\" << endl;\n+\n+\t\treturn TestPass;\n+\t}\n+\n+\tint run()\n+\t{\n+\t\tconst unsigned int bufferCount = 8;\n+\n+\t\tEventDispatcher *dispatcher = CameraManager::instance()->eventDispatcher();\n+\t\tTimer timeout;\n+\t\tint ret;\n+\n+\t\tcapturePool_.createBuffers(bufferCount);\n+\t\toutputPool_.createBuffers(bufferCount);\n+\n+\t\tret = vim2m_->capture()->exportBuffers(&capturePool_);\n+\t\tif (ret) {\n+\t\t\tcerr << \"Failed to export Capture Buffers\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tret = vim2m_->output()->exportBuffers(&outputPool_);\n+\t\tif (ret) {\n+\t\t\tcerr << \"Failed to export Output Buffers\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tvim2m_->capture()->bufferReady.connect(this, &V4L2M2MDeviceTest::receiveCaptureBuffer);\n+\t\tvim2m_->output()->bufferReady.connect(this, &V4L2M2MDeviceTest::outputBufferComplete);\n+\n+\t\t/* We can't \"queueAllBuffers()\" on an output device, so we do it manually */\n+\t\tstd::vector<std::unique_ptr<Buffer>> outputBuffers;\n+\t\tfor (unsigned int i = 0; i < outputPool_.count(); ++i) {\n+\t\t\tBuffer *buffer = new Buffer(i);\n+\t\t\toutputBuffers.emplace_back(buffer);\n+\t\t\tret = vim2m_->output()->queueBuffer(buffer);\n+\t\t\tif (ret)\n+\t\t\t\treturn {};\n+\t\t}\n+\n+\t\tstd::vector<std::unique_ptr<Buffer>> captureBuffers;\n+\t\tcaptureBuffers = vim2m_->capture()->queueAllBuffers();\n+\t\tif (captureBuffers.empty()) {\n+\t\t\tcerr << \"Failed to queue all Capture Buffers\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tret = vim2m_->output()->streamOn();\n+\t\tif (ret) {\n+\t\t\tcerr << \"Failed to streamOn output\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tret = vim2m_->capture()->streamOn();\n+\t\tif (ret) {\n+\t\t\tcerr << \"Failed to streamOn capture\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\ttimeout.start(10000);\n+\t\twhile (timeout.isRunning()) {\n+\t\t\tdispatcher->processEvents();\n+\t\t\tif (captureFrames_ > 30)\n+\t\t\t\tbreak;\n+\t\t}\n+\n+\t\tif (captureFrames_ < 1) {\n+\t\t\tstd::cout << \"Failed to capture any frames within timeout.\" << std::endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (captureFrames_ < 30) {\n+\t\t\tstd::cout << \"Failed to capture 30 frames within timeout.\" << std::endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tstd::cout << \"Output \" << outputFrames_ << \" frames\" << std::endl;\n+\t\tstd::cout << \"Captured \" << captureFrames_ << \" frames\" << std::endl;\n+\n+\t\tret = vim2m_->capture()->streamOff();\n+\t\tif (ret)\n+\t\t\treturn TestFail;\n+\n+\t\tret = vim2m_->output()->streamOff();\n+\t\tif (ret)\n+\t\t\treturn TestFail;\n+\n+\t\treturn TestPass;\n+\t}\n+\n+\tvoid cleanup()\n+\t{\n+\t\tdelete vim2m_;\n+\t};\n+\n+private:\n+\tstd::unique_ptr<DeviceEnumerator> enumerator_;\n+\tstd::shared_ptr<MediaDevice> media_;\n+\tV4L2M2MDevice *vim2m_;\n+\n+\tBufferPool capturePool_;\n+\tBufferPool outputPool_;\n+\n+\tunsigned int outputFrames_;\n+\tunsigned int captureFrames_;\n+};\n+\n+TEST_REGISTER(V4L2M2MDeviceTest);\n", "prefixes": [ "libcamera-devel", "4/6" ] }