From patchwork Mon Nov 8 13:13:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Michel Hautbois X-Patchwork-Id: 14485 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 9C508C3251 for ; Mon, 8 Nov 2021 13:14:17 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 494BD603C4; Mon, 8 Nov 2021 14:14:17 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="AzVY9L4M"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 892176038C for ; Mon, 8 Nov 2021 14:14:02 +0100 (CET) Received: from tatooine.ideasonboard.com (unknown [IPv6:2a01:e0a:169:7140:c2bb:76d0:68d7:a9a5]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 44F76190C; Mon, 8 Nov 2021 14:14:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1636377242; bh=EtwI61Kvv4r1oZ635E9dmb6qP9qEYqj11s+iLZiyn2w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AzVY9L4MBAHbBkFj7ibvBqIwMRyOC7N7ebVVKdcJUhZDRaDN6EHMOdVojUWiATBsF +OeRPVk0+aoT1jMmrnljwPne2FKMDkR7iu7JJJ/fEw6nyFkfbZEIcX+WD4o6G3XpFD LAzU0B8mxJlfu5OXMJHMBCQ/L4PAtRWXcwKDxlBU= From: Jean-Michel Hautbois To: libcamera-devel@lists.libcamera.org Date: Mon, 8 Nov 2021 14:13:44 +0100 Message-Id: <20211108131350.130665-17-jeanmichel.hautbois@ideasonboard.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211108131350.130665-1-jeanmichel.hautbois@ideasonboard.com> References: <20211108131350.130665-1-jeanmichel.hautbois@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 16/22] ipa: ipu3: Introduce sensor controls 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Pass the sensor controls as well as the libcamera controls to processControl() on an EventProcessControls event received. This will be used to populate the frame context. Signed-off-by: Jean-Michel Hautbois --- src/ipa/ipu3/ipu3.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp index dcf4da65..177c5c2f 100644 --- a/src/ipa/ipu3/ipu3.cpp +++ b/src/ipa/ipu3/ipu3.cpp @@ -151,7 +151,9 @@ private: ControlInfoMap *ipaControls); void updateSessionConfiguration(const IPACameraSensorInfo &sensorInfo, const ControlInfoMap &sensorControls); - void processControls(unsigned int frame, const ControlList &controls); + void processControls(unsigned int frame, + const ControlList &controls, + const ControlList &sensorCtrls); void fillParams(unsigned int frame, ipu3_uapi_params *params); void parseStatistics(unsigned int frame, int64_t frameTimestamp, @@ -549,7 +551,7 @@ void IPAIPU3::processEvent(const IPU3Event &event) * a new frame. */ frameStarted(event.frame); - processControls(event.frame, event.controls); + processControls(event.frame, event.controls, event.sensorControls); break; } case EventFillParams: { @@ -601,12 +603,14 @@ void IPAIPU3::processEvent(const IPU3Event &event) * \brief Process a control list for a request from the application * \param[in] frame The number of the frame which will be processed next * \param[in] controls The controls for the \a frame + * \param[in] controls The sensor controls for the \a frame * * Parse the request to handle any IPA-managed controls that were set from the * application such as manual sensor settings. */ void IPAIPU3::processControls([[maybe_unused]] unsigned int frame, - [[maybe_unused]] const ControlList &controls) + [[maybe_unused]] const ControlList &controls, + [[maybe_unused]] const ControlList &sensorCtrls) { /* \todo Start processing for 'frame' based on 'controls'. */ }