NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: v4l2_videodevice: Rename exportBuffers() to allocateBuffers()

Browse source 
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>
This commit is contained in:
Laurent Pinchart 2020-03-14 18:36:48 +02:00
parent 556e03fea7
commit 46011623bc
12 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libcamera/include/v4l2_videodevice.h
View file

@ -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();

12
src/libcamera/pipeline/ipu3/ipu3.cpp
View file

@ -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;
}

6
src/libcamera/pipeline/rkisp1/rkisp1.cpp
View file

@ -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;

2
src/libcamera/pipeline/uvcvideo.cpp
View file

@ -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)

2
src/libcamera/pipeline/vimc.cpp
View file

@ -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)

4
src/libcamera/v4l2_videodevice.cpp
View file

@ -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";

4
test/libtest/buffer_source.cpp
View file

@ -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;
}

2
test/v4l2_videodevice/buffer_sharing.cpp
View file

@ -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;

6
test/v4l2_videodevice/capture_async.cpp
View file

@ -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);

2
test/v4l2_videodevice/request_buffers.cpp
View file

@ -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;

2
test/v4l2_videodevice/stream_on_off.cpp
View file

@ -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;

8
test/v4l2_videodevice/v4l2_m2mdevice.cpp
View file

@ -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;
}