From patchwork Wed Mar 8 16:40:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 18359 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 4DA03C3262 for ; Wed, 8 Mar 2023 16:40:47 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 0ACB6626CA; Wed, 8 Mar 2023 17:40:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1678293645; bh=WyvDY9XJa9vonHalzYCuROWq39FoZBj+4EojS9hLbnk=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=EFBsNW4REs3wYOclvu3ajEN041vREV8qkzFIzujzC9YpyBpoz9hq8EogPve+JmkEk GDtWGvLsEBzGfCjk5TWXml9QMJxpHMKw1MA/bZjbrIcaTHL/yW7YzKhM+4yUp3OoZZ KOldvnwJnV73aMYcOr7a0A6sMRLPBU1/qhfmNwWd5e8xROjsbEORLuVJAc0uAOspNI 0LCv3NEcYvnzIhHjZ51KZVkh4c1hh+b5vJUb7d9hdaeeJ2d2n/2AVV/OLQENnINID1 ZG+5YluWOvm0yOMelEzKz+gMqikjwBrt7OKxjcNhIhTTQTsiPaKNpW2TwNRrpFGpIK lbZBlGL2ST+jg== 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 11C8F62693 for ; Wed, 8 Mar 2023 17:40:43 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="dQ4wBaqO"; dkim-atps=neutral Received: from uno.homenet.telecomitalia.it (host-79-47-54-87.retail.telecomitalia.it [79.47.54.87]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 6C8DF27C; Wed, 8 Mar 2023 17:40:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1678293642; bh=WyvDY9XJa9vonHalzYCuROWq39FoZBj+4EojS9hLbnk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dQ4wBaqOhjBv7VX7WNCeI5byt+eFHViZlpr9tZWRsEjMrT1VK4gxm9JJbuTjS8cVm kfJZhljtvhiWKSTD7Fi5I95C8MZMhSjSXKS6l2B4QD1eBWnFVVYpapPzg31abJmwwx XU5O6jmWQlt20y44jP4CLodWtTEaRs6sPgL6EivM= To: libcamera-devel@lists.libcamera.org Date: Wed, 8 Mar 2023 17:40:27 +0100 Message-Id: <20230308164028.235638-3-jacopo.mondi@ideasonboard.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230308164028.235638-1-jacopo.mondi@ideasonboard.com> References: <20230308164028.235638-1-jacopo.mondi@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/3] ipa: rkisp1: lsc: Enable/disable LSC algorithm 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-Patchwork-Original-From: Jacopo Mondi via libcamera-devel From: Jacopo Mondi Reply-To: Jacopo Mondi Cc: Jacopo Mondi Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Implement LSC algorithm enable/disable by parsing the "LensShadingEnable" control in queueRequest(). Start with the LSC algorithm enabled by default and disable it on application request. Signed-off-by: Jacopo Mondi --- src/ipa/rkisp1/algorithms/lsc.cpp | 54 ++++++++++++++++++++++++++++++- src/ipa/rkisp1/algorithms/lsc.h | 4 +++ src/ipa/rkisp1/ipa_context.h | 5 +++ src/ipa/rkisp1/rkisp1.cpp | 1 + 4 files changed, 63 insertions(+), 1 deletion(-) diff --git a/src/ipa/rkisp1/algorithms/lsc.cpp b/src/ipa/rkisp1/algorithms/lsc.cpp index a7ccedb1ed3b..0c9f6cbd1dec 100644 --- a/src/ipa/rkisp1/algorithms/lsc.cpp +++ b/src/ipa/rkisp1/algorithms/lsc.cpp @@ -14,6 +14,8 @@ #include #include +#include + #include "libcamera/internal/yaml_parser.h" #include "linux/rkisp1-config.h" @@ -147,6 +149,8 @@ int LensShadingCorrection::init([[maybe_unused]] IPAContext &context, return -EINVAL; } + context.configuration.lsc.enabled = false; + return 0; } @@ -181,10 +185,20 @@ int LensShadingCorrection::configure(IPAContext &context, yGrad_[i] = std::round(32768 / ySizes_[i]); } - context.configuration.lsc.enabled = true; + /* Enable LSC on first run unless explicitly disabled by application. */ + context.activeState.lsc.enable = true; + context.activeState.lsc.active = false; + return 0; } +void LensShadingCorrection::disableLSC(rkisp1_params_cfg *params) +{ + params->module_en_update |= RKISP1_CIF_ISP_MODULE_LSC; + params->module_ens &= ~RKISP1_CIF_ISP_MODULE_LSC; + params->module_cfg_update |= RKISP1_CIF_ISP_MODULE_LSC; +} + void LensShadingCorrection::setParameters(rkisp1_params_cfg *params) { struct rkisp1_cif_isp_lsc_config &config = params->others.lsc_config; @@ -242,6 +256,25 @@ void LensShadingCorrection::interpolateTable(rkisp1_cif_isp_lsc_config &config, } } +/** + * \copydoc libcamera::ipa::Algorithm::queueRequest + */ +void LensShadingCorrection::queueRequest(IPAContext &context, + [[maybe_unused]] const uint32_t frame, + [[maybe_unused]] IPAFrameContext &frameContext, + const ControlList &controls) +{ + auto lsc = &context.activeState.lsc; + + const auto lscEnable = controls.get(controls::LensShadingEnable); + if (lscEnable && *lscEnable != lsc->enable) { + LOG(RkISP1Lsc, Debug) + << (*lscEnable ? "Enabling" : "Disabling") << " LSC"; + + lsc->enable = *lscEnable; + } +} + /** * \copydoc libcamera::ipa::Algorithm::prepare */ @@ -250,6 +283,25 @@ void LensShadingCorrection::prepare(IPAContext &context, [[maybe_unused]] IPAFrameContext &frameContext, rkisp1_params_cfg *params) { + auto lsc = &context.activeState.lsc; + + if (lsc->enable != lsc->active) { + /* If LSC has to be disabled, disable it and return here. */ + if (!lsc->enable) { + disableLSC(params); + lsc->active = false; + context.configuration.lsc.enabled = false; + return; + } + + lsc->active = true; + context.configuration.lsc.enabled = true; + } + + /* Nothing more to do here if LSC is not active. */ + if (!lsc->active) + return; + struct rkisp1_cif_isp_lsc_config &config = params->others.lsc_config; /* diff --git a/src/ipa/rkisp1/algorithms/lsc.h b/src/ipa/rkisp1/algorithms/lsc.h index e2a93a566973..4708065bcfb7 100644 --- a/src/ipa/rkisp1/algorithms/lsc.h +++ b/src/ipa/rkisp1/algorithms/lsc.h @@ -23,6 +23,9 @@ public: int init(IPAContext &context, const YamlObject &tuningData) override; int configure(IPAContext &context, const IPACameraSensorInfo &configInfo) override; + void queueRequest(IPAContext &context, const uint32_t frame, + IPAFrameContext &frameContext, + const ControlList &controls) override; void prepare(IPAContext &context, const uint32_t frame, IPAFrameContext &frameContext, rkisp1_params_cfg *params) override; @@ -36,6 +39,7 @@ private: std::vector b; }; + void disableLSC(rkisp1_params_cfg *params); void setParameters(rkisp1_params_cfg *params); void copyTable(rkisp1_cif_isp_lsc_config &config, const Components &set0); void interpolateTable(rkisp1_cif_isp_lsc_config &config, diff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h index b9b2065328d6..ada995274ebf 100644 --- a/src/ipa/rkisp1/ipa_context.h +++ b/src/ipa/rkisp1/ipa_context.h @@ -98,6 +98,11 @@ struct IPAActiveState { uint8_t denoise; uint8_t sharpness; } filter; + + struct { + bool enable; + bool active; + } lsc; }; struct IPAFrameContext : public FrameContext { diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp index 6544c925ba25..2772592eda66 100644 --- a/src/ipa/rkisp1/rkisp1.cpp +++ b/src/ipa/rkisp1/rkisp1.cpp @@ -106,6 +106,7 @@ const ControlInfoMap::Map rkisp1Controls{ { &controls::Saturation, ControlInfo(0.0f, 1.993f, 1.0f) }, { &controls::Sharpness, ControlInfo(0.0f, 10.0f, 1.0f) }, { &controls::draft::NoiseReductionMode, ControlInfo(controls::draft::NoiseReductionModeValues) }, + { &controls::LensShadingEnable, ControlInfo(false, true) }, }; } /* namespace */