Patch Detail
Show a patch.
GET /api/patches/17471/?format=api
{ "id": 17471, "url": "https://patchwork.libcamera.org/api/patches/17471/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17471/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20220930015547.29911-1-laurent.pinchart@ideasonboard.com>", "date": "2022-09-30T01:55:47", "name": "[libcamera-devel] ipa: rkisp1: Remove initialized_ flags from algorithms", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "ccdad4edf829f5c964ad5c7f9fb7955141ea0069", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/17471/mbox/", "series": [ { "id": 3516, "url": "https://patchwork.libcamera.org/api/series/3516/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3516", "date": "2022-09-30T01:55:47", "name": "[libcamera-devel] ipa: rkisp1: Remove initialized_ flags from algorithms", "version": 1, "mbox": "https://patchwork.libcamera.org/series/3516/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17471/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17471/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 DF6C8C0DA4\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 30 Sep 2022 01:55:51 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 20C3B62395;\n\tFri, 30 Sep 2022 03:55:51 +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 A75A661F76\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 30 Sep 2022 03:55:49 +0200 (CEST)", "from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 06EDA47C;\n\tFri, 30 Sep 2022 03:55:48 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1664502951;\n\tbh=7nwjN01hjkxdj3VCdp0d6pb0vcb3tVMM/HCDGHxYcV0=;\n\th=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post:\n\tList-Help:List-Subscribe:From:Reply-To:From;\n\tb=rUr93SYj8IBdocwNZ8NTH16AXySTGE5QEtzBsTX0jjjatPjBe6Gyp0S607+sJrAEH\n\tHW/9n0hWbdaMHfSaJKJDyqe//BK+9WHIiqsgcGrFEE3WJbOnggu5H5FvjPTino5MdF\n\t8MTFNiZBBiE2RTwNWgRgBPYSY99YE2TIVWO/1amkfVaDJ54DnrNSrSbbBRNJD6GAD4\n\taAIq2msP+yRX4fsxKHN3FHPLbFywlQLQBxGHyTVlSCvadVPpeZiObqQinKbhR4gY3a\n\t0RedEeFy6euxKqHwSQGLz6mNFGZBtyK5svsLb2HnkXZCMdLTakPLkAKB13kl+j0BOS\n\tvXSWv8fSUm94Q==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1664502949;\n\tbh=7nwjN01hjkxdj3VCdp0d6pb0vcb3tVMM/HCDGHxYcV0=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=ExDXzw98uYS6kg0hw4FBWQD4eJTINuO3LACKsNSjuISPC3kIsXOW6AYrm55fF86BK\n\tjeaI5X8njHHinMPj1kL9tJO4kVe6FNQMlXNNPQpS9933vEhZMnSUL1MCwZUcLqa57A\n\tT4/PbMvxHnDanGslIArlbDx8CuWrEFercO3vBkUo=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"ExDXzw98\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 30 Sep 2022 04:55:47 +0300", "Message-Id": "<20220930015547.29911-1-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.35.1", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH] ipa: rkisp1: Remove initialized_ flags\n\tfrom algorithms", "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": "Laurent Pinchart via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Multiple algorithms have an initialized_ flag that they set to true at\nthe end of the init() function, and check at the beginning of prepare()\nto skip preparation. This serves no real purpose, as the flag can only\nbe false if init() fails, in which case the IPA module initialization as\na whole will fail.\n\nDrop the initialized_ flags.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/ipa/rkisp1/algorithms/dpcc.cpp | 7 +------\n src/ipa/rkisp1/algorithms/dpcc.h | 1 -\n src/ipa/rkisp1/algorithms/dpf.cpp | 7 +------\n src/ipa/rkisp1/algorithms/dpf.h | 1 -\n src/ipa/rkisp1/algorithms/gsl.cpp | 5 -----\n src/ipa/rkisp1/algorithms/gsl.h | 1 -\n src/ipa/rkisp1/algorithms/lsc.cpp | 8 +-------\n src/ipa/rkisp1/algorithms/lsc.h | 2 --\n 8 files changed, 3 insertions(+), 29 deletions(-)", "diff": "diff --git a/src/ipa/rkisp1/algorithms/dpcc.cpp b/src/ipa/rkisp1/algorithms/dpcc.cpp\nindex 53aa1d93e42b..3d6b87e62239 100644\n--- a/src/ipa/rkisp1/algorithms/dpcc.cpp\n+++ b/src/ipa/rkisp1/algorithms/dpcc.cpp\n@@ -189,7 +189,7 @@ bool parseMethod(const YamlObject &yamlMethod, const Method &method,\n } /* namespace */\n \n DefectPixelClusterCorrection::DefectPixelClusterCorrection()\n-\t: initialized_(false), config_({})\n+\t: config_({})\n {\n }\n \n@@ -250,8 +250,6 @@ int DefectPixelClusterCorrection::init([[maybe_unused]] IPAContext &context,\n \t\t}\n \t}\n \n-\tinitialized_ = true;\n-\n \treturn 0;\n }\n \n@@ -266,9 +264,6 @@ void DefectPixelClusterCorrection::prepare([[maybe_unused]] IPAContext &context,\n \tif (frame > 0)\n \t\treturn;\n \n-\tif (!initialized_)\n-\t\treturn;\n-\n \tparams->others.dpcc_config = config_;\n \n \tparams->module_en_update |= RKISP1_CIF_ISP_MODULE_DPCC;\ndiff --git a/src/ipa/rkisp1/algorithms/dpcc.h b/src/ipa/rkisp1/algorithms/dpcc.h\nindex 894c0249f35d..b1fac7d1bb37 100644\n--- a/src/ipa/rkisp1/algorithms/dpcc.h\n+++ b/src/ipa/rkisp1/algorithms/dpcc.h\n@@ -25,7 +25,6 @@ public:\n \t\t rkisp1_params_cfg *params) override;\n \n private:\n-\tbool initialized_;\n \trkisp1_cif_isp_dpcc_config config_;\n };\n \ndiff --git a/src/ipa/rkisp1/algorithms/dpf.cpp b/src/ipa/rkisp1/algorithms/dpf.cpp\nindex f7bc371da52e..82d4f7fecc67 100644\n--- a/src/ipa/rkisp1/algorithms/dpf.cpp\n+++ b/src/ipa/rkisp1/algorithms/dpf.cpp\n@@ -35,7 +35,7 @@ namespace ipa::rkisp1::algorithms {\n LOG_DEFINE_CATEGORY(RkISP1Dpf)\n \n Dpf::Dpf()\n-\t: initialized_(false), config_({}), strengthConfig_({})\n+\t: config_({}), strengthConfig_({})\n {\n }\n \n@@ -166,8 +166,6 @@ int Dpf::init([[maybe_unused]] IPAContext &context,\n \tstrengthConfig_.g = fSObject[\"g\"].get<uint16_t>(64);\n \tstrengthConfig_.b = fSObject[\"b\"].get<uint16_t>(64);\n \n-\tinitialized_ = true;\n-\n \treturn 0;\n }\n \n@@ -219,9 +217,6 @@ void Dpf::queueRequest(IPAContext &context,\n void Dpf::prepare(IPAContext &context, const uint32_t frame,\n \t\t IPAFrameContext &frameContext, rkisp1_params_cfg *params)\n {\n-\tif (!initialized_)\n-\t\treturn;\n-\n \tif (frame == 0) {\n \t\tparams->others.dpf_config = config_;\n \t\tparams->others.dpf_strength_config = strengthConfig_;\ndiff --git a/src/ipa/rkisp1/algorithms/dpf.h b/src/ipa/rkisp1/algorithms/dpf.h\nindex e232cad4ee87..58f29f74e84b 100644\n--- a/src/ipa/rkisp1/algorithms/dpf.h\n+++ b/src/ipa/rkisp1/algorithms/dpf.h\n@@ -30,7 +30,6 @@ public:\n \t\t rkisp1_params_cfg *params) override;\n \n private:\n-\tbool initialized_;\n \tstruct rkisp1_cif_isp_dpf_config config_;\n \tstruct rkisp1_cif_isp_dpf_strength_config strengthConfig_;\n };\ndiff --git a/src/ipa/rkisp1/algorithms/gsl.cpp b/src/ipa/rkisp1/algorithms/gsl.cpp\nindex 9cbad02038c4..a80fed589bb2 100644\n--- a/src/ipa/rkisp1/algorithms/gsl.cpp\n+++ b/src/ipa/rkisp1/algorithms/gsl.cpp\n@@ -49,7 +49,6 @@ LOG_DEFINE_CATEGORY(RkISP1Gsl)\n static constexpr unsigned int kDegammaXIntervals = 16;\n \n GammaSensorLinearization::GammaSensorLinearization()\n-\t: initialized_(false)\n {\n }\n \n@@ -111,7 +110,6 @@ int GammaSensorLinearization::init([[maybe_unused]] IPAContext &context,\n \t\treturn -EINVAL;\n \t}\n \n-\tinitialized_ = true;\n \treturn 0;\n }\n \n@@ -126,9 +124,6 @@ void GammaSensorLinearization::prepare([[maybe_unused]] IPAContext &context,\n \tif (frame > 0)\n \t\treturn;\n \n-\tif (!initialized_)\n-\t\treturn;\n-\n \tparams->others.sdg_config.xa_pnts.gamma_dx0 = gammaDx_[0];\n \tparams->others.sdg_config.xa_pnts.gamma_dx1 = gammaDx_[1];\n \ndiff --git a/src/ipa/rkisp1/algorithms/gsl.h b/src/ipa/rkisp1/algorithms/gsl.h\nindex 5024b6835949..0f1116a7b1f2 100644\n--- a/src/ipa/rkisp1/algorithms/gsl.h\n+++ b/src/ipa/rkisp1/algorithms/gsl.h\n@@ -25,7 +25,6 @@ public:\n \t\t rkisp1_params_cfg *params) override;\n \n private:\n-\tbool initialized_;\n \tuint32_t gammaDx_[2];\n \tstd::vector<uint16_t> curveYr_;\n \tstd::vector<uint16_t> curveYg_;\ndiff --git a/src/ipa/rkisp1/algorithms/lsc.cpp b/src/ipa/rkisp1/algorithms/lsc.cpp\nindex 44245caa705e..102535bd11a4 100644\n--- a/src/ipa/rkisp1/algorithms/lsc.cpp\n+++ b/src/ipa/rkisp1/algorithms/lsc.cpp\n@@ -89,7 +89,6 @@ static std::vector<uint16_t> parseTable(const YamlObject &tuningData,\n }\n \n LensShadingCorrection::LensShadingCorrection()\n-\t: initialized_(false)\n {\n }\n \n@@ -114,8 +113,6 @@ int LensShadingCorrection::init([[maybe_unused]] IPAContext &context,\n \t gbData_.empty() || bData_.empty())\n \t\treturn -EINVAL;\n \n-\tinitialized_ = true;\n-\n \treturn 0;\n }\n \n@@ -125,7 +122,7 @@ int LensShadingCorrection::init([[maybe_unused]] IPAContext &context,\n int LensShadingCorrection::configure(IPAContext &context,\n \t\t\t\t [[maybe_unused]] const IPACameraSensorInfo &configInfo)\n {\n-\tcontext.configuration.lsc.enabled = initialized_;\n+\tcontext.configuration.lsc.enabled = true;\n \treturn 0;\n }\n \n@@ -139,9 +136,6 @@ void LensShadingCorrection::prepare(IPAContext &context, const uint32_t frame,\n \tif (frame > 0)\n \t\treturn;\n \n-\tif (!initialized_)\n-\t\treturn;\n-\n \tstruct rkisp1_cif_isp_lsc_config &config = params->others.lsc_config;\n \tconst Size &size = context.configuration.sensor.size;\n \tSize totalSize{};\ndiff --git a/src/ipa/rkisp1/algorithms/lsc.h b/src/ipa/rkisp1/algorithms/lsc.h\nindex da957d3e3103..6c052669d80f 100644\n--- a/src/ipa/rkisp1/algorithms/lsc.h\n+++ b/src/ipa/rkisp1/algorithms/lsc.h\n@@ -26,8 +26,6 @@ public:\n \t\t rkisp1_params_cfg *params) override;\n \n private:\n-\tbool initialized_;\n-\n \tstd::vector<uint16_t> rData_;\n \tstd::vector<uint16_t> grData_;\n \tstd::vector<uint16_t> gbData_;\n", "prefixes": [ "libcamera-devel" ] }