{"id":24628,"url":"https://patchwork.libcamera.org/api/1.1/patches/24628/?format=json","web_url":"https://patchwork.libcamera.org/patch/24628/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20251014075252.2876485-13-stefan.klug@ideasonboard.com>","date":"2025-10-14T07:52:34","name":"[v1,12/12] ipa: rkisp1: Add LensShadingEnable control","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"ecc0414d76e4b654a645e9ddbacebcb4b4ab3eeb","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/1.1/people/184/?format=json","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/24628/mbox/","series":[{"id":5498,"url":"https://patchwork.libcamera.org/api/1.1/series/5498/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5498","date":"2025-10-14T07:52:22","name":"Add resampling support for polynomial LSC data","version":1,"mbox":"https://patchwork.libcamera.org/series/5498/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/24628/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/24628/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 91477BF415\n\tfor ;\n\tTue, 14 Oct 2025 07:53:36 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 462D9605EF;\n\tTue, 14 Oct 2025 09:53:36 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BD60E605DD\n\tfor ;\n\tTue, 14 Oct 2025 09:53:34 +0200 (CEST)","from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:61fb:8e55:ff1e:be62])\n\tby perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id 84CF8C73;\n\tTue, 14 Oct 2025 09:51:56 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"HdsK6f2g\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1760428316;\n\tbh=mBl3sCmfidcqdXPeszxfzmjPP031maQ+jUPB6OKVpBc=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=HdsK6f2gG9jBTzUxj/2Yqh7LVmmHDiQyW5f4nETwSL6WUJzV3TtTQE4iP4fYMn0Fh\n\tTFxHsrm8Uc7ccUMMhseq37+IylMnSn6kP/hOzMj/j8/rcQ3U/tcHJaU0RNbHX75ZZq\n\t+iRHgXsNw+i2xw03WpxBenmiYClDt2JdMBepwGTc=","From":"Stefan Klug ","To":"libcamera-devel@lists.libcamera.org","Cc":"Stefan Klug ","Subject":"[PATCH v1 12/12] ipa: rkisp1: Add LensShadingEnable control","Date":"Tue, 14 Oct 2025 09:52:34 +0200","Message-ID":"<20251014075252.2876485-13-stefan.klug@ideasonboard.com>","X-Mailer":"git-send-email 2.48.1","In-Reply-To":"<20251014075252.2876485-1-stefan.klug@ideasonboard.com>","References":"<20251014075252.2876485-1-stefan.klug@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Implement the LensShadingEnable control for rkisp1.\n\nSigned-off-by: Stefan Klug \n---\n src/ipa/rkisp1/algorithms/dpf.cpp | 2 +-\n src/ipa/rkisp1/algorithms/lsc.cpp | 41 ++++++++++++++++++++++++++---\n src/ipa/rkisp1/algorithms/lsc.h | 3 +++\n src/ipa/rkisp1/ipa_context.h | 12 ++++++---\n src/libcamera/control_ids_core.yaml | 3 +++\n 5 files changed, 52 insertions(+), 9 deletions(-)","diff":"diff --git a/src/ipa/rkisp1/algorithms/dpf.cpp b/src/ipa/rkisp1/algorithms/dpf.cpp\nindex cb6095daeeed..79cb4829fdbb 100644\n--- a/src/ipa/rkisp1/algorithms/dpf.cpp\n+++ b/src/ipa/rkisp1/algorithms/dpf.cpp\n@@ -229,7 +229,7 @@ void Dpf::prepare(IPAContext &context, const uint32_t frame,\n \t\t*config = config_;\n \n \t\tconst auto &awb = context.configuration.awb;\n-\t\tconst auto &lsc = context.configuration.lsc;\n+\t\tconst auto &lsc = context.activeState.lsc;\n \n \t\tauto &mode = config->gain.mode;\n \ndiff --git a/src/ipa/rkisp1/algorithms/lsc.cpp b/src/ipa/rkisp1/algorithms/lsc.cpp\nindex 68cf35064182..ddb7154a0211 100644\n--- a/src/ipa/rkisp1/algorithms/lsc.cpp\n+++ b/src/ipa/rkisp1/algorithms/lsc.cpp\n@@ -366,6 +366,8 @@ LensShadingCorrection::LensShadingCorrection()\n int LensShadingCorrection::init([[maybe_unused]] IPAContext &context,\n \t\t\t\tconst YamlObject &tuningData)\n {\n+\tcontext.ctrlMap[&controls::LensShadingEnable] = ControlInfo(false, true, true);\n+\n \txSize_ = parseSizes(tuningData, \"x-size\");\n \tySize_ = parseSizes(tuningData, \"y-size\");\n \n@@ -449,7 +451,7 @@ int LensShadingCorrection::configure(IPAContext &context,\n \n \tsets_.setData(std::move(shadingData));\n \n-\tcontext.configuration.lsc.enabled = true;\n+\tcontext.activeState.lsc.enabled = true;\n \treturn 0;\n }\n \n@@ -470,6 +472,27 @@ void LensShadingCorrection::copyTable(rkisp1_cif_isp_lsc_config &config,\n \tstd::copy(set.b.begin(), set.b.end(), &config.b_data_tbl[0][0]);\n }\n \n+/**\n+ * \\copydoc libcamera::ipa::Algorithm::queueRequest\n+ */\n+void LensShadingCorrection::queueRequest(IPAContext &context,\n+\t\t\t\t\t [[maybe_unused]] const uint32_t frame,\n+\t\t\t\t\t IPAFrameContext &frameContext,\n+\t\t\t\t\t const ControlList &controls)\n+{\n+\tauto &lsc = context.activeState.lsc;\n+\n+\tconst auto &lscEnable = controls.get(controls::LensShadingEnable);\n+\tif (lscEnable && *lscEnable != lsc.enabled) {\n+\t\tlsc.enabled = *lscEnable;\n+\n+\t\tLOG(RkISP1Lsc, Debug)\n+\t\t\t<< (*lscEnable ? \"Enabling\" : \"Disabling\") << \" Lsc\";\n+\n+\t\tframeContext.lsc.update = true;\n+\t}\n+}\n+\n /**\n * \\copydoc libcamera::ipa::Algorithm::prepare\n */\n@@ -479,16 +502,26 @@ void LensShadingCorrection::prepare([[maybe_unused]] IPAContext &context,\n \t\t\t\t RkISP1Params *params)\n {\n \tuint32_t ct = frameContext.awb.temperatureK;\n-\tif (std::abs(static_cast(ct) - static_cast(lastAppliedCt_)) <\n+\n+\tif (!frameContext.lsc.update && !context.activeState.lsc.enabled)\n+\t\treturn;\n+\n+\tif (!frameContext.lsc.update &&\n+\t std::abs(static_cast(ct) - static_cast(lastAppliedCt_)) <\n \t kColourTemperatureChangeThreshhold)\n \t\treturn;\n+\n \tunsigned int quantizedCt;\n \tconst Components &set = sets_.getInterpolated(ct, &quantizedCt);\n-\tif (lastAppliedQuantizedCt_ == quantizedCt)\n+\tif (!frameContext.lsc.update && lastAppliedQuantizedCt_ == quantizedCt)\n \t\treturn;\n \n \tauto config = params->block();\n-\tconfig.setEnabled(true);\n+\tconfig.setEnabled(context.activeState.lsc.enabled);\n+\n+\tif (!context.activeState.lsc.enabled)\n+\t\treturn;\n+\n \tsetParameters(*config);\n \tcopyTable(*config, set);\n \ndiff --git a/src/ipa/rkisp1/algorithms/lsc.h b/src/ipa/rkisp1/algorithms/lsc.h\nindex 43fee337931f..a3d8042130c0 100644\n--- a/src/ipa/rkisp1/algorithms/lsc.h\n+++ b/src/ipa/rkisp1/algorithms/lsc.h\n@@ -29,6 +29,9 @@ public:\n \tvoid prepare(IPAContext &context, const uint32_t frame,\n \t\t IPAFrameContext &frameContext,\n \t\t RkISP1Params *params) override;\n+\tvoid queueRequest(IPAContext &context, const uint32_t frame,\n+\t\t\t IPAFrameContext &frameContext,\n+\t\t\t const ControlList &controls) override;\n \n \tstruct Components {\n \t\tstd::vector r;\ndiff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h\nindex f85a130d9c23..5ec87ae4e5a3 100644\n--- a/src/ipa/rkisp1/ipa_context.h\n+++ b/src/ipa/rkisp1/ipa_context.h\n@@ -55,10 +55,6 @@ struct IPASessionConfiguration {\n \t\tbool supported;\n \t} compress;\n \n-\tstruct {\n-\t\tbool enabled;\n-\t} lsc;\n-\n \tstruct {\n \t\tutils::Duration minExposureTime;\n \t\tutils::Duration maxExposureTime;\n@@ -139,6 +135,10 @@ struct IPAActiveState {\n \t\tdouble gain;\n \t\tdouble strength;\n \t} wdr;\n+\n+\tstruct {\n+\t\tbool enabled;\n+\t} lsc;\n };\n \n struct IPAFrameContext : public FrameContext {\n@@ -214,6 +214,10 @@ struct IPAFrameContext : public FrameContext {\n \t\tdouble strength;\n \t\tdouble gain;\n \t} wdr;\n+\n+\tstruct {\n+\t\tbool update;\n+\t} lsc;\n };\n \n struct IPAContext {\ndiff --git a/src/libcamera/control_ids_core.yaml b/src/libcamera/control_ids_core.yaml\nindex 9244b7eddb77..3b062df64bf5 100644\n--- a/src/libcamera/control_ids_core.yaml\n+++ b/src/libcamera/control_ids_core.yaml\n@@ -1352,4 +1352,7 @@ controls:\n description: |\n Enable or disable the lens shading algorithm.\n \n+ This control is only available when there are valid lens shading\n+ correction parameters available in the tuning file.\n+\n ...\n","prefixes":["v1","12/12"]}