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

libcamera: pipeline: rkisp1: Track buffers for self path

Browse Source 
In preparation of supporting both the main and self path extend
RkISP1FrameInfo to track buffers from the self path stream.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Niklas Söderlund
2020-08-13 01:24:39 +02:00
parent 9196a07313
commit aabc50ea7f
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcamera/pipeline/rkisp1/rkisp1.cpp
+11 -2
View File
@@ -69,6 +69,7 @@ struct RkISP1FrameInfo {
FrameBuffer *paramBuffer; FrameBuffer *paramBuffer;
FrameBuffer *statBuffer; FrameBuffer *statBuffer;
FrameBuffer *mainPathBuffer; FrameBuffer *mainPathBuffer;
FrameBuffer *selfPathBuffer;
bool paramFilled; bool paramFilled;
bool paramDequeued; bool paramDequeued;
@@ -272,6 +273,7 @@ RkISP1FrameInfo *RkISP1Frames::create(const RkISP1CameraData *data, Request *req
FrameBuffer *statBuffer = pipe_->availableStatBuffers_.front(); FrameBuffer *statBuffer = pipe_->availableStatBuffers_.front();
FrameBuffer *mainPathBuffer = request->findBuffer(&data->mainPathStream_); FrameBuffer *mainPathBuffer = request->findBuffer(&data->mainPathStream_);
FrameBuffer *selfPathBuffer = request->findBuffer(&data->selfPathStream_);
pipe_->availableParamBuffers_.pop(); pipe_->availableParamBuffers_.pop();
pipe_->availableStatBuffers_.pop(); pipe_->availableStatBuffers_.pop();
@@ -282,6 +284,7 @@ RkISP1FrameInfo *RkISP1Frames::create(const RkISP1CameraData *data, Request *req
info->request = request; info->request = request;
info->paramBuffer = paramBuffer; info->paramBuffer = paramBuffer;
info->mainPathBuffer = mainPathBuffer; info->mainPathBuffer = mainPathBuffer;
info->selfPathBuffer = selfPathBuffer;
info->statBuffer = statBuffer; info->statBuffer = statBuffer;
info->paramFilled = false; info->paramFilled = false;
info->paramDequeued = false; info->paramDequeued = false;
@@ -340,7 +343,8 @@ RkISP1FrameInfo *RkISP1Frames::find(FrameBuffer *buffer)
if (info->paramBuffer == buffer || if (info->paramBuffer == buffer ||
info->statBuffer == buffer || info->statBuffer == buffer ||
info->mainPathBuffer == buffer) info->mainPathBuffer == buffer ||
info->selfPathBuffer == buffer)
return info; return info;
} }
@@ -412,7 +416,12 @@ protected:
pipe_->param_->queueBuffer(info->paramBuffer); pipe_->param_->queueBuffer(info->paramBuffer);
pipe_->stat_->queueBuffer(info->statBuffer); pipe_->stat_->queueBuffer(info->statBuffer);
pipe_->mainPathVideo_->queueBuffer(info->mainPathBuffer);
if (info->mainPathBuffer)
pipe_->mainPathVideo_->queueBuffer(info->mainPathBuffer);
if (info->selfPathBuffer)
pipe_->selfPathVideo_->queueBuffer(info->selfPathBuffer);
} }
private: private: