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 --- src/libcamera/include/v4l2_videodevice.h | 4 ++-- src/libcamera/pipeline/ipu3/ipu3.cpp | 12 ++++++------ src/libcamera/pipeline/rkisp1/rkisp1.cpp | 6 +++--- src/libcamera/pipeline/uvcvideo.cpp | 2 +- src/libcamera/pipeline/vimc.cpp | 2 +- src/libcamera/v4l2_videodevice.cpp | 4 ++-- test/libtest/buffer_source.cpp | 4 ++-- 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 ++++---- 12 files changed, 28 insertions(+), 26 deletions(-) diff --git a/src/libcamera/include/v4l2_videodevice.h b/src/libcamera/include/v4l2_videodevice.h index eaf9ceda..0ff0c4c4 100644 --- a/src/libcamera/include/v4l2_videodevice.h +++ b/src/libcamera/include/v4l2_videodevice.h @@ -189,8 +189,8 @@ public: int setCrop(Rectangle *rect); int setCompose(Rectangle *rect); - int exportBuffers(unsigned int count, - std::vector> *buffers); + int allocateBuffers(unsigned int count, + std::vector> *buffers); int importBuffers(unsigned int count); int releaseBuffers(); diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index 9c7ec9ed..d7eac553 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -621,7 +621,7 @@ int PipelineHandlerIPU3::exportFrameBuffers(Camera *camera, Stream *stream, V4L2VideoDevice *video = ipu3stream->device_->dev; unsigned int count = stream->configuration().bufferCount; - return video->exportBuffers(count, buffers); + return video->allocateBuffers(count, buffers); } int PipelineHandlerIPU3::importFrameBuffers(Camera *camera, Stream *stream) @@ -677,7 +677,7 @@ int PipelineHandlerIPU3::allocateBuffers(Camera *camera) * the input pool. * \todo To be revised when we'll actually use the stat node. */ - ret = imgu->stat_.dev->exportBuffers(bufferCount, &imgu->stat_.buffers); + ret = imgu->stat_.dev->allocateBuffers(bufferCount, &imgu->stat_.buffers); if (ret < 0) { LOG(IPU3, Error) << "Failed to allocate ImgU stat buffers"; goto error; @@ -690,7 +690,7 @@ int PipelineHandlerIPU3::allocateBuffers(Camera *camera) if (!outStream->active_) { ImgUDevice::ImgUOutput *output = outStream->device_; - ret = output->dev->exportBuffers(bufferCount, &output->buffers); + ret = output->dev->allocateBuffers(bufferCount, &output->buffers); if (ret < 0) { LOG(IPU3, Error) << "Failed to allocate ImgU " << output->name << " buffers"; @@ -701,7 +701,7 @@ int PipelineHandlerIPU3::allocateBuffers(Camera *camera) if (!vfStream->active_) { ImgUDevice::ImgUOutput *output = vfStream->device_; - ret = output->dev->exportBuffers(bufferCount, &output->buffers); + ret = output->dev->allocateBuffers(bufferCount, &output->buffers); if (ret < 0) { LOG(IPU3, Error) << "Failed to allocate ImgU " << output->name << " buffers"; @@ -1422,9 +1422,9 @@ int CIO2Device::configure(const Size &size, */ int CIO2Device::allocateBuffers() { - int ret = output_->exportBuffers(CIO2_BUFFER_COUNT, &buffers_); + int ret = output_->allocateBuffers(CIO2_BUFFER_COUNT, &buffers_); if (ret < 0) - LOG(IPU3, Error) << "Failed to export CIO2 buffers"; + LOG(IPU3, Error) << "Failed to allocate CIO2 buffers"; return ret; } diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index 6ee8da35..3734bb72 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -664,7 +664,7 @@ int PipelineHandlerRkISP1::exportFrameBuffers(Camera *camera, Stream *stream, std::vector> *buffers) { unsigned int count = stream->configuration().bufferCount; - return video_->exportBuffers(count, buffers); + return video_->allocateBuffers(count, buffers); } int PipelineHandlerRkISP1::importFrameBuffers(Camera *camera, Stream *stream) @@ -688,11 +688,11 @@ int PipelineHandlerRkISP1::allocateBuffers(Camera *camera) for (const Stream *s : camera->streams()) maxBuffers = std::max(maxBuffers, s->configuration().bufferCount); - ret = param_->exportBuffers(maxBuffers, ¶mBuffers_); + ret = param_->allocateBuffers(maxBuffers, ¶mBuffers_); if (ret < 0) goto error; - ret = stat_->exportBuffers(maxBuffers, &statBuffers_); + ret = stat_->allocateBuffers(maxBuffers, &statBuffers_); if (ret < 0) goto error; diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp index 9876d8c9..10597111 100644 --- a/src/libcamera/pipeline/uvcvideo.cpp +++ b/src/libcamera/pipeline/uvcvideo.cpp @@ -211,7 +211,7 @@ int PipelineHandlerUVC::exportFrameBuffers(Camera *camera, Stream *stream, UVCCameraData *data = cameraData(camera); unsigned int count = stream->configuration().bufferCount; - return data->video_->exportBuffers(count, buffers); + return data->video_->allocateBuffers(count, buffers); } int PipelineHandlerUVC::importFrameBuffers(Camera *camera, Stream *stream) diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp index 097bbd5b..85f38693 100644 --- a/src/libcamera/pipeline/vimc.cpp +++ b/src/libcamera/pipeline/vimc.cpp @@ -264,7 +264,7 @@ int PipelineHandlerVimc::exportFrameBuffers(Camera *camera, Stream *stream, VimcCameraData *data = cameraData(camera); unsigned int count = stream->configuration().bufferCount; - return data->video_->exportBuffers(count, buffers); + return data->video_->allocateBuffers(count, buffers); } int PipelineHandlerVimc::importFrameBuffers(Camera *camera, Stream *stream) diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp index 70dd72e6..a8c6d6be 100644 --- a/src/libcamera/v4l2_videodevice.cpp +++ b/src/libcamera/v4l2_videodevice.cpp @@ -1033,8 +1033,8 @@ int V4L2VideoDevice::requestBuffers(unsigned int count) * \return The number of allocated buffers on success or a negative error code * otherwise */ -int V4L2VideoDevice::exportBuffers(unsigned int count, - std::vector> *buffers) +int V4L2VideoDevice::allocateBuffers(unsigned int count, + std::vector> *buffers) { if (cache_) { LOG(V4L2, Error) << "Buffers already allocated"; 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; } -- cgit v1.2.1