From patchwork Tue Jun 15 13:35:34 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: 12602 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 6D9B7BD78E for ; Tue, 15 Jun 2021 13:35:40 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 2E91368930; Tue, 15 Jun 2021 15:35:40 +0200 (CEST) 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="IWKOkwUL"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id BE24F6894A for ; Tue, 15 Jun 2021 15:35:37 +0200 (CEST) Received: from tatooine.ideasonboard.com (unknown [IPv6:2a01:e0a:169:7140:4f90:1575:e6a1:e628]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 6BB144A3; Tue, 15 Jun 2021 15:35:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1623764137; bh=HIMFYu5dzqA0iYfHqa1EI/x9eqBTvESyA04+RjpEt7k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IWKOkwULaJG3K0shZJt3jGzHjAXaNUVjTUNcu00J98Cb0RvXLFRQJQL9p+wiQ7sBo F1qy8lqptrcp1/ykt8RYWOblIko9xxaKW1HuzMWErlQO1E+1MYvQP9KrBECNyQoGnN +snfLwYKVRoxQZXm4dhjMe3u6CHmYoxISEmfFqy0= From: Jean-Michel Hautbois To: libcamera-devel@lists.libcamera.org Date: Tue, 15 Jun 2021 15:35:34 +0200 Message-Id: <20210615133534.29502-3-jeanmichel.hautbois@ideasonboard.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210615133534.29502-1-jeanmichel.hautbois@ideasonboard.com> References: <20210615133534.29502-1-jeanmichel.hautbois@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 2/2] ipa: ipu3: Initialize CameraSensorHelper at IPU3 init stage 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" In order for the CameraSensorHelper to be instantiated, we need to find its factory using the camera sensor model name stored in IPASettings::sensorModel. As we don't need to do it at each configure call (the sensor is not changing in-between), implement the init call in IPAIPU3 to do that. Signed-off-by: Jean-Michel Hautbois Reviewed-by: Umang Jain Reviewed-by: Jacopo Mondi --- src/ipa/ipu3/ipu3.cpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp index 8b4c7351..e68e9bb3 100644 --- a/src/ipa/ipu3/ipu3.cpp +++ b/src/ipa/ipu3/ipu3.cpp @@ -23,6 +23,7 @@ #include "ipu3_agc.h" #include "ipu3_awb.h" +#include "libipa/camera_sensor_helper.h" static constexpr uint32_t kMaxCellWidthPerSet = 160; static constexpr uint32_t kMaxCellHeightPerSet = 56; @@ -36,10 +37,7 @@ namespace ipa::ipu3 { class IPAIPU3 : public IPAIPU3Interface { public: - int init([[maybe_unused]] const IPASettings &settings) override - { - return 0; - } + int init(const IPASettings &settings) override; int start() override; void stop() override {} @@ -78,6 +76,8 @@ private: std::unique_ptr awbAlgo_; /* Interface to the AEC/AGC algorithm */ std::unique_ptr agcAlgo_; + /* Interface to the Camera Helper */ + std::unique_ptr camHelper_; /* Local parameter storage */ struct ipu3_uapi_params params_; @@ -85,6 +85,16 @@ private: struct ipu3_uapi_grid_config bdsGrid_; }; +int IPAIPU3::init(const IPASettings &settings) +{ + camHelper_ = CameraSensorHelperFactory::create(settings.sensorModel); + if (camHelper_ == nullptr) { + LOG(IPAIPU3, Error) << "Failed to create camera sensor helper for " << settings.sensorModel; + return -1; + } + return 0; +} + int IPAIPU3::start() { setControls(0);