Patch Detail
Show a patch.
GET /api/1.1/patches/2837/?format=api
{ "id": 2837, "url": "https://patchwork.libcamera.org/api/1.1/patches/2837/?format=api", "web_url": "https://patchwork.libcamera.org/patch/2837/", "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": "<20200216161642.152263-3-niklas.soderlund@ragnatech.se>", "date": "2020-02-16T16:16:42", "name": "[libcamera-devel,2/2] test: v4l2_videodevice: Add test for V4L2BufferCache", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "06fd59e9c57298f6ed61738f608579526b9b9ecc", "submitter": { "id": 5, "url": "https://patchwork.libcamera.org/api/1.1/people/5/?format=api", "name": "Niklas Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/2837/mbox/", "series": [ { "id": 676, "url": "https://patchwork.libcamera.org/api/1.1/series/676/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=676", "date": "2020-02-16T16:16:40", "name": "libcamera: V4L2BufferCache: Improve cache eviction strategy", "version": 1, "mbox": "https://patchwork.libcamera.org/series/676/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/2837/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/2837/checks/", "tags": {}, "headers": { "Return-Path": "<niklas.soderlund@ragnatech.se>", "Received": [ "from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C9ACF61A27\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun, 16 Feb 2020 17:17:35 +0100 (CET)", "from bismarck.berto.se (p4fca2392.dip0.t-ipconnect.de\n\t[79.202.35.146]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid d6b90541-50d7-11ea-9f85-005056917a89;\n\tSun, 16 Feb 2020 17:17:34 +0100 (CET)" ], "X-Halon-ID": "d6b90541-50d7-11ea-9f85-005056917a89", "Authorized-sender": "niklas@soderlund.pp.se", "From": "=?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Sun, 16 Feb 2020 17:16:42 +0100", "Message-Id": "<20200216161642.152263-3-niklas.soderlund@ragnatech.se>", "X-Mailer": "git-send-email 2.25.0", "In-Reply-To": "<20200216161642.152263-1-niklas.soderlund@ragnatech.se>", "References": "<20200216161642.152263-1-niklas.soderlund@ragnatech.se>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 2/2] test: v4l2_videodevice: Add test for\n\tV4L2BufferCache", "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": "Sun, 16 Feb 2020 16:17:36 -0000" }, "content": "Add test to test the different modes and situations the V4L2BufferCache\ncan be put to. The tests verify that a FrameBuffer used with the cache\nresults in a V4L2 video device index can be resolved, and that the cache\nimplementation is capable of keeping buffers in a hot state.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n---\n test/v4l2_videodevice/buffer_cache.cpp | 286 +++++++++++++++++++++++++\n test/v4l2_videodevice/meson.build | 1 +\n 2 files changed, 287 insertions(+)\n create mode 100644 test/v4l2_videodevice/buffer_cache.cpp", "diff": "diff --git a/test/v4l2_videodevice/buffer_cache.cpp b/test/v4l2_videodevice/buffer_cache.cpp\nnew file mode 100644\nindex 0000000000000000..6244361130525d29\n--- /dev/null\n+++ b/test/v4l2_videodevice/buffer_cache.cpp\n@@ -0,0 +1,286 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2020, Google Inc.\n+ *\n+ * Test the buffer cache different operation modes\n+ */\n+\n+#include <iostream>\n+#include <random>\n+#include <vector>\n+\n+#include <libcamera/stream.h>\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 libcamera;\n+\n+namespace {\n+\n+/* A provider of source of external buffers, suitable for to use by V4L2BufferCache. */\n+class BufferSource\n+{\n+public:\n+\tBufferSource()\n+\t\t: video_(nullptr)\n+\t{\n+\t}\n+\n+\t~BufferSource()\n+\t{\n+\t\tif (video_) {\n+\t\t\tvideo_->releaseBuffers();\n+\t\t\tvideo_->close();\n+\t\t}\n+\n+\t\tdelete video_;\n+\t\tvideo_ = nullptr;\n+\n+\t\tif (media_)\n+\t\t\tmedia_->release();\n+\t}\n+\n+\tint allocate(const StreamConfiguration &config)\n+\t{\n+\t\t/* Locate and open the video device. */\n+\t\tstd::string videoDeviceName = \"vivid-000-vid-out\";\n+\n+\t\tstd::unique_ptr<DeviceEnumerator> enumerator =\n+\t\t\tDeviceEnumerator::create();\n+\t\tif (!enumerator) {\n+\t\t\tstd::cout << \"Failed to create device enumerator\" << std::endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (enumerator->enumerate()) {\n+\t\t\tstd::cout << \"Failed to enumerate media devices\" << std::endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tDeviceMatch dm(\"vivid\");\n+\t\tdm.add(videoDeviceName);\n+\n+\t\tmedia_ = enumerator->search(dm);\n+\t\tif (!media_) {\n+\t\t\tstd::cout << \"No vivid output device available\" << std::endl;\n+\t\t\treturn TestSkip;\n+\t\t}\n+\n+\t\tvideo_ = V4L2VideoDevice::fromEntityName(media_.get(), videoDeviceName);\n+\t\tif (!video_) {\n+\t\t\tstd::cout << \"Unable to open \" << videoDeviceName << std::endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (video_->open())\n+\t\t\treturn TestFail;\n+\n+\t\t/* Configure the format. */\n+\t\tV4L2DeviceFormat format;\n+\t\tif (video_->getFormat(&format)) {\n+\t\t\tstd::cout << \"Failed to get format on output device\" << std::endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tformat.size = config.size;\n+\t\tformat.fourcc = V4L2VideoDevice::toV4L2Fourcc(config.pixelFormat, false);\n+\t\tif (video_->setFormat(&format)) {\n+\t\t\tstd::cout << \"Failed to set format on output device\" << std::endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (video_->exportBuffers(config.bufferCount, &buffers_) < 0) {\n+\t\t\tstd::cout << \"Failed to export buffers\" << std::endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\treturn TestPass;\n+\t}\n+\n+\tconst std::vector<std::unique_ptr<FrameBuffer>> &buffers()\n+\t{\n+\t\treturn buffers_;\n+\t}\n+\n+private:\n+\tstd::shared_ptr<MediaDevice> media_;\n+\tV4L2VideoDevice *video_;\n+\tstd::vector<std::unique_ptr<FrameBuffer>> buffers_;\n+};\n+\n+class BufferCacheTest : public Test\n+{\n+public:\n+\t/*\n+\t * Test that a cache with the same size as there are buffers results in\n+\t * a sequential run over; 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, ...\n+\t *\n+\t * Test only valid when the cache size is as least as big as there are\n+\t * number of buffers.\n+\t */\n+\tint testSequential(V4L2BufferCache *cache,\n+\t\t\t const std::vector<std::unique_ptr<FrameBuffer>> &buffers)\n+\t{\n+\t\tfor (unsigned int i = 0; i < buffers.size() * 100; i++) {\n+\t\t\tint nBuffer = i % buffers.size();\n+\t\t\tint index = cache->get(*buffers[nBuffer].get());\n+\n+\t\t\tif (index != nBuffer) {\n+\t\t\t\tstd::cout << \"Expected index \" << nBuffer\n+\t\t\t\t\t << \" got \" << index << std::endl;\n+\t\t\t\treturn TestFail;\n+\t\t\t}\n+\n+\t\t\tcache->put(index);\n+\t\t}\n+\n+\t\treturn TestPass;\n+\t}\n+\n+\t/*\n+\t * Test that randomly putting buffers to the cache always results in a\n+\t * valid index.\n+\t */\n+\tint testRandom(V4L2BufferCache *cache,\n+\t\t const std::vector<std::unique_ptr<FrameBuffer>> &buffers)\n+\t{\n+\t\tfor (unsigned int i = 0; i < buffers.size() * 100; i++) {\n+\t\t\tint nBuffer = rand() % buffers.size();\n+\t\t\tint index = cache->get(*buffers[nBuffer].get());\n+\n+\t\t\tif (index < 0) {\n+\t\t\t\tstd::cout << \"Failed lookup from cache\"\n+\t\t\t\t\t << std::endl;\n+\t\t\t\treturn TestFail;\n+\t\t\t}\n+\n+\t\t\tcache->put(index);\n+\t\t}\n+\n+\t\treturn TestPass;\n+\t}\n+\n+\t/*\n+\t * Test that using a buffer more frequently keeps it hot in the cache at\n+\t * all times.\n+\t */\n+\tint testHot(V4L2BufferCache *cache,\n+\t\t const std::vector<std::unique_ptr<FrameBuffer>> &buffers,\n+\t\t unsigned int hotFrequency)\n+\t{\n+\t\t/* Run the random test on the cache to make it messy. */\n+\t\tif (testRandom(cache, buffers) != TestPass)\n+\t\t\treturn TestFail;\n+\n+\t\t/* Pick a hot buffer at random and store its index */\n+\t\tint hotBuffer = rand() % buffers.size();\n+\t\tint hotIndex = cache->get(*buffers[hotBuffer].get());\n+\t\tcache->put(hotIndex);\n+\n+\t\t/*\n+\t\t * Queue hot buffer at the requested frequency and make sure\n+\t\t * it stays hot.\n+\t\t */\n+\t\tfor (unsigned int i = 0; i < buffers.size() * 100; i++) {\n+\t\t\tint nBuffer, index;\n+\t\t\tbool hotQueue = i % hotFrequency == 0;\n+\n+\t\t\tif (hotQueue)\n+\t\t\t\tnBuffer = hotBuffer;\n+\t\t\telse\n+\t\t\t\tnBuffer = rand() % buffers.size();\n+\n+\t\t\tindex = cache->get(*buffers[nBuffer].get());\n+\n+\t\t\tif (index < 0) {\n+\t\t\t\tstd::cout << \"Failed lookup from cache\"\n+\t\t\t\t\t << std::endl;\n+\t\t\t\treturn TestFail;\n+\t\t\t}\n+\n+\t\t\tif (hotQueue && index != hotIndex) {\n+\t\t\t\tstd::cout << \"Hot buffer got cold\"\n+\t\t\t\t\t << std::endl;\n+\t\t\t\treturn TestFail;\n+\t\t\t}\n+\n+\t\t\tcache->put(index);\n+\t\t}\n+\n+\t\treturn TestPass;\n+\t}\n+\n+\tint run() override\n+\t{\n+\t\tconst unsigned int numBuffers = 8;\n+\n+\t\tStreamConfiguration cfg;\n+\t\tcfg.pixelFormat = V4L2_PIX_FMT_YUYV;\n+\t\tcfg.size = Size(600, 800);\n+\t\tcfg.bufferCount = numBuffers;\n+\n+\t\tBufferSource source;\n+\t\tint ret = source.allocate(cfg);\n+\t\tif (ret != TestPass)\n+\t\t\treturn ret;\n+\n+\t\tif (source.buffers().size() != numBuffers) {\n+\t\t\tstd::cout << \"Got \" << source.buffers().size()\n+\t\t\t\t << \" buffers, expected \" << numBuffers\n+\t\t\t\t << std::endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\t/*\n+\t\t * Test cache of same size as there are buffers, cache is\n+\t\t * created from a list of buffers and will be pre-populated.\n+\t\t */\n+\t\tV4L2BufferCache cacheFromBuffers(source.buffers());\n+\n+\t\tif (testSequential(&cacheFromBuffers, source.buffers()) != TestPass)\n+\t\t\treturn TestFail;\n+\n+\t\tif (testRandom(&cacheFromBuffers, source.buffers()) != TestPass)\n+\t\t\treturn TestFail;\n+\n+\t\tif (testHot(&cacheFromBuffers, source.buffers(), numBuffers - 1) != TestPass)\n+\t\t\treturn TestFail;\n+\n+\t\t/*\n+\t\t * Test cache of same size as there are buffers, cache is not\n+\t\t * pre-populated.\n+\t\t */\n+\t\tV4L2BufferCache cacheFromNumbers(numBuffers);\n+\n+\t\tif (testSequential(&cacheFromNumbers, source.buffers()) != TestPass)\n+\t\t\treturn TestFail;\n+\n+\t\tif (testRandom(&cacheFromNumbers, source.buffers()) != TestPass)\n+\t\t\treturn TestFail;\n+\n+\t\tif (testHot(&cacheFromNumbers, source.buffers(), numBuffers - 1) != TestPass)\n+\t\t\treturn TestFail;\n+\n+\t\t/*\n+\t\t * Test cache half the size of number of buffers used, cache is\n+\t\t * not pre-populated.\n+\t\t */\n+\t\tV4L2BufferCache cacheHalf(numBuffers / 2);\n+\n+\t\tif (testRandom(&cacheHalf, source.buffers()) != TestPass)\n+\t\t\treturn TestFail;\n+\n+\t\tif (testHot(&cacheHalf, source.buffers(), numBuffers / 2 - 1) != TestPass)\n+\t\t\treturn TestFail;\n+\n+\t\treturn TestPass;\n+\t}\n+};\n+\n+} /* namespace */\n+\n+TEST_REGISTER(BufferCacheTest);\ndiff --git a/test/v4l2_videodevice/meson.build b/test/v4l2_videodevice/meson.build\nindex 5c52da7219c21cc3..685fcf6d16d72182 100644\n--- a/test/v4l2_videodevice/meson.build\n+++ b/test/v4l2_videodevice/meson.build\n@@ -5,6 +5,7 @@ v4l2_videodevice_tests = [\n [ 'controls', 'controls.cpp' ],\n [ 'formats', 'formats.cpp' ],\n [ 'request_buffers', 'request_buffers.cpp' ],\n+ [ 'buffer_cache', 'buffer_cache.cpp' ],\n [ 'stream_on_off', 'stream_on_off.cpp' ],\n [ 'capture_async', 'capture_async.cpp' ],\n [ 'buffer_sharing', 'buffer_sharing.cpp' ],\n", "prefixes": [ "libcamera-devel", "2/2" ] }