From 46011623bca91877400481cb738064eb4e3cee92 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 14 Mar 2020 18:36:48 +0200 Subject: libcamera: v4l2_videodevice: Rename exportBuffers() to allocateBuffers() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To prepare for the rework of buffer allocation that will differentiate export and allocation, rename exportBuffers() to allocateBuffers(). Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- test/v4l2_videodevice/buffer_sharing.cpp | 2 +- test/v4l2_videodevice/capture_async.cpp | 6 ++++-- test/v4l2_videodevice/request_buffers.cpp | 2 +- test/v4l2_videodevice/stream_on_off.cpp | 2 +- test/v4l2_videodevice/v4l2_m2mdevice.cpp | 8 ++++---- 5 files changed, 11 insertions(+), 9 deletions(-) (limited to 'test/v4l2_videodevice') 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; } -- cgit v1.2.1