[{"id":24174,"web_url":"https://patchwork.libcamera.org/comment/24174/","msgid":"","date":"2022-07-27T03:26:34","subject":"Re: [libcamera-devel] [PATCH v3 5/5] ipa: rkisp1: Add support of\n\tDefect Pixel Cluster Correction control","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Florian,\n\nThank you for the patch.\n\nOn Tue, Jul 26, 2022 at 04:36:35PM +0200, Florian Sylvestre via libcamera-devel wrote:\n> The Defect Pixel Cluster Correction algorithm is responsible to minimize\n> the impact of defective pixels. The on-the-fly method is actually used,\n> based on coefficient provided by the tuning file.\n> \n> Signed-off-by: Florian Sylvestre \n> ---\n> src/ipa/rkisp1/algorithms/dpcc.cpp | 254 ++++++++++++++++++++++++++\n> src/ipa/rkisp1/algorithms/dpcc.h | 31 ++++\n> src/ipa/rkisp1/algorithms/meson.build | 1 +\n> src/ipa/rkisp1/data/ov5640.yaml | 60 ++++++\n> 4 files changed, 346 insertions(+)\n> create mode 100644 src/ipa/rkisp1/algorithms/dpcc.cpp\n> create mode 100644 src/ipa/rkisp1/algorithms/dpcc.h\n> \n> diff --git a/src/ipa/rkisp1/algorithms/dpcc.cpp b/src/ipa/rkisp1/algorithms/dpcc.cpp\n> new file mode 100644\n> index 00000000..dab9e785\n> --- /dev/null\n> +++ b/src/ipa/rkisp1/algorithms/dpcc.cpp\n> @@ -0,0 +1,254 @@\n> +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> +/*\n> + * Copyright (C) 2021-2022, Ideas On Board\n> + *\n> + * dpcc.cpp - RkISP1 Defect Pixel Cluster Correction control\n> + */\n> +\n> +#include \"dpcc.h\"\n> +\n> +#include \n> +\n> +#include \"libcamera/internal/yaml_parser.h\"\n> +\n> +#include \"linux/rkisp1-config.h\"\n> +\n> +/**\n> + * \\file dpcc.h\n> + */\n> +\n> +namespace libcamera {\n> +\n> +namespace ipa::rkisp1::algorithms {\n> +\n> +/**\n> + * \\class DefectPixelClusterCorrection\n> + * \\brief RkISP1 Defect Pixel Cluster Correction control\n> + *\n> + * Depending of the sensor quality, some pixels can be defective and then\n> + * appear significantly brighter or darker than the other pixels.\n> + *\n> + * The Defect Pixel Cluster Correction algorithms is responsible to minimize\n> + * the impact of the pixels. This can be done with algorithms applied at run\n> + * time (on-the-fly method) or with a table of defective pixels. Only the first\n> + * method is supported for the moment.\n> + */\n> +\n> +LOG_DEFINE_CATEGORY(RkISP1Dpcc)\n> +\n> +DefectPixelClusterCorrection::DefectPixelClusterCorrection()\n> +\t: initialized_(false), config_({})\n> +{\n> +}\n> +\n> +/**\n> + * \\copydoc libcamera::ipa::Algorithm::init\n> + */\n> +int DefectPixelClusterCorrection::init([[maybe_unused]] IPAContext &context,\n> +\t\t\t\t const YamlObject &tuningData)\n> +{\n> +\tconfig_.mode = RKISP1_CIF_ISP_DPCC_MODE_STAGE1_ENABLE;\n> +\tconfig_.output_mode = RKISP1_CIF_ISP_DPCC_OUTPUT_MODE_STAGE1_INCL_G_CENTER\n> +\t\t\t | RKISP1_CIF_ISP_DPCC_OUTPUT_MODE_STAGE1_INCL_RB_CENTER;\n\nThe | should be aligned under the =.\n\n> +\n> +\tconfig_.set_use = tuningData[\"fixed-set\"].get(false)\n> +\t\t? RKISP1_CIF_ISP_DPCC_SET_USE_STAGE1_USE_FIX_SET : 0;\n\nAnd here the ? under the = too.\n\nReviewed-by: Laurent Pinchart \n\n> +\n> +\t/* Get all defined sets to apply (up to 3). */\n> +\tconst YamlObject &setsObject = tuningData[\"sets\"];\n> +\tif (!setsObject.isList()) {\n> +\t\tLOG(RkISP1Dpcc, Error)\n> +\t\t\t<< \"'sets' parameter not found in tuning file\";\n> +\t\treturn -EINVAL;\n> +\t}\n> +\n> +\tif (setsObject.size() > RKISP1_CIF_ISP_DPCC_METHODS_MAX) {\n> +\t\tLOG(RkISP1Dpcc, Error)\n> +\t\t\t<< \"'sets' size in tuning file (\" << setsObject.size()\n> +\t\t\t<< \") exceeds the maximum hardware capacity (3)\";\n> +\t\treturn -EINVAL;\n> +\t}\n> +\n> +\tfor (std::size_t i = 0; i < setsObject.size(); ++i) {\n> +\t\tstruct rkisp1_cif_isp_dpcc_methods_config &method = config_.methods[i];\n> +\t\tconst YamlObject &set = setsObject[i];\n> +\t\tuint16_t value;\n> +\n> +\t\t/* Enable set if described in YAML tuning file. */\n> +\t\tconfig_.set_use |= 1 << i;\n> +\n> +\t\t/* PG Method */\n> +\t\tconst YamlObject &pgObject = set[\"pg-factor\"];\n> +\n> +\t\tif (pgObject.contains(\"green\")) {\n> +\t\t\tmethod.method |=\n> +\t\t\t\tRKISP1_CIF_ISP_DPCC_METHODS_SET_PG_GREEN_ENABLE;\n> +\n> +\t\t\tvalue = pgObject[\"green\"].get(0);\n> +\t\t\tmethod.pg_fac |= RKISP1_CIF_ISP_DPCC_PG_FAC_G(value);\n> +\t\t}\n> +\n> +\t\tif (pgObject.contains(\"red-blue\")) {\n> +\t\t\tmethod.method |=\n> +\t\t\t\tRKISP1_CIF_ISP_DPCC_METHODS_SET_PG_RED_BLUE_ENABLE;\n> +\n> +\t\t\tvalue = pgObject[\"red-blue\"].get(0);\n> +\t\t\tmethod.pg_fac |= RKISP1_CIF_ISP_DPCC_PG_FAC_RB(value);\n> +\t\t}\n> +\n> +\t\t/* RO Method */\n> +\t\tconst YamlObject &roObject = set[\"ro-limits\"];\n> +\n> +\t\tif (roObject.contains(\"green\")) {\n> +\t\t\tmethod.method |=\n> +\t\t\t\tRKISP1_CIF_ISP_DPCC_METHODS_SET_RO_GREEN_ENABLE;\n> +\n> +\t\t\tvalue = roObject[\"green\"].get(0);\n> +\t\t\tconfig_.ro_limits |=\n> +\t\t\t\tRKISP1_CIF_ISP_DPCC_RO_LIMITS_n_G(i, value);\n> +\t\t}\n> +\n> +\t\tif (roObject.contains(\"red-blue\")) {\n> +\t\t\tmethod.method |=\n> +\t\t\t\tRKISP1_CIF_ISP_DPCC_METHODS_SET_RO_RED_BLUE_ENABLE;\n> +\n> +\t\t\tvalue = roObject[\"red-blue\"].get(0);\n> +\t\t\tconfig_.ro_limits |=\n> +\t\t\t\tRKISP1_CIF_ISP_DPCC_RO_LIMITS_n_RB(i, value);\n> +\t\t}\n> +\n> +\t\t/* RG Method */\n> +\t\tconst YamlObject &rgObject = set[\"rg-factor\"];\n> +\t\tmethod.rg_fac = 0;\n> +\n> +\t\tif (rgObject.contains(\"green\")) {\n> +\t\t\tmethod.method |=\n> +\t\t\t\tRKISP1_CIF_ISP_DPCC_METHODS_SET_RG_GREEN_ENABLE;\n> +\n> +\t\t\tvalue = rgObject[\"green\"].get(0);\n> +\t\t\tmethod.rg_fac |= RKISP1_CIF_ISP_DPCC_RG_FAC_G(value);\n> +\t\t}\n> +\n> +\t\tif (rgObject.contains(\"red-blue\")) {\n> +\t\t\tmethod.method |=\n> +\t\t\t\tRKISP1_CIF_ISP_DPCC_METHODS_SET_RG_RED_BLUE_ENABLE;\n> +\n> +\t\t\tvalue = rgObject[\"red-blue\"].get(0);\n> +\t\t\tmethod.rg_fac |= RKISP1_CIF_ISP_DPCC_RG_FAC_RB(value);\n> +\t\t}\n> +\n> +\t\t/* RND Method */\n> +\t\tconst YamlObject &rndOffsetsObject = set[\"rnd-offsets\"];\n> +\n> +\t\tif (rndOffsetsObject.contains(\"green\")) {\n> +\t\t\tmethod.method |=\n> +\t\t\t\tRKISP1_CIF_ISP_DPCC_METHODS_SET_RND_GREEN_ENABLE;\n> +\n> +\t\t\tvalue = rndOffsetsObject[\"green\"].get(0);\n> +\t\t\tconfig_.rnd_offs |=\n> +\t\t\t\tRKISP1_CIF_ISP_DPCC_RND_OFFS_n_G(i, value);\n> +\t\t}\n> +\n> +\t\tif (rndOffsetsObject.contains(\"red-blue\")) {\n> +\t\t\tmethod.method |=\n> +\t\t\t\tRKISP1_CIF_ISP_DPCC_METHODS_SET_RND_RED_BLUE_ENABLE;\n> +\n> +\t\t\tvalue = rndOffsetsObject[\"red-blue\"].get(0);\n> +\t\t\tconfig_.rnd_offs |=\n> +\t\t\t\tRKISP1_CIF_ISP_DPCC_RND_OFFS_n_RB(i, value);\n> +\t\t}\n> +\n> +\t\tconst YamlObject &rndThresholdObject = set[\"rnd-threshold\"];\n> +\t\tmethod.rnd_thresh = 0;\n> +\n> +\t\tif (rndThresholdObject.contains(\"green\")) {\n> +\t\t\tmethod.method |=\n> +\t\t\t\tRKISP1_CIF_ISP_DPCC_METHODS_SET_RND_GREEN_ENABLE;\n> +\n> +\t\t\tvalue = rndThresholdObject[\"green\"].get(0);\n> +\t\t\tmethod.rnd_thresh |=\n> +\t\t\t\tRKISP1_CIF_ISP_DPCC_RND_THRESH_G(value);\n> +\t\t}\n> +\n> +\t\tif (rndThresholdObject.contains(\"red-blue\")) {\n> +\t\t\tmethod.method |=\n> +\t\t\t\tRKISP1_CIF_ISP_DPCC_METHODS_SET_RND_RED_BLUE_ENABLE;\n> +\n> +\t\t\tvalue = rndThresholdObject[\"red-blue\"].get(0);\n> +\t\t\tmethod.rnd_thresh |=\n> +\t\t\t\tRKISP1_CIF_ISP_DPCC_RND_THRESH_RB(value);\n> +\t\t}\n> +\n> +\t\t/* LC Method */\n> +\t\tconst YamlObject &lcThresholdObject = set[\"line-threshold\"];\n> +\t\tmethod.line_thresh = 0;\n> +\n> +\t\tif (lcThresholdObject.contains(\"green\")) {\n> +\t\t\tmethod.method |=\n> +\t\t\t\tRKISP1_CIF_ISP_DPCC_METHODS_SET_LC_GREEN_ENABLE;\n> +\n> +\t\t\tvalue = lcThresholdObject[\"green\"].get(0);\n> +\t\t\tmethod.line_thresh |=\n> +\t\t\t\tRKISP1_CIF_ISP_DPCC_LINE_THRESH_G(value);\n> +\t\t}\n> +\n> +\t\tif (lcThresholdObject.contains(\"red-blue\")) {\n> +\t\t\tmethod.method |=\n> +\t\t\t\tRKISP1_CIF_ISP_DPCC_METHODS_SET_LC_RED_BLUE_ENABLE;\n> +\n> +\t\t\tvalue = lcThresholdObject[\"red-blue\"].get(0);\n> +\t\t\tmethod.line_thresh |=\n> +\t\t\t\tRKISP1_CIF_ISP_DPCC_LINE_THRESH_RB(value);\n> +\t\t}\n> +\n> +\t\tconst YamlObject &lcTMadFactorObject = set[\"line-mad-factor\"];\n> +\t\tmethod.line_mad_fac = 0;\n> +\n> +\t\tif (lcTMadFactorObject.contains(\"green\")) {\n> +\t\t\tmethod.method |=\n> +\t\t\t\tRKISP1_CIF_ISP_DPCC_METHODS_SET_LC_GREEN_ENABLE;\n> +\n> +\t\t\tvalue = lcTMadFactorObject[\"green\"].get(0);\n> +\t\t\tmethod.line_mad_fac |=\n> +\t\t\t\tRKISP1_CIF_ISP_DPCC_LINE_MAD_FAC_G(value);\n> +\t\t}\n> +\n> +\t\tif (lcTMadFactorObject.contains(\"red-blue\")) {\n> +\t\t\tmethod.method |=\n> +\t\t\t\tRKISP1_CIF_ISP_DPCC_METHODS_SET_LC_RED_BLUE_ENABLE;\n> +\n> +\t\t\tvalue = lcTMadFactorObject[\"red-blue\"].get(0);\n> +\t\t\tmethod.line_mad_fac |=\n> +\t\t\t\tRKISP1_CIF_ISP_DPCC_LINE_MAD_FAC_RB(value);\n> +\t\t}\n> +\t}\n> +\n> +\tinitialized_ = true;\n> +\n> +\treturn 0;\n> +}\n> +\n> +/**\n> + * \\copydoc libcamera::ipa::Algorithm::prepare\n> + */\n> +void DefectPixelClusterCorrection::prepare(IPAContext &context,\n> +\t\t\t\t\t rkisp1_params_cfg *params)\n> +{\n> +\tif (context.frameContext.frameCount > 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;\n> +\tparams->module_ens |= RKISP1_CIF_ISP_MODULE_DPCC;\n> +\tparams->module_cfg_update |= RKISP1_CIF_ISP_MODULE_DPCC;\n> +}\n> +\n> +REGISTER_IPA_ALGORITHM(DefectPixelClusterCorrection, \"DefectPixelClusterCorrection\")\n> +\n> +} /* namespace ipa::rkisp1::algorithms */\n> +\n> +} /* namespace libcamera */\n> diff --git a/src/ipa/rkisp1/algorithms/dpcc.h b/src/ipa/rkisp1/algorithms/dpcc.h\n> new file mode 100644\n> index 00000000..a363f7be\n> --- /dev/null\n> +++ b/src/ipa/rkisp1/algorithms/dpcc.h\n> @@ -0,0 +1,31 @@\n> +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> +/*\n> + * Copyright (C) 2021-2022, Ideas On Board\n> + *\n> + * dpcc.h - RkISP1 Defect Pixel Cluster Correction control\n> + */\n> +\n> +#pragma once\n> +\n> +#include \"algorithm.h\"\n> +\n> +namespace libcamera {\n> +\n> +namespace ipa::rkisp1::algorithms {\n> +\n> +class DefectPixelClusterCorrection : public Algorithm\n> +{\n> +public:\n> +\tDefectPixelClusterCorrection();\n> +\t~DefectPixelClusterCorrection() = default;\n> +\n> +\tint init(IPAContext &context, const YamlObject &tuningData) override;\n> +\tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n> +\n> +private:\n> +\tbool initialized_;\n> +\trkisp1_cif_isp_dpcc_config config_;\n> +};\n> +\n> +} /* namespace ipa::rkisp1::algorithms */\n> +} /* namespace libcamera */\n> diff --git a/src/ipa/rkisp1/algorithms/meson.build b/src/ipa/rkisp1/algorithms/meson.build\n> index 64e11dce..87007493 100644\n> --- a/src/ipa/rkisp1/algorithms/meson.build\n> +++ b/src/ipa/rkisp1/algorithms/meson.build\n> @@ -4,6 +4,7 @@ rkisp1_ipa_algorithms = files([\n> 'agc.cpp',\n> 'awb.cpp',\n> 'blc.cpp',\n> + 'dpcc.cpp',\n> 'gsl.cpp',\n> 'lsc.cpp',\n> ])\n> diff --git a/src/ipa/rkisp1/data/ov5640.yaml b/src/ipa/rkisp1/data/ov5640.yaml\n> index fa2ae436..2315ec43 100644\n> --- a/src/ipa/rkisp1/data/ov5640.yaml\n> +++ b/src/ipa/rkisp1/data/ov5640.yaml\n> @@ -95,4 +95,64 @@ algorithms:\n> 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024,\n> 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024,\n> ]\n> + - DefectPixelClusterCorrection:\n> + fixed-set: false\n> + sets:\n> + # PG, LC, RO, RND, RG\n> + - line-threshold:\n> + green: 8\n> + red-blue: 8\n> + line-mad-factor:\n> + green: 4\n> + red-blue: 4\n> + pg-factor:\n> + green: 8\n> + red-blue: 8\n> + rnd-threshold:\n> + green: 10\n> + red-blue: 10\n> + rg-factor:\n> + green: 32\n> + red-blue: 32\n> + ro-limits:\n> + green: 1\n> + red-blue: 1\n> + rnd-offsets:\n> + green: 2\n> + red-blue: 2\n> + # PG, LC, RO\n> + - line-threshold:\n> + green: 24\n> + red-blue: 32\n> + line-mad-factor:\n> + green: 16\n> + red-blue: 24\n> + pg-factor:\n> + green: 6\n> + red-blue: 8\n> + ro-limits:\n> + green: 2\n> + red-blue: 2\n> + # PG, LC, RO, RND, RG\n> + - line-threshold:\n> + green: 32\n> + red-blue: 32\n> + line-mad-factor:\n> + green: 4\n> + red-blue: 4\n> + pg-factor:\n> + green: 10\n> + red-blue: 10\n> + rnd-threshold:\n> + green: 6\n> + red-blue: 8\n> + rg-factor:\n> + green: 4\n> + red-blue: 4\n> + ro-limits:\n> + green: 1\n> + red-blue: 2\n> + rnd-offsets:\n> + green: 2\n> + red-blue: 2\n> ...","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 154A3BE173\n\tfor ;\n\tWed, 27 Jul 2022 03:26:38 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6E99E63312;\n\tWed, 27 Jul 2022 05:26:37 +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 A4B43603E8\n\tfor ;\n\tWed, 27 Jul 2022 05:26:35 +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 177A156D;\n\tWed, 27 Jul 2022 05:26:35 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1658892397;\n\tbh=YL2V245JtNtgmKLCZ50M8TWz3skuToADQ5+EucURN4o=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=PwU9LbYRmbeprPEWs+b08zwKWASOoMdBrMlJM9HEqtA3LjKlklo88VjpZ2maLkTRc\n\tSHS1/B21n5520ehTzGaCkoINHWAII5+8XQFkhEiM6cXGymSI4iLrG9gHvrfzKqSGjU\n\tkIuc78ynue2u34UTZ9TLPoWTKHdvdn81lx9EsyADDA3MFWAQ9yHGPm6fIaLjmhZ677\n\tOpBekpy0wa2qF1Qn0yaEqRwtOqPYMsuWj6OkrFSerm+BzOnXMcaNxUmIK3EkKEYLeo\n\trPcpYoX4z5rhABT55me82LWXLGrTdgBje85G1h9VpugbdXMnyuQ+kyBYlmyuQKkpI5\n\t6ykU8z9nd4QqA==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1658892395;\n\tbh=YL2V245JtNtgmKLCZ50M8TWz3skuToADQ5+EucURN4o=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=ieH5WxTDkaZ+fyymFkkzVabZN6gos++U8ylN1rcnwbpV2mqJt/8BGHcIIxtHn+ogi\n\t8TnmWiWtNNx4pW3eHzdqpJ6xifjxK3qsh7beJNbTKr01HpA8p3EuwPDGxVzMsvphwB\n\tQZbLwwEqrT5SXKEZtwmQQloHDTSFgGKKe2z6XTz4="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"ieH5WxTD\"; dkim-atps=neutral","Date":"Wed, 27 Jul 2022 06:26:34 +0300","To":"Florian Sylvestre ","Message-ID":"","References":"<20220726143635.518227-1-fsylvestre@baylibre.com>\n\t<20220726143635.518227-6-fsylvestre@baylibre.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20220726143635.518227-6-fsylvestre@baylibre.com>","Subject":"Re: [libcamera-devel] [PATCH v3 5/5] ipa: rkisp1: Add support of\n\tDefect Pixel Cluster Correction control","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","From":"Laurent Pinchart via libcamera-devel\n\t","Reply-To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]