From patchwork Sat Aug 31 21:02:19 2019 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: 1906 X-Patchwork-Delegate: niklas.soderlund@ragnatech.se Return-Path: Received: from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net [195.74.38.227]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 6B4E160E2A for ; Sat, 31 Aug 2019 23:03:02 +0200 (CEST) X-Halon-ID: b6e87e3a-cc32-11e9-903a-005056917f90 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (unknown [84.172.84.18]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA id b6e87e3a-cc32-11e9-903a-005056917f90; Sat, 31 Aug 2019 23:03:00 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Sat, 31 Aug 2019 23:02:19 +0200 Message-Id: <20190831210220.29819-6-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20190831210220.29819-1-niklas.soderlund@ragnatech.se> References: <20190831210220.29819-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 5/6] libcamera: pipeline: rkisp1: Add plumbing for IPA meta data X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Aug 2019 21:03:03 -0000 Connect the pipeline handler to the IPA meta data signal. Add a check for that IPA meta data is available to the conditions for completing a request to the application. Signed-off-by: Niklas Söderlund --- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index ab7c595f1e3bd39f..501edc20bb43514f 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -51,6 +51,7 @@ public: private: void updateSensor(V4L2ControlList controls); void queueRequestHardware(const void *cookie); + void metaDataReady(const void *cookie, IPAMetaData metaData); }; class RkISP1RequestData : public RequestData @@ -143,6 +144,8 @@ int RkISP1CameraData::initIPA() &RkISP1CameraData::updateSensor); ipa_->queueRequest.connect(this, &RkISP1CameraData::queueRequestHardware); + ipa_->metaDataReady.connect(this, + &RkISP1CameraData::metaDataReady); return 0; } @@ -175,6 +178,17 @@ void RkISP1CameraData::queueRequestHardware(const void *cookie) LOG(RkISP1, Error) << "Failed to queue video"; } +void RkISP1CameraData::metaDataReady(const void *cookie, IPAMetaData metaData) +{ + Request *request = reinterpret_cast(const_cast(cookie)); + PipelineHandlerRkISP1 *pipe = + static_cast(pipe_); + + pipe->processMetaData(request, metaData); + + pipe->tryCompleteRequest(request); +} + RkISP1CameraConfiguration::RkISP1CameraConfiguration(Camera *camera, RkISP1CameraData *data) : CameraConfiguration() @@ -709,6 +723,9 @@ void PipelineHandlerRkISP1::tryCompleteRequest(Request *request) if (request->hasPendingBuffers()) return; + if (!request->metaData().ready) + return; + delete reqData; request->data = nullptr; @@ -734,8 +751,6 @@ void PipelineHandlerRkISP1::statReady(Buffer *buffer) data->ipa_->updateStatistics(request, *buffer); - /* TODO: Fetch libcamera status controls from IPA */ - reqData->stat = nullptr; statBuffers_.push(buffer);