summaryrefslogtreecommitdiff
path: root/src/libcamera/pipeline/ipu3
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-03-14 18:36:48 +0200
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-03-18 19:15:18 +0200
commit46011623bca91877400481cb738064eb4e3cee92 (patch)
tree232c91ca892216f2c333f405647ffe68a1a83792 /src/libcamera/pipeline/ipu3
parent556e03fea711971e21745fb8ea8cdefff78a04a4 (diff)
libcamera: v4l2_videodevice: Rename exportBuffers() to allocateBuffers()
To prepare for the rework of buffer allocation that will differentiate export and allocation, rename exportBuffers() to allocateBuffers(). Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Diffstat (limited to 'src/libcamera/pipeline/ipu3')
-rw-r--r--src/libcamera/pipeline/ipu3/ipu3.cpp12
1 files changed, 6 insertions, 6 deletions
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;
}