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>

6 files changed, 15 insertions, 15 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<std::unique_ptr<FrameBuffer>> *buffers);
+	int allocateBuffers(unsigned int count,
+			    std::vector<std::unique_ptr<FrameBuffer>> *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<std::unique_ptr<FrameBuffer>> *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, &paramBuffers_);
+	ret = param_->allocateBuffers(maxBuffers, &paramBuffers_);
 	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<std::unique_ptr<FrameBuffer>> *buffers)
+int V4L2VideoDevice::allocateBuffers(unsigned int count,
+				     std::vector<std::unique_ptr<FrameBuffer>> *buffers)
 {
 	if (cache_) {
 		LOG(V4L2, Error) << "Buffers already allocated";