summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/libtest/buffer_source.cpp4
-rw-r--r--test/v4l2_videodevice/buffer_sharing.cpp2
-rw-r--r--test/v4l2_videodevice/capture_async.cpp6
-rw-r--r--test/v4l2_videodevice/request_buffers.cpp2
-rw-r--r--test/v4l2_videodevice/stream_on_off.cpp2
-rw-r--r--test/v4l2_videodevice/v4l2_m2mdevice.cpp8
6 files changed, 13 insertions, 11 deletions
diff --git a/test/libtest/buffer_source.cpp b/test/libtest/buffer_source.cpp
index 0c33200b..26d2764d 100644
--- a/test/libtest/buffer_source.cpp
+++ b/test/libtest/buffer_source.cpp
@@ -76,8 +76,8 @@ int BufferSource::allocate(const StreamConfiguration &config)
return TestFail;
}
- if (video->exportBuffers(config.bufferCount, &buffers_) < 0) {
- std::cout << "Failed to export buffers" << std::endl;
+ if (video->allocateBuffers(config.bufferCount, &buffers_) < 0) {
+ std::cout << "Failed to allocate buffers" << std::endl;
return TestFail;
}
diff --git a/test/v4l2_videodevice/buffer_sharing.cpp b/test/v4l2_videodevice/buffer_sharing.cpp
index fefa969a..14d3055a 100644
--- a/test/v4l2_videodevice/buffer_sharing.cpp
+++ b/test/v4l2_videodevice/buffer_sharing.cpp
@@ -73,7 +73,7 @@ protected:
return TestFail;
}
- ret = capture_->exportBuffers(bufferCount, &buffers_);
+ ret = capture_->allocateBuffers(bufferCount, &buffers_);
if (ret < 0) {
std::cout << "Failed to allocate buffers" << std::endl;
return TestFail;
diff --git a/test/v4l2_videodevice/capture_async.cpp b/test/v4l2_videodevice/capture_async.cpp
index 6a103a03..b38aabc6 100644
--- a/test/v4l2_videodevice/capture_async.cpp
+++ b/test/v4l2_videodevice/capture_async.cpp
@@ -38,9 +38,11 @@ protected:
Timer timeout;
int ret;
- ret = capture_->exportBuffers(bufferCount, &buffers_);
- if (ret < 0)
+ ret = capture_->allocateBuffers(bufferCount, &buffers_);
+ if (ret < 0) {
+ std::cout << "Failed to allocate buffers" << std::endl;
return TestFail;
+ }
capture_->bufferReady.connect(this, &CaptureAsyncTest::receiveBuffer);
diff --git a/test/v4l2_videodevice/request_buffers.cpp b/test/v4l2_videodevice/request_buffers.cpp
index 1dd65b05..2f8dfe1c 100644
--- a/test/v4l2_videodevice/request_buffers.cpp
+++ b/test/v4l2_videodevice/request_buffers.cpp
@@ -18,7 +18,7 @@ protected:
{
const unsigned int bufferCount = 8;
- int ret = capture_->exportBuffers(bufferCount, &buffers_);
+ int ret = capture_->allocateBuffers(bufferCount, &buffers_);
if (ret != bufferCount)
return TestFail;
diff --git a/test/v4l2_videodevice/stream_on_off.cpp b/test/v4l2_videodevice/stream_on_off.cpp
index 552df096..ce48310a 100644
--- a/test/v4l2_videodevice/stream_on_off.cpp
+++ b/test/v4l2_videodevice/stream_on_off.cpp
@@ -17,7 +17,7 @@ protected:
{
const unsigned int bufferCount = 8;
- int ret = capture_->exportBuffers(bufferCount, &buffers_);
+ int ret = capture_->allocateBuffers(bufferCount, &buffers_);
if (ret < 0)
return TestFail;
diff --git a/test/v4l2_videodevice/v4l2_m2mdevice.cpp b/test/v4l2_videodevice/v4l2_m2mdevice.cpp
index 203afc4f..d20e5dfc 100644
--- a/test/v4l2_videodevice/v4l2_m2mdevice.cpp
+++ b/test/v4l2_videodevice/v4l2_m2mdevice.cpp
@@ -112,15 +112,15 @@ protected:
return TestFail;
}
- ret = capture->exportBuffers(bufferCount, &captureBuffers_);
+ ret = capture->allocateBuffers(bufferCount, &captureBuffers_);
if (ret < 0) {
- cerr << "Failed to export Capture Buffers" << endl;
+ cerr << "Failed to allocate Capture Buffers" << endl;
return TestFail;
}
- ret = output->exportBuffers(bufferCount, &outputBuffers_);
+ ret = output->allocateBuffers(bufferCount, &outputBuffers_);
if (ret < 0) {
- cerr << "Failed to export Output Buffers" << endl;
+ cerr << "Failed to allocate Output Buffers" << endl;
return TestFail;
}