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

libcamera: ipu3: cio2: Hide buffer allocation and freeing from users

Browse Source 
The allocation and freeing of buffers for the CIO2 is handled in the
IPU3 pipeline handlers start() and stop() functions. These functions
also call CIO2Device start() and stop() at the appropriate times so
move the CIO2 buffer allocation/freeing inside the CIO2Device and reduce
the complexity of the exposed interface.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Niklas Söderlund
2020-06-01 23:20:48 +02:00
parent bb82835bc5
commit a96eb0cc8f
3 changed files with 33 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcamera/pipeline/ipu3/cio2.cpp
+28 -34
View File
@@ -207,44 +207,12 @@ CIO2Device::generateConfiguration(Size size) const
return cfg;
}
/**
* \brief Allocate frame buffers for the CIO2 output
*
* Allocate frame buffers in the CIO2 video device to be used to capture frames
* from the CIO2 output. The buffers are stored in the CIO2Device::buffers_
* vector.
*
* \return Number of buffers allocated or negative error code
*/
int CIO2Device::allocateBuffers()
{
int ret = output_->allocateBuffers(CIO2_BUFFER_COUNT, &buffers_);
if (ret < 0)
return ret;
for (std::unique_ptr<FrameBuffer> &buffer : buffers_)
availableBuffers_.push(buffer.get());
return ret;
}
int CIO2Device::exportBuffers(unsigned int count,
std::vector<std::unique_ptr<FrameBuffer>> *buffers)
{
return output_->exportBuffers(count, buffers);
}
void CIO2Device::freeBuffers()
{
/* The default std::queue constructor is explicit with gcc 5 and 6. */
availableBuffers_ = std::queue<FrameBuffer *>{};
buffers_.clear();
if (output_->releaseBuffers())
LOG(IPU3, Error) << "Failed to release CIO2 buffers";
}
FrameBuffer *CIO2Device::getBuffer()
{
if (availableBuffers_.empty()) {
@@ -266,12 +234,27 @@ void CIO2Device::putBuffer(FrameBuffer *buffer)
int CIO2Device::start()
{
return output_->streamOn();
int ret = output_->allocateBuffers(CIO2_BUFFER_COUNT, &buffers_);
if (ret < 0)
return ret;
for (std::unique_ptr<FrameBuffer> &buffer : buffers_)
availableBuffers_.push(buffer.get());
ret = output_->streamOn();
if (ret)
freeBuffers();
return ret;
}
int CIO2Device::stop()
{
return output_->streamOff();
int ret = output_->streamOff();
freeBuffers();
return ret;
}
int CIO2Device::queueBuffer(FrameBuffer *buffer)
@@ -279,6 +262,17 @@ int CIO2Device::queueBuffer(FrameBuffer *buffer)
return output_->queueBuffer(buffer);
}
void CIO2Device::freeBuffers()
{
/* The default std::queue constructor is explicit with gcc 5 and 6. */
availableBuffers_ = std::queue<FrameBuffer *>{};
buffers_.clear();
if (output_->releaseBuffers())
LOG(IPU3, Error) << "Failed to release CIO2 buffers";
}
void CIO2Device::cio2BufferReady(FrameBuffer *buffer)
{
bufferReady.emit(buffer);