PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pipeline: rpi: Rename Stream::prepareBuffers to Stream::allocateBuffers

Browse Source 
This rename is in preparation for a subsequent change where only
buffer allocations happen in this function.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
This commit is contained in:
Naushir Patuck
2025-12-18 12:31:23 +00:00
committed by Barnabás Pőcze
parent 03fc5f6c94
commit 9bb64d2c8e
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libcamera/pipeline/rpi/common/pipeline_base.cpp
View File

@@ -668,7 +668,7 @@ int PipelineHandlerBase::start(Camera *camera, const ControlList *controls)
if (!data->buffersAllocated_) {
/* Allocate buffers for internal pipeline usage. */
ret = prepareBuffers(camera);
ret = allocateBuffers(camera);
if (ret) {
LOG(RPI, Error) << "Failed to allocate buffers";
data->freeBuffers();

2
src/libcamera/pipeline/rpi/common/pipeline_base.h
View File

@@ -242,7 +242,7 @@ private:
}
int queueAllBuffers(Camera *camera);
virtual int prepareBuffers(Camera *camera) = 0;
virtual int allocateBuffers(Camera *camera) = 0;
};
class RPiCameraConfiguration final : public CameraConfiguration

2
src/libcamera/pipeline/rpi/common/rpi_stream.cpp
View File

@@ -106,7 +106,7 @@ void Stream::setExportedBuffer(FrameBuffer *buffer)
bufferEmplace(++id_, buffer);
}
int Stream::prepareBuffers(unsigned int count)
int Stream::allocateBuffers(unsigned int count)
{
int ret;

2
src/libcamera/pipeline/rpi/common/rpi_stream.h
View File

@@ -125,7 +125,7 @@ public:
void setExportedBuffer(FrameBuffer *buffer);
int prepareBuffers(unsigned int count);
int allocateBuffers(unsigned int count);
int queueBuffer(FrameBuffer *buffer);
void returnBuffer(FrameBuffer *buffer);

6
src/libcamera/pipeline/rpi/pisp/pisp.cpp
View File

@@ -864,7 +864,7 @@ private:
return static_cast<PiSPCameraData *>(camera->_d());
}
int prepareBuffers(Camera *camera) override;
int allocateBuffers(Camera *camera) override;
int platformRegister(std::unique_ptr<RPi::CameraData> &cameraData,
std::shared_ptr<MediaDevice> cfe,
std::shared_ptr<MediaDevice> isp) override;
@@ -958,7 +958,7 @@ bool PipelineHandlerPiSP::match(DeviceEnumerator *enumerator)
return false;
}
int PipelineHandlerPiSP::prepareBuffers(Camera *camera)
int PipelineHandlerPiSP::allocateBuffers(Camera *camera)
{
PiSPCameraData *data = cameraData(camera);
unsigned int numRawBuffers = 0;
@@ -1021,7 +1021,7 @@ int PipelineHandlerPiSP::prepareBuffers(Camera *camera)
LOG(RPI, Debug) << "Preparing " << numBuffers
<< " buffers for stream " << stream->name();
ret = stream->prepareBuffers(numBuffers);
ret = stream->allocateBuffers(numBuffers);
if (ret < 0)
return ret;
}

6
src/libcamera/pipeline/rpi/vc4/vc4.cpp
View File

@@ -158,7 +158,7 @@ private:
return static_cast<Vc4CameraData *>(camera->_d());
}
int prepareBuffers(Camera *camera) override;
int allocateBuffers(Camera *camera) override;
int platformRegister(std::unique_ptr<RPi::CameraData> &cameraData,
std::shared_ptr<MediaDevice> unicam,
std::shared_ptr<MediaDevice> isp) override;
@@ -219,7 +219,7 @@ bool PipelineHandlerVc4::match(DeviceEnumerator *enumerator)
return false;
}
int PipelineHandlerVc4::prepareBuffers(Camera *camera)
int PipelineHandlerVc4::allocateBuffers(Camera *camera)
{
Vc4CameraData *data = cameraData(camera);
unsigned int numRawBuffers = 0;
@@ -289,7 +289,7 @@ int PipelineHandlerVc4::prepareBuffers(Camera *camera)
LOG(RPI, Debug) << "Preparing " << numBuffers
<< " buffers for stream " << stream->name();
ret = stream->prepareBuffers(numBuffers);
ret = stream->allocateBuffers(numBuffers);
if (ret < 0)
return ret;
}