From patchwork Fri May 14 07:58:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 12290 X-Patchwork-Delegate: umang.jain@ideasonboard.com 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 829B5C31F6 for ; Fri, 14 May 2021 07:58:29 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 3FB4368919; Fri, 14 May 2021 09:58:29 +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="i3KPqV4v"; 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 38F6A68918 for ; Fri, 14 May 2021 09:58:28 +0200 (CEST) Received: from perceval.ideasonboard.com (unknown [103.251.226.50]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id ED7D69F0; Fri, 14 May 2021 09:58:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1620979107; bh=wVzXWPp3/Zl4/140IaxD3MXYLIqLHEkdHvg6JqNeAPo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i3KPqV4vREVZQPaOB584+xkniqT5riJCxM7yW9E4Dc9ORDzhZUHD20sQ6vH8zCESA +GcrKN168SUdFJzb3d8Y1i75iYal58UYya9eJrWmsTIQoKHDnjIKzrpXKyq/7z/OOp /TXVUJH8Zg+PcZL1nOygCxDOF+0qO5iy1Q9Ayfro= From: Umang Jain To: libcamera-devel@lists.libcamera.org Date: Fri, 14 May 2021 13:28:05 +0530 Message-Id: <20210514075808.282479-4-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210514075808.282479-1-umang.jain@ideasonboard.com> References: <20210514075808.282479-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v1 3/6] ipa: ipu3: Introduce IPAConfigInfo in IPC 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" IPAConfigInfo is a consolidated data structure passed from IPU3 pipeline-handler to IPU3 IPA. The structure can be extended with additional parameiters to accommodate the requirements of multiple IPU3 IPA modules for e.g., an open-source IPA (in-tree) and a closed source IPA (for ChromeOS). As usual, the documentation for .mojom files are kept in a separate .cpp file. Hence, create and document IPAConfigInfo in ipu3_ipa_interface.cpp. Finally, adapt the in-tree IPU3 IPA to use IPAConfigInfo as well. Signed-off-by: Umang Jain --- include/libcamera/ipa/ipu3.mojom | 10 ++++- include/libcamera/ipa/ipu3_ipa_interface.cpp | 39 ++++++++++++++++++++ include/libcamera/ipa/meson.build | 1 + src/ipa/ipu3/ipu3.cpp | 14 +++---- src/libcamera/pipeline/ipu3/ipu3.cpp | 10 +++-- 5 files changed, 61 insertions(+), 13 deletions(-) create mode 100644 include/libcamera/ipa/ipu3_ipa_interface.cpp diff --git a/include/libcamera/ipa/ipu3.mojom b/include/libcamera/ipa/ipu3.mojom index a717b1e6..22c4ce1b 100644 --- a/include/libcamera/ipa/ipu3.mojom +++ b/include/libcamera/ipa/ipu3.mojom @@ -25,13 +25,19 @@ struct IPU3Action { libcamera.ControlList controls; }; +struct IPAConfigInfo { + libcamera.IPACameraSensorInfo sensorInfo; + map entityControls; + libcamera.Size bdsOutputSize; + libcamera.Size iif; +}; + interface IPAIPU3Interface { init(libcamera.IPASettings settings) => (int32 ret); start() => (int32 ret); stop(); - configure(map entityControls, - libcamera.Size bdsOutputSize) => (); + configure(IPAConfigInfo configInfo); mapBuffers(array buffers); unmapBuffers(array ids); diff --git a/include/libcamera/ipa/ipu3_ipa_interface.cpp b/include/libcamera/ipa/ipu3_ipa_interface.cpp new file mode 100644 index 00000000..9aafbcdb --- /dev/null +++ b/include/libcamera/ipa/ipu3_ipa_interface.cpp @@ -0,0 +1,39 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ + +namespace libcamera { + +/** + * \struct IPAConfigInfo + * \brief Information to be passed from IPU3 pipeline-handler to the IPA + * + * The IPAConfigInfo structure stores the data passed from IPU3 pipeline-handler + * to the IPAIPU3Interface::configure(). The structure provides extensibility + * for additional configuration data as required, for closed-source or + * open-source IPAs' configure() phases. + */ + +/** + * \var IPAConfigInfo::sensorInfo + * \brief Camera sensor information + * + * \sa IPACameraSensorInfo + */ + +/** + * \var IPAConfigInfo::entityControls + * \brief Controls supported by the sensor + * + * A map of V4L2 controls supported by the sensor in order to read or write + * control values to them. + */ + +/** + * \var IPAConfigInfo::bdsOutputSize + * \brief Size of ImgU BDS rectangle + */ + +/** + * \var IPAConfigInfo::iif + * \brief Size of ImgU input-feeder rectangle + */ +} /* namespace libcamera */ diff --git a/include/libcamera/ipa/meson.build b/include/libcamera/ipa/meson.build index da60aa68..9684a34f 100644 --- a/include/libcamera/ipa/meson.build +++ b/include/libcamera/ipa/meson.build @@ -10,6 +10,7 @@ libcamera_ipa_headers = files([ libcamera_ipa_docs = files([ 'core_ipa_interface.cpp', + 'ipu3_ipa_interface.cpp', ]) install_headers(libcamera_ipa_headers, diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp index f5343547..769c24d3 100644 --- a/src/ipa/ipu3/ipu3.cpp +++ b/src/ipa/ipu3/ipu3.cpp @@ -43,8 +43,7 @@ public: int start() override; void stop() override {} - void configure(const std::map &entityControls, - const Size &bdsOutputSize) override; + void configure(const IPAConfigInfo &configInfo) override; void mapBuffers(const std::vector &buffers) override; void unmapBuffers(const std::vector &ids) override; @@ -139,13 +138,12 @@ void IPAIPU3::calculateBdsGrid(const Size &bdsOutputSize) << (int)bdsGrid_.height << " << " << (int)bdsGrid_.block_height_log2 << ")"; } -void IPAIPU3::configure(const std::map &entityControls, - const Size &bdsOutputSize) +void IPAIPU3::configure(const IPAConfigInfo &configInfo) { - if (entityControls.empty()) + if (configInfo.entityControls.empty()) return; - ctrls_ = entityControls.at(0); + ctrls_ = configInfo.entityControls.at(0); const auto itExp = ctrls_.find(V4L2_CID_EXPOSURE); if (itExp == ctrls_.end()) { @@ -169,10 +167,10 @@ void IPAIPU3::configure(const std::map &entityControls params_ = {}; - calculateBdsGrid(bdsOutputSize); + calculateBdsGrid(configInfo.bdsOutputSize); awbAlgo_ = std::make_unique(); - awbAlgo_->initialise(params_, bdsOutputSize, bdsGrid_); + awbAlgo_->initialise(params_, configInfo.bdsOutputSize, bdsGrid_); agcAlgo_ = std::make_unique(); agcAlgo_->initialise(bdsGrid_); diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index 98c6160f..5b15ca90 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -633,9 +633,13 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c) return ret; } - std::map entityControls; - entityControls.emplace(0, data->cio2_.sensor()->controls()); - data->ipa_->configure(entityControls, config->imguConfig().bds); + ipa::ipu3::IPAConfigInfo configInfo; + configInfo.entityControls.emplace(0, data->cio2_.sensor()->controls()); + configInfo.sensorInfo = sensorInfo; + configInfo.bdsOutputSize = config->imguConfig().bds; + configInfo.iif = config->imguConfig().iif; + + data->ipa_->configure(configInfo); return 0; }