From patchwork Wed Mar 8 16:40:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 18360 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 5A350C329C for ; Wed, 8 Mar 2023 16:40:48 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D69C562693; Wed, 8 Mar 2023 17:40:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1678293647; bh=iBNi0u69uVdRJlDumXUWDZNqrpAbl5ib8tzqFa8t/3c=; 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=Di+tsk6QhM2C3cYARog6rXTwL8sB6NKCFAw9UJnYQSFXGXonzw90bZBxYcFwI8TsR jNObwvN0RyKMAk9kvJ4Jw6amqITSPcjeN026dgjVKJXDzXRX+kYkZwkujO47lQ2gC0 m86mObnKWBdfwBAogh47tEQmRHN1QCeZb4q2VBm8dcLaf92Tl8tTS7mTvgjFY0Hp3/ n/8Gv9dMtlYjurjSQaVSs2/LH3rlWN6UXM+3M/HKLB4wvoHtjTVyl48OGqLop0y99U AQlFD7Ekqeld9vi/IqEH4jAVo8uWIqn3lUbQRaIBm1dQe8oEcfKqDT/J9r5toLckUW E3l7CYyakT8kQ== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C08E7626CD 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="Frpb+AkS"; 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 1178F576; 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=1678293643; bh=iBNi0u69uVdRJlDumXUWDZNqrpAbl5ib8tzqFa8t/3c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Frpb+AkSkXWRhNzWzCvTiYfcDMr2HXyIKMxH96+qhy5ncb2xPZUwZoSBsEoLZLKa8 6dBd8fo5skxJ7oZa292LOSnGyRKEz2ZdIfxaBeAyKtl2AvClWrag+OlF9hQQxh3YwE Dlz4GWT4QkU7fspHLNL3nbEZQ1V+F+fkox9wn2hs= To: libcamera-devel@lists.libcamera.org Date: Wed, 8 Mar 2023 17:40:28 +0100 Message-Id: <20230308164028.235638-4-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 3/3] ipa: rkisp1: lsc: Move 'enable' to activeState 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" Now that the LSC algorithm can be enabled and disabled at run-time, move the 'enabled' flag from the context's configuration to the algorithm's active state. This allows to populate the LensShadingEnable metadata in the process() function implementation. Signed-off-by: Jacopo Mondi --- src/ipa/rkisp1/algorithms/dpf.cpp | 6 +++--- src/ipa/rkisp1/algorithms/lsc.cpp | 13 +++++++++---- src/ipa/rkisp1/algorithms/lsc.h | 4 ++++ src/ipa/rkisp1/ipa_context.h | 4 ---- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/ipa/rkisp1/algorithms/dpf.cpp b/src/ipa/rkisp1/algorithms/dpf.cpp index 5bd7e59f651c..8f181df5c6c4 100644 --- a/src/ipa/rkisp1/algorithms/dpf.cpp +++ b/src/ipa/rkisp1/algorithms/dpf.cpp @@ -222,7 +222,7 @@ void Dpf::prepare(IPAContext &context, const uint32_t frame, params->others.dpf_strength_config = strengthConfig_; const auto &awb = context.configuration.awb; - const auto &lsc = context.configuration.lsc; + const auto &lsc = context.activeState.lsc; auto &mode = params->others.dpf_config.gain.mode; /* @@ -233,11 +233,11 @@ void Dpf::prepare(IPAContext &context, const uint32_t frame, * LSC modules automatically when they are enabled. Use that * mode of operation as it simplifies control of the DPF. */ - if (awb.enabled && lsc.enabled) + if (awb.enabled && lsc.active) mode = RKISP1_CIF_ISP_DPF_GAIN_USAGE_AWB_LSC_GAINS; else if (awb.enabled) mode = RKISP1_CIF_ISP_DPF_GAIN_USAGE_AWB_GAINS; - else if (lsc.enabled) + else if (lsc.active) mode = RKISP1_CIF_ISP_DPF_GAIN_USAGE_LSC_GAINS; else mode = RKISP1_CIF_ISP_DPF_GAIN_USAGE_DISABLED; diff --git a/src/ipa/rkisp1/algorithms/lsc.cpp b/src/ipa/rkisp1/algorithms/lsc.cpp index 0c9f6cbd1dec..8de49e4220ea 100644 --- a/src/ipa/rkisp1/algorithms/lsc.cpp +++ b/src/ipa/rkisp1/algorithms/lsc.cpp @@ -149,8 +149,6 @@ int LensShadingCorrection::init([[maybe_unused]] IPAContext &context, return -EINVAL; } - context.configuration.lsc.enabled = false; - return 0; } @@ -290,12 +288,10 @@ void LensShadingCorrection::prepare(IPAContext &context, 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. */ @@ -387,6 +383,15 @@ void LensShadingCorrection::prepare(IPAContext &context, lastCt_ = { ct, ct }; } +void LensShadingCorrection::process(IPAContext &context, + [[maybe_unused]] const uint32_t frame, + [[maybe_unused]] IPAFrameContext &frameContext, + [[maybe_unused]] const rkisp1_stat_buffer *stats, + ControlList &metadata) +{ + metadata.set(controls::LensShadingEnable, context.activeState.lsc.active); +} + REGISTER_IPA_ALGORITHM(LensShadingCorrection, "LensShadingCorrection") } /* namespace ipa::rkisp1::algorithms */ diff --git a/src/ipa/rkisp1/algorithms/lsc.h b/src/ipa/rkisp1/algorithms/lsc.h index 4708065bcfb7..e9770f4027f4 100644 --- a/src/ipa/rkisp1/algorithms/lsc.h +++ b/src/ipa/rkisp1/algorithms/lsc.h @@ -29,6 +29,10 @@ public: void prepare(IPAContext &context, const uint32_t frame, IPAFrameContext &frameContext, rkisp1_params_cfg *params) override; + void process(IPAContext &context, const uint32_t frame, + IPAFrameContext &frameContext, + const rkisp1_stat_buffer *stats, + ControlList &metadata) override; private: struct Components { diff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h index ada995274ebf..bb72f0a40a12 100644 --- a/src/ipa/rkisp1/ipa_context.h +++ b/src/ipa/rkisp1/ipa_context.h @@ -30,10 +30,6 @@ struct IPASessionConfiguration { bool enabled; } awb; - struct { - bool enabled; - } lsc; - struct { utils::Duration minShutterSpeed; utils::Duration maxShutterSpeed;