From patchwork Mon Apr 13 21:26:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 3450 Return-Path: Received: from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net [195.74.38.228]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E5DD062DD9 for ; Mon, 13 Apr 2020 23:27:09 +0200 (CEST) X-Halon-ID: 838d85e6-7dcd-11ea-aeed-005056917f90 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (p4fca2392.dip0.t-ipconnect.de [79.202.35.146]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA id 838d85e6-7dcd-11ea-aeed-005056917f90; Mon, 13 Apr 2020 23:27:01 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Mon, 13 Apr 2020 23:26:56 +0200 Message-Id: <20200413212700.1373247-5-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200413212700.1373247-1-niklas.soderlund@ragnatech.se> References: <20200413212700.1373247-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 4/8] libcamera: pipeline: rkisp1: Add clear() to RkISP1Frames X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Apr 2020 21:27:11 -0000 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 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index de90615edf217cca..c4e46bea1cc9a47f 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,21 @@ int RkISP1Frames::destroy(unsigned int frame) return 0; } +void RkISP1Frames::clear() +{ + auto it = frameInfo_.cbegin(); + while (it != frameInfo_.cend()) { + RkISP1FrameInfo *info = it->second; + + pipe_->availableParamBuffers_.push(info->paramBuffer); + pipe_->availableStatBuffers_.push(info->statBuffer); + + it = frameInfo_.erase(it); + + delete info; + } +} + RkISP1FrameInfo *RkISP1Frames::find(unsigned int frame) { auto itInfo = frameInfo_.find(frame); @@ -832,6 +848,8 @@ void PipelineHandlerRkISP1::stop(Camera *camera) data->timeline_.reset(); + data->frameInfo_.clear(); + freeBuffers(camera); activeCamera_ = nullptr;