Patch Detail
Show a patch.
GET /api/1.1/patches/18359/?format=api
{ "id": 18359, "url": "https://patchwork.libcamera.org/api/1.1/patches/18359/?format=api", "web_url": "https://patchwork.libcamera.org/patch/18359/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20230308164028.235638-3-jacopo.mondi@ideasonboard.com>", "date": "2023-03-08T16:40:27", "name": "[libcamera-devel,2/3] ipa: rkisp1: lsc: Enable/disable LSC algorithm", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "979539f47051a462d80d1af6a9b59930937af9df", "submitter": { "id": 143, "url": "https://patchwork.libcamera.org/api/1.1/people/143/?format=api", "name": "Jacopo Mondi", "email": "jacopo.mondi@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/18359/mbox/", "series": [ { "id": 3795, "url": "https://patchwork.libcamera.org/api/1.1/series/3795/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3795", "date": "2023-03-08T16:40:25", "name": "ipa: rkisp1: lsc: Enable/disable LSC", "version": 1, "mbox": "https://patchwork.libcamera.org/series/3795/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/18359/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/18359/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 4DA03C3262\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 8 Mar 2023 16:40:47 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0ACB6626CA;\n\tWed, 8 Mar 2023 17:40:45 +0100 (CET)", "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 11C8F62693\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 8 Mar 2023 17:40:43 +0100 (CET)", "from uno.homenet.telecomitalia.it\n\t(host-79-47-54-87.retail.telecomitalia.it [79.47.54.87])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 6C8DF27C;\n\tWed, 8 Mar 2023 17:40:42 +0100 (CET)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1678293645;\n\tbh=WyvDY9XJa9vonHalzYCuROWq39FoZBj+4EojS9hLbnk=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=EFBsNW4REs3wYOclvu3ajEN041vREV8qkzFIzujzC9YpyBpoz9hq8EogPve+JmkEk\n\tGDtWGvLsEBzGfCjk5TWXml9QMJxpHMKw1MA/bZjbrIcaTHL/yW7YzKhM+4yUp3OoZZ\n\tKOldvnwJnV73aMYcOr7a0A6sMRLPBU1/qhfmNwWd5e8xROjsbEORLuVJAc0uAOspNI\n\t0LCv3NEcYvnzIhHjZ51KZVkh4c1hh+b5vJUb7d9hdaeeJ2d2n/2AVV/OLQENnINID1\n\tZG+5YluWOvm0yOMelEzKz+gMqikjwBrt7OKxjcNhIhTTQTsiPaKNpW2TwNRrpFGpIK\n\tlbZBlGL2ST+jg==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1678293642;\n\tbh=WyvDY9XJa9vonHalzYCuROWq39FoZBj+4EojS9hLbnk=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=dQ4wBaqOhjBv7VX7WNCeI5byt+eFHViZlpr9tZWRsEjMrT1VK4gxm9JJbuTjS8cVm\n\tkfJZhljtvhiWKSTD7Fi5I95C8MZMhSjSXKS6l2B4QD1eBWnFVVYpapPzg31abJmwwx\n\tXU5O6jmWQlt20y44jP4CLodWtTEaRs6sPgL6EivM=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"dQ4wBaqO\"; dkim-atps=neutral", "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", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 2/3] ipa: rkisp1: lsc: Enable/disable LSC\n\talgorithm", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "From": "Jacopo Mondi via libcamera-devel <libcamera-devel@lists.libcamera.org>", "Reply-To": "Jacopo Mondi <jacopo.mondi@ideasonboard.com>", "Cc": "Jacopo Mondi <jacopo.mondi@ideasonboard.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Implement LSC algorithm enable/disable by parsing the\n\"LensShadingEnable\" control in queueRequest().\n\nStart with the LSC algorithm enabled by default and disable it\non application request.\n\nSigned-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>\n---\n src/ipa/rkisp1/algorithms/lsc.cpp | 54 ++++++++++++++++++++++++++++++-\n src/ipa/rkisp1/algorithms/lsc.h | 4 +++\n src/ipa/rkisp1/ipa_context.h | 5 +++\n src/ipa/rkisp1/rkisp1.cpp | 1 +\n 4 files changed, 63 insertions(+), 1 deletion(-)", "diff": "diff --git a/src/ipa/rkisp1/algorithms/lsc.cpp b/src/ipa/rkisp1/algorithms/lsc.cpp\nindex a7ccedb1ed3b..0c9f6cbd1dec 100644\n--- a/src/ipa/rkisp1/algorithms/lsc.cpp\n+++ b/src/ipa/rkisp1/algorithms/lsc.cpp\n@@ -14,6 +14,8 @@\n #include <libcamera/base/log.h>\n #include <libcamera/base/utils.h>\n \n+#include <libcamera/control_ids.h>\n+\n #include \"libcamera/internal/yaml_parser.h\"\n \n #include \"linux/rkisp1-config.h\"\n@@ -147,6 +149,8 @@ int LensShadingCorrection::init([[maybe_unused]] IPAContext &context,\n \t\treturn -EINVAL;\n \t}\n \n+\tcontext.configuration.lsc.enabled = false;\n+\n \treturn 0;\n }\n \n@@ -181,10 +185,20 @@ int LensShadingCorrection::configure(IPAContext &context,\n \t\tyGrad_[i] = std::round(32768 / ySizes_[i]);\n \t}\n \n-\tcontext.configuration.lsc.enabled = true;\n+\t/* Enable LSC on first run unless explicitly disabled by application. */\n+\tcontext.activeState.lsc.enable = true;\n+\tcontext.activeState.lsc.active = false;\n+\n \treturn 0;\n }\n \n+void LensShadingCorrection::disableLSC(rkisp1_params_cfg *params)\n+{\n+\tparams->module_en_update |= RKISP1_CIF_ISP_MODULE_LSC;\n+\tparams->module_ens &= ~RKISP1_CIF_ISP_MODULE_LSC;\n+\tparams->module_cfg_update |= RKISP1_CIF_ISP_MODULE_LSC;\n+}\n+\n void LensShadingCorrection::setParameters(rkisp1_params_cfg *params)\n {\n \tstruct rkisp1_cif_isp_lsc_config &config = params->others.lsc_config;\n@@ -242,6 +256,25 @@ void LensShadingCorrection::interpolateTable(rkisp1_cif_isp_lsc_config &config,\n \t}\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 [[maybe_unused]] 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->enable) {\n+\t\tLOG(RkISP1Lsc, Debug)\n+\t\t\t<< (*lscEnable ? \"Enabling\" : \"Disabling\") << \" LSC\";\n+\n+\t\tlsc->enable = *lscEnable;\n+\t}\n+}\n+\n /**\n * \\copydoc libcamera::ipa::Algorithm::prepare\n */\n@@ -250,6 +283,25 @@ void LensShadingCorrection::prepare(IPAContext &context,\n \t\t\t\t [[maybe_unused]] IPAFrameContext &frameContext,\n \t\t\t\t rkisp1_params_cfg *params)\n {\n+\tauto lsc = &context.activeState.lsc;\n+\n+\tif (lsc->enable != lsc->active) {\n+\t\t/* If LSC has to be disabled, disable it and return here. */\n+\t\tif (!lsc->enable) {\n+\t\t\tdisableLSC(params);\n+\t\t\tlsc->active = false;\n+\t\t\tcontext.configuration.lsc.enabled = false;\n+\t\t\treturn;\n+\t\t}\n+\n+\t\tlsc->active = true;\n+\t\tcontext.configuration.lsc.enabled = true;\n+\t}\n+\n+\t/* Nothing more to do here if LSC is not active. */\n+\tif (!lsc->active)\n+\t\treturn;\n+\n \tstruct rkisp1_cif_isp_lsc_config &config = params->others.lsc_config;\n \n \t/*\ndiff --git a/src/ipa/rkisp1/algorithms/lsc.h b/src/ipa/rkisp1/algorithms/lsc.h\nindex e2a93a566973..4708065bcfb7 100644\n--- a/src/ipa/rkisp1/algorithms/lsc.h\n+++ b/src/ipa/rkisp1/algorithms/lsc.h\n@@ -23,6 +23,9 @@ public:\n \n \tint init(IPAContext &context, const YamlObject &tuningData) override;\n \tint configure(IPAContext &context, const IPACameraSensorInfo &configInfo) 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 \tvoid prepare(IPAContext &context, const uint32_t frame,\n \t\t IPAFrameContext &frameContext,\n \t\t rkisp1_params_cfg *params) override;\n@@ -36,6 +39,7 @@ private:\n \t\tstd::vector<uint16_t> b;\n \t};\n \n+\tvoid disableLSC(rkisp1_params_cfg *params);\n \tvoid setParameters(rkisp1_params_cfg *params);\n \tvoid copyTable(rkisp1_cif_isp_lsc_config &config, const Components &set0);\n \tvoid interpolateTable(rkisp1_cif_isp_lsc_config &config,\ndiff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h\nindex b9b2065328d6..ada995274ebf 100644\n--- a/src/ipa/rkisp1/ipa_context.h\n+++ b/src/ipa/rkisp1/ipa_context.h\n@@ -98,6 +98,11 @@ struct IPAActiveState {\n \t\tuint8_t denoise;\n \t\tuint8_t sharpness;\n \t} filter;\n+\n+\tstruct {\n+\t\tbool enable;\n+\t\tbool active;\n+\t} lsc;\n };\n \n struct IPAFrameContext : public FrameContext {\ndiff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex 6544c925ba25..2772592eda66 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -106,6 +106,7 @@ const ControlInfoMap::Map rkisp1Controls{\n \t{ &controls::Saturation, ControlInfo(0.0f, 1.993f, 1.0f) },\n \t{ &controls::Sharpness, ControlInfo(0.0f, 10.0f, 1.0f) },\n \t{ &controls::draft::NoiseReductionMode, ControlInfo(controls::draft::NoiseReductionModeValues) },\n+\t{ &controls::LensShadingEnable, ControlInfo(false, true) },\n };\n \n } /* namespace */\n", "prefixes": [ "libcamera-devel", "2/3" ] }