summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Söderlund <niklas.soderlund@ragnatech.se>2020-08-13 01:24:39 +0200
committerNiklas Söderlund <niklas.soderlund@ragnatech.se>2020-09-28 23:53:45 +0200
commitaabc50ea7f8af6bf8ffdc4091bb3d64b4ecf2de5 (patch)
tree08a4a481877ff5a58259366d542b93dbbbf48729
parent9196a07313ff3ccaffbf45092595e93ca19fa641 (diff)
libcamera: pipeline: rkisp1: Track buffers for self path
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>
-rw-r--r--src/libcamera/pipeline/rkisp1/rkisp1.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
index 28e99129..cd304948 100644
--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp
+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
@@ -69,6 +69,7 @@ struct RkISP1FrameInfo {
FrameBuffer *paramBuffer;
FrameBuffer *statBuffer;
FrameBuffer *mainPathBuffer;
+ FrameBuffer *selfPathBuffer;
bool paramFilled;
bool paramDequeued;
@@ -272,6 +273,7 @@ RkISP1FrameInfo *RkISP1Frames::create(const RkISP1CameraData *data, Request *req
FrameBuffer *statBuffer = pipe_->availableStatBuffers_.front();
FrameBuffer *mainPathBuffer = request->findBuffer(&data->mainPathStream_);
+ FrameBuffer *selfPathBuffer = request->findBuffer(&data->selfPathStream_);
pipe_->availableParamBuffers_.pop();
pipe_->availableStatBuffers_.pop();
@@ -282,6 +284,7 @@ RkISP1FrameInfo *RkISP1Frames::create(const RkISP1CameraData *data, Request *req
info->request = request;
info->paramBuffer = paramBuffer;
info->mainPathBuffer = mainPathBuffer;
+ info->selfPathBuffer = selfPathBuffer;
info->statBuffer = statBuffer;
info->paramFilled = false;
info->paramDequeued = false;
@@ -340,7 +343,8 @@ RkISP1FrameInfo *RkISP1Frames::find(FrameBuffer *buffer)
if (info->paramBuffer == buffer ||
info->statBuffer == buffer ||
- info->mainPathBuffer == buffer)
+ info->mainPathBuffer == buffer ||
+ info->selfPathBuffer == buffer)
return info;
}
@@ -412,7 +416,12 @@ protected:
pipe_->param_->queueBuffer(info->paramBuffer);
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: