[{"id":2102,"web_url":"https://patchwork.libcamera.org/comment/2102/","msgid":"<20190701235741.GD24839@pendragon.ideasonboard.com>","date":"2019-07-01T23:57:41","subject":"Re: [libcamera-devel] [RFC 8/8] test: v4l2_videodevice: Add buffer\n\timport test","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo,\n\nThank you for the patch.\n\nOn Sun, Jun 30, 2019 at 08:10:49PM +0200, Jacopo Mondi wrote:\n> Test buffer importing by streaming the camera to a video output device\n> performing zero-copy memory sharing using dmabuf file descriptors.\n> \n> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\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\n\nI'll do a more in-depth review, but I think you could already move this\ntest to test/camera as it's not a v4l2_videodevice test (unlike the\nbuffer sharing test that tests buffer sharing between V4L2 video\ndevices).\n\n> diff --git a/test/v4l2_videodevice/buffer_import.cpp b/test/v4l2_videodevice/buffer_import.cpp\n> new file mode 100644\n> index 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);\n> diff --git a/test/v4l2_videodevice/meson.build b/test/v4l2_videodevice/meson.build\n> index 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","headers":{"Return-Path":"<laurent.pinchart@ideasonboard.com>","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D67EA6157D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue,  2 Jul 2019 01:58:01 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 566AB524;\n\tTue,  2 Jul 2019 01:58:01 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1562025481;\n\tbh=xJ1GJdBSJVDtXH9z1rwQObmhL1eRWS505j+3f3JQgSo=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=ng/zHa5aft8p57lv/4ZTBEvhYS987v9M+uDMZ5HVC5Mg9u2AWeOsbKnDRy4Xqm+Bh\n\tUjk8nAMSHqxEPd7cKfo4lKIhbCNd+jyMes2NvRMOARDvLDxoZaci7icag/YCGFWc6o\n\txyGz+5Oj0ulNSCuqZL/vTBK2NZ6fcks7L/Hdiz3I=","Date":"Tue, 2 Jul 2019 02:57:41 +0300","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Jacopo Mondi <jacopo@jmondi.org>","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190701235741.GD24839@pendragon.ideasonboard.com>","References":"<20190630181049.9548-1-jacopo@jmondi.org>\n\t<20190630181049.9548-9-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20190630181049.9548-9-jacopo@jmondi.org>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [RFC 8/8] test: v4l2_videodevice: Add buffer\n\timport 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":"Mon, 01 Jul 2019 23:58:02 -0000"}}]