From e349ec8c6623edfdcf66149d68dc9858c0fa5435 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= Date: Mon, 13 Apr 2020 22:56:53 +0200 Subject: libcamera: pipeline: rkisp1: Add clear() to RkISP1Frames MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When the camera is stopping the helper that keeps track of which buffers are associated with a request is not cleared. Add a clear operation and call it when the camera is stopped. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart --- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'src/libcamera/pipeline/rkisp1/rkisp1.cpp') diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index de90615e..dcc787a8 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -64,6 +64,7 @@ public: RkISP1FrameInfo *create(unsigned int frame, Request *request, Stream *stream); int destroy(unsigned int frame); + void clear(); RkISP1FrameInfo *find(unsigned int frame); RkISP1FrameInfo *find(FrameBuffer *buffer); @@ -279,6 +280,20 @@ int RkISP1Frames::destroy(unsigned int frame) return 0; } +void RkISP1Frames::clear() +{ + for (const auto &entry : frameInfo_) { + RkISP1FrameInfo *info = entry.second; + + pipe_->availableParamBuffers_.push(info->paramBuffer); + pipe_->availableStatBuffers_.push(info->statBuffer); + + delete info; + } + + frameInfo_.clear(); +} + RkISP1FrameInfo *RkISP1Frames::find(unsigned int frame) { auto itInfo = frameInfo_.find(frame); @@ -832,6 +847,8 @@ void PipelineHandlerRkISP1::stop(Camera *camera) data->timeline_.reset(); + data->frameInfo_.clear(); + freeBuffers(camera); activeCamera_ = nullptr; -- cgit v1.2.1