Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-23 00:25:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

libcamera: ipu3: cio2: Return the FrameBuffer pointer used

Browse source 
When adding IPA plumbing to the IPU3 pipeline handler it will be needed
to track which raw buffer was queued to the CIO2 for a specific request.
Currently if using an internally allocated raw buffer the FrameBuffer is
not exposed outside the CIO2Device as it was not needed. Prepare for the
IPA by exposing which internal raw buffer is picked for each request,
later changes will associate this with a Request.

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-11-04 14:32:11 +01:00
parent d4225a23ae
commit 354f1fb933
3 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libcamera/pipeline/ipu3/cio2.cpp
View file

@ -253,7 +253,7 @@ int CIO2Device::stop()
return ret;
}
int CIO2Device::queueBuffer(Request *request, FrameBuffer *rawBuffer)
FrameBuffer *CIO2Device::queueBuffer(Request *request, FrameBuffer *rawBuffer)
{
FrameBuffer *buffer = rawBuffer;
@ -261,7 +261,7 @@ int CIO2Device::queueBuffer(Request *request, FrameBuffer *rawBuffer)
if (!buffer) {
if (availableBuffers_.empty()) {
LOG(IPU3, Error) << "CIO2 buffer underrun";
return -EINVAL;
return nullptr;
}
buffer = availableBuffers_.front();
@ -270,7 +270,11 @@ int CIO2Device::queueBuffer(Request *request, FrameBuffer *rawBuffer)
buffer->setRequest(request);
return output_->queueBuffer(buffer);
int ret = output_->queueBuffer(buffer);
if (ret)
return nullptr;
return buffer;
}
void CIO2Device::tryReturnBuffer(FrameBuffer *buffer)

2
src/libcamera/pipeline/ipu3/cio2.h
View file

@ -51,7 +51,7 @@ public:
CameraSensor *sensor() { return sensor_.get(); }
const CameraSensor *sensor() const { return sensor_.get(); }
int queueBuffer(Request *request, FrameBuffer *rawBuffer);
FrameBuffer *queueBuffer(Request *request, FrameBuffer *rawBuffer);
void tryReturnBuffer(FrameBuffer *buffer);
Signal<FrameBuffer *> &bufferReady() { return output_->bufferReady; }

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

@ -646,10 +646,10 @@ int PipelineHandlerIPU3::queueRequestDevice(Camera *camera, Request *request)
* Queue a buffer on the CIO2, using the raw stream buffer provided in
* the request, if any, or a CIO2 internal buffer otherwise.
*/
FrameBuffer *rawBuffer = request->findBuffer(&data->rawStream_);
error = data->cio2_.queueBuffer(request, rawBuffer);
if (error)
return error;
FrameBuffer *reqRawBuffer = request->findBuffer(&data->rawStream_);
FrameBuffer *rawBuffer = data->cio2_.queueBuffer(request, reqRawBuffer);
if (!rawBuffer)
return -ENOMEM;
/* Queue all buffers from the request aimed for the ImgU. */
for (auto it : request->buffers()) {