{"id":2463,"url":"https://patchwork.libcamera.org/api/patches/2463/?format=json","web_url":"https://patchwork.libcamera.org/patch/2463/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20191230120510.938333-14-niklas.soderlund@ragnatech.se>","date":"2019-12-30T12:04:58","name":"[libcamera-devel,v2,13/25] test: v4l2_videodevice: Switch to FrameBuffer interface","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"5a65b96bf3d40b5aae0c0c133f7b9052a9db0f6d","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2463/mbox/","series":[{"id":593,"url":"https://patchwork.libcamera.org/api/series/593/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=593","date":"2019-12-30T12:04:45","name":"libcamera: Rework buffer API","version":2,"mbox":"https://patchwork.libcamera.org/series/593/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2463/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2463/checks/","tags":{},"headers":{"Return-Path":"","Received":["from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net\n\t[195.74.38.228])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A8E326046C\n\tfor ;\n\tMon, 30 Dec 2019 13:06:00 +0100 (CET)","from bismarck.berto.se (p4fca2fd0.dip0.t-ipconnect.de\n\t[79.202.47.208]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid bdea377f-2afc-11ea-a00b-005056917a89;\n\tMon, 30 Dec 2019 13:05:59 +0100 (CET)"],"X-Halon-ID":"bdea377f-2afc-11ea-a00b-005056917a89","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 30 Dec 2019 13:04:58 +0100","Message-Id":"<20191230120510.938333-14-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.24.1","In-Reply-To":"<20191230120510.938333-1-niklas.soderlund@ragnatech.se>","References":"<20191230120510.938333-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 13/25] test: v4l2_videodevice: Switch\n\tto FrameBuffer interface","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Mon, 30 Dec 2019 12:06:00 -0000"},"content":"The V4L2VideoDevice class can now operate using a FrameBuffer interface,\nswitch all test cases to use it.\n\nSigned-off-by: Niklas Söderlund \n---\n test/v4l2_videodevice/buffer_sharing.cpp | 30 ++++++-------\n test/v4l2_videodevice/capture_async.cpp | 20 ++++-----\n test/v4l2_videodevice/request_buffers.cpp | 11 +----\n test/v4l2_videodevice/stream_on_off.cpp | 6 +--\n test/v4l2_videodevice/v4l2_m2mdevice.cpp | 44 ++++++++-----------\n test/v4l2_videodevice/v4l2_videodevice_test.h | 2 +-\n 6 files changed, 48 insertions(+), 65 deletions(-)","diff":"diff --git a/test/v4l2_videodevice/buffer_sharing.cpp b/test/v4l2_videodevice/buffer_sharing.cpp\nindex fe48b2e98fdada8d..6acb06a24b47f653 100644\n--- a/test/v4l2_videodevice/buffer_sharing.cpp\n+++ b/test/v4l2_videodevice/buffer_sharing.cpp\n@@ -73,16 +73,14 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tpool_.createBuffers(bufferCount);\n-\n-\t\tret = capture_->exportBuffers(&pool_);\n-\t\tif (ret) {\n-\t\t\tstd::cout << \"Failed to export buffers\" << std::endl;\n+\t\tret = capture_->exportBuffers(bufferCount, &buffers_);\n+\t\tif (ret < 0) {\n+\t\t\tstd::cout << \"Failed to allocate buffers\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tret = output_->importBuffers(&pool_);\n-\t\tif (ret) {\n+\t\tret = output_->importBuffers(bufferCount);\n+\t\tif (ret < 0) {\n \t\t\tstd::cout << \"Failed to import buffers\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n@@ -90,7 +88,7 @@ protected:\n \t\treturn 0;\n \t}\n \n-\tvoid captureBufferReady(Buffer *buffer)\n+\tvoid captureBufferReady(FrameBuffer *buffer)\n \t{\n \t\tconst FrameMetadata &metadata = buffer->metadata();\n \n@@ -103,7 +101,7 @@ protected:\n \t\tframesCaptured_++;\n \t}\n \n-\tvoid outputBufferReady(Buffer *buffer)\n+\tvoid outputBufferReady(FrameBuffer *buffer)\n \t{\n \t\tconst FrameMetadata &metadata = buffer->metadata();\n \n@@ -122,13 +120,15 @@ protected:\n \t\tTimer timeout;\n \t\tint ret;\n \n-\t\tcapture_->bufferReady.connect(this, &BufferSharingTest::captureBufferReady);\n-\t\toutput_->bufferReady.connect(this, &BufferSharingTest::outputBufferReady);\n+\t\tcapture_->frameBufferReady.connect(this, &BufferSharingTest::captureBufferReady);\n+\t\toutput_->frameBufferReady.connect(this, &BufferSharingTest::outputBufferReady);\n \n-\t\tstd::vector> buffers;\n-\t\tbuffers = capture_->queueAllBuffers();\n-\t\tif (buffers.empty())\n-\t\t\treturn TestFail;\n+\t\tfor (const std::unique_ptr &buffer : buffers_) {\n+\t\t\tif (capture_->queueBuffer(buffer.get())) {\n+\t\t\t\tstd::cout << \"Failed to queue buffer\" << std::endl;\n+\t\t\t\treturn TestFail;\n+\t\t\t}\n+\t\t}\n \n \t\tret = capture_->streamOn();\n \t\tif (ret) {\ndiff --git a/test/v4l2_videodevice/capture_async.cpp b/test/v4l2_videodevice/capture_async.cpp\nindex f62bbd837b213a0a..a57abed3bd0debc1 100644\n--- a/test/v4l2_videodevice/capture_async.cpp\n+++ b/test/v4l2_videodevice/capture_async.cpp\n@@ -20,7 +20,7 @@ public:\n \tCaptureAsyncTest()\n \t\t: V4L2VideoDeviceTest(\"vimc\", \"Raw Capture 0\"), frames(0) {}\n \n-\tvoid receiveBuffer(Buffer *buffer)\n+\tvoid receiveBuffer(FrameBuffer *buffer)\n \t{\n \t\tstd::cout << \"Buffer received\" << std::endl;\n \t\tframes++;\n@@ -38,18 +38,18 @@ protected:\n \t\tTimer timeout;\n \t\tint ret;\n \n-\t\tpool_.createBuffers(bufferCount);\n-\n-\t\tret = capture_->exportBuffers(&pool_);\n-\t\tif (ret)\n+\t\tret = capture_->exportBuffers(bufferCount, &buffers_);\n+\t\tif (ret < 0)\n \t\t\treturn TestFail;\n \n-\t\tcapture_->bufferReady.connect(this, &CaptureAsyncTest::receiveBuffer);\n+\t\tcapture_->frameBufferReady.connect(this, &CaptureAsyncTest::receiveBuffer);\n \n-\t\tstd::vector> buffers;\n-\t\tbuffers = capture_->queueAllBuffers();\n-\t\tif (buffers.empty())\n-\t\t\treturn TestFail;\n+\t\tfor (const std::unique_ptr &buffer : buffers_) {\n+\t\t\tif (capture_->queueBuffer(buffer.get())) {\n+\t\t\t\tstd::cout << \"Failed to queue buffer\" << std::endl;\n+\t\t\t\treturn TestFail;\n+\t\t\t}\n+\t\t}\n \n \t\tret = capture_->streamOn();\n \t\tif (ret)\ndiff --git a/test/v4l2_videodevice/request_buffers.cpp b/test/v4l2_videodevice/request_buffers.cpp\nindex c4aedf7b3cd61e80..1dd65b05da430e63 100644\n--- a/test/v4l2_videodevice/request_buffers.cpp\n+++ b/test/v4l2_videodevice/request_buffers.cpp\n@@ -16,17 +16,10 @@ public:\n protected:\n \tint run()\n \t{\n-\t\t/*\n-\t\t * TODO:\n-\t\t * Test invalid requests\n-\t\t * Test different buffer allocations\n-\t\t */\n \t\tconst unsigned int bufferCount = 8;\n \n-\t\tpool_.createBuffers(bufferCount);\n-\n-\t\tint ret = capture_->exportBuffers(&pool_);\n-\t\tif (ret)\n+\t\tint ret = capture_->exportBuffers(bufferCount, &buffers_);\n+\t\tif (ret != bufferCount)\n \t\t\treturn TestFail;\n \n \t\treturn TestPass;\ndiff --git a/test/v4l2_videodevice/stream_on_off.cpp b/test/v4l2_videodevice/stream_on_off.cpp\nindex 7664adc4c1f07046..552df0963633ae4b 100644\n--- a/test/v4l2_videodevice/stream_on_off.cpp\n+++ b/test/v4l2_videodevice/stream_on_off.cpp\n@@ -17,10 +17,8 @@ protected:\n \t{\n \t\tconst unsigned int bufferCount = 8;\n \n-\t\tpool_.createBuffers(bufferCount);\n-\n-\t\tint ret = capture_->exportBuffers(&pool_);\n-\t\tif (ret)\n+\t\tint ret = capture_->exportBuffers(bufferCount, &buffers_);\n+\t\tif (ret < 0)\n \t\t\treturn TestFail;\n \n \t\tret = capture_->streamOn();\ndiff --git a/test/v4l2_videodevice/v4l2_m2mdevice.cpp b/test/v4l2_videodevice/v4l2_m2mdevice.cpp\nindex 442bcac5dc49cc59..43b99c4f7ea9bf26 100644\n--- a/test/v4l2_videodevice/v4l2_m2mdevice.cpp\n+++ b/test/v4l2_videodevice/v4l2_m2mdevice.cpp\n@@ -29,7 +29,7 @@ public:\n \t{\n \t}\n \n-\tvoid outputBufferComplete(Buffer *buffer)\n+\tvoid outputBufferComplete(FrameBuffer *buffer)\n \t{\n \t\tcout << \"Received output buffer\" << endl;\n \n@@ -39,7 +39,7 @@ public:\n \t\tvim2m_->output()->queueBuffer(buffer);\n \t}\n \n-\tvoid receiveCaptureBuffer(Buffer *buffer)\n+\tvoid receiveCaptureBuffer(FrameBuffer *buffer)\n \t{\n \t\tcout << \"Received capture buffer\" << endl;\n \n@@ -112,39 +112,31 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tcapturePool_.createBuffers(bufferCount);\n-\t\toutputPool_.createBuffers(bufferCount);\n-\n-\t\tret = capture->exportBuffers(&capturePool_);\n-\t\tif (ret) {\n+\t\tret = capture->exportBuffers(bufferCount, &captureBuffers_);\n+\t\tif (ret < 0) {\n \t\t\tcerr << \"Failed to export Capture Buffers\" << endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tret = output->exportBuffers(&outputPool_);\n-\t\tif (ret) {\n+\t\tret = output->exportBuffers(bufferCount, &outputBuffers_);\n+\t\tif (ret < 0) {\n \t\t\tcerr << \"Failed to export Output Buffers\" << endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tcapture->bufferReady.connect(this, &V4L2M2MDeviceTest::receiveCaptureBuffer);\n-\t\toutput->bufferReady.connect(this, &V4L2M2MDeviceTest::outputBufferComplete);\n+\t\tcapture->frameBufferReady.connect(this, &V4L2M2MDeviceTest::receiveCaptureBuffer);\n+\t\toutput->frameBufferReady.connect(this, &V4L2M2MDeviceTest::outputBufferComplete);\n \n-\t\tstd::vector> captureBuffers;\n-\t\tcaptureBuffers = 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\tfor (const std::unique_ptr &buffer : captureBuffers_) {\n+\t\t\tif (capture->queueBuffer(buffer.get())) {\n+\t\t\t\tstd::cout << \"Failed to queue capture buffer\" << std::endl;\n+\t\t\t\treturn TestFail;\n+\t\t\t}\n \t\t}\n \n-\t\t/* We can't \"queueAllBuffers()\" on an output device, so we do it manually */\n-\t\tstd::vector> 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 = output->queueBuffer(buffer);\n-\t\t\tif (ret) {\n-\t\t\t\tcerr << \"Failed to queue output buffer\" << i << endl;\n+\t\tfor (const std::unique_ptr &buffer : outputBuffers_) {\n+\t\t\tif (output->queueBuffer(buffer.get())) {\n+\t\t\t\tstd::cout << \"Failed to queue output buffer\" << std::endl;\n \t\t\t\treturn TestFail;\n \t\t\t}\n \t\t}\n@@ -202,8 +194,8 @@ private:\n \tstd::shared_ptr media_;\n \tV4L2M2MDevice *vim2m_;\n \n-\tBufferPool capturePool_;\n-\tBufferPool outputPool_;\n+\tstd::vector> captureBuffers_;\n+\tstd::vector> outputBuffers_;\n \n \tunsigned int outputFrames_;\n \tunsigned int captureFrames_;\ndiff --git a/test/v4l2_videodevice/v4l2_videodevice_test.h b/test/v4l2_videodevice/v4l2_videodevice_test.h\nindex 34dd231c6d9d108d..9acaceb84fe0a12f 100644\n--- a/test/v4l2_videodevice/v4l2_videodevice_test.h\n+++ b/test/v4l2_videodevice/v4l2_videodevice_test.h\n@@ -41,7 +41,7 @@ protected:\n \tCameraSensor *sensor_;\n \tV4L2Subdevice *debayer_;\n \tV4L2VideoDevice *capture_;\n-\tBufferPool pool_;\n+\tstd::vector> buffers_;\n };\n \n #endif /* __LIBCAMERA_V4L2_DEVICE_TEST_H_ */\n","prefixes":["libcamera-devel","v2","13/25"]}