summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorNiklas Söderlund <niklas.soderlund@ragnatech.se>2019-12-18 17:38:38 +0100
committerNiklas Söderlund <niklas.soderlund@ragnatech.se>2020-01-12 16:10:38 +0100
commit66d4929c7348b36e977eb20bfd8641f2c70f051e (patch)
treeaf7a4bf0abc3838af94af733073f9b097f1d73af /test
parent9217f274f64f690b768d332663e1731a3ee5ef15 (diff)
libcamera: v4l2_videodevice: Remove Buffer interface
The Buffer interface is no longer in use and can be removed. While doing so clean up the two odd names (dequeueFrameBuffer() and queuedFrameBuffers_) that had to be used when adding the FrameBuffer interface. Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'test')
-rw-r--r--test/v4l2_videodevice/buffer_sharing.cpp4
-rw-r--r--test/v4l2_videodevice/capture_async.cpp2
-rw-r--r--test/v4l2_videodevice/v4l2_m2mdevice.cpp4
3 files changed, 5 insertions, 5 deletions
diff --git a/test/v4l2_videodevice/buffer_sharing.cpp b/test/v4l2_videodevice/buffer_sharing.cpp
index 6acb06a2..fefa969a 100644
--- a/test/v4l2_videodevice/buffer_sharing.cpp
+++ b/test/v4l2_videodevice/buffer_sharing.cpp
@@ -120,8 +120,8 @@ protected:
Timer timeout;
int ret;
- capture_->frameBufferReady.connect(this, &BufferSharingTest::captureBufferReady);
- output_->frameBufferReady.connect(this, &BufferSharingTest::outputBufferReady);
+ capture_->bufferReady.connect(this, &BufferSharingTest::captureBufferReady);
+ output_->bufferReady.connect(this, &BufferSharingTest::outputBufferReady);
for (const std::unique_ptr<FrameBuffer> &buffer : buffers_) {
if (capture_->queueBuffer(buffer.get())) {
diff --git a/test/v4l2_videodevice/capture_async.cpp b/test/v4l2_videodevice/capture_async.cpp
index a57abed3..6a103a03 100644
--- a/test/v4l2_videodevice/capture_async.cpp
+++ b/test/v4l2_videodevice/capture_async.cpp
@@ -42,7 +42,7 @@ protected:
if (ret < 0)
return TestFail;
- capture_->frameBufferReady.connect(this, &CaptureAsyncTest::receiveBuffer);
+ capture_->bufferReady.connect(this, &CaptureAsyncTest::receiveBuffer);
for (const std::unique_ptr<FrameBuffer> &buffer : buffers_) {
if (capture_->queueBuffer(buffer.get())) {
diff --git a/test/v4l2_videodevice/v4l2_m2mdevice.cpp b/test/v4l2_videodevice/v4l2_m2mdevice.cpp
index 43b99c4f..203afc4f 100644
--- a/test/v4l2_videodevice/v4l2_m2mdevice.cpp
+++ b/test/v4l2_videodevice/v4l2_m2mdevice.cpp
@@ -124,8 +124,8 @@ protected:
return TestFail;
}
- capture->frameBufferReady.connect(this, &V4L2M2MDeviceTest::receiveCaptureBuffer);
- output->frameBufferReady.connect(this, &V4L2M2MDeviceTest::outputBufferComplete);
+ capture->bufferReady.connect(this, &V4L2M2MDeviceTest::receiveCaptureBuffer);
+ output->bufferReady.connect(this, &V4L2M2MDeviceTest::outputBufferComplete);
for (const std::unique_ptr<FrameBuffer> &buffer : captureBuffers_) {
if (capture->queueBuffer(buffer.get())) {