[{"id":22461,"web_url":"https://patchwork.libcamera.org/comment/22461/","msgid":"<YkDH4/T7ndH+BDhN@pendragon.ideasonboard.com>","date":"2022-03-27T20:24:03","subject":"Re: [libcamera-devel] [PATCH v3 2/5] ipa: rkisp1: Introduce Black\n\tLevel Correction","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jean-Michel,\n\nThank you for the patch.\n\nOn Thu, Feb 24, 2022 at 12:33:44PM +0100, Jean-Michel Hautbois wrote:\n> In order to have the proper pixel levels, apply a fixed black level\n> correction, based on the imx219 tuning file in RPi. The value is 4096 on\n> 16 bits, and the pipeline for RkISP1 is on 12 bits, scale it.\n> \n> Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>\n> Tested-by: Peter Griffin <peter.griffin@linaro.org>\n\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\n> ---\n> v3: - return early when it is not the first frame anymore\n>     - add a todo to remember it may need a bit of rework later\n>     - Change the date of the copyright\n> ---\n>  src/ipa/rkisp1/algorithms/blc.cpp     | 57 +++++++++++++++++++++++++++\n>  src/ipa/rkisp1/algorithms/blc.h       | 30 ++++++++++++++\n>  src/ipa/rkisp1/algorithms/meson.build |  1 +\n>  src/ipa/rkisp1/rkisp1.cpp             |  2 +\n>  4 files changed, 90 insertions(+)\n>  create mode 100644 src/ipa/rkisp1/algorithms/blc.cpp\n>  create mode 100644 src/ipa/rkisp1/algorithms/blc.h\n> \n> diff --git a/src/ipa/rkisp1/algorithms/blc.cpp b/src/ipa/rkisp1/algorithms/blc.cpp\n> new file mode 100644\n> index 00000000..0c5948ff\n> --- /dev/null\n> +++ b/src/ipa/rkisp1/algorithms/blc.cpp\n> @@ -0,0 +1,57 @@\n> +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> +/*\n> + * Copyright (C) 2021-2022, Ideas On Board\n> + *\n> + * blc.cpp - RkISP1 Black Level Correction control\n> + */\n> +\n> +#include \"blc.h\"\n> +\n> +/**\n> + * \\file blc.h\n> + */\n> +\n> +namespace libcamera {\n> +\n> +namespace ipa::rkisp1::algorithms {\n> +\n> +/**\n> + * \\class BlackLevelCorrection\n> + * \\brief RkISP1 Black Level Correction control\n> + *\n> + * The pixels output by the camera normally include a black level, because\n> + * sensors do not always report a signal level of '0' for black. Pixels at or\n> + * below this level should be considered black. To achieve that, the RkISP BLC\n> + * algorithm subtracts a configurable offset from all pixels.\n> + *\n> + * The black level can be measured at runtime from an optical dark region of the\n> + * camera sensor, or measured during the camera tuning process. The first option\n> + * isn't currently supported.\n> + */\n> +\n> +/**\n> + * \\copydoc libcamera::ipa::Algorithm::prepare\n> + */\n> +void BlackLevelCorrection::prepare(IPAContext &context,\n> +\t\t\t\t   rkisp1_params_cfg *params)\n> +{\n> +\tif (context.frameContext.frameCount > 0)\n> +\t\treturn;\n> +\t/*\n> +\t * Substract fixed values taken from imx219 tuning file.\n> +\t * \\todo Use a configuration file for it ?\n> +\t */\n> +\tparams->others.bls_config.enable_auto = 0;\n> +\tparams->others.bls_config.fixed_val.r = 256;\n> +\tparams->others.bls_config.fixed_val.gr = 256;\n> +\tparams->others.bls_config.fixed_val.gb = 256;\n> +\tparams->others.bls_config.fixed_val.b = 256;\n> +\n> +\tparams->module_en_update |= RKISP1_CIF_ISP_MODULE_BLS;\n> +\tparams->module_ens |= RKISP1_CIF_ISP_MODULE_BLS;\n> +\tparams->module_cfg_update |= RKISP1_CIF_ISP_MODULE_BLS;\n> +}\n> +\n> +} /* namespace ipa::rkisp1::algorithms */\n> +\n> +} /* namespace libcamera */\n> diff --git a/src/ipa/rkisp1/algorithms/blc.h b/src/ipa/rkisp1/algorithms/blc.h\n> new file mode 100644\n> index 00000000..69874d8f\n> --- /dev/null\n> +++ b/src/ipa/rkisp1/algorithms/blc.h\n> @@ -0,0 +1,30 @@\n> +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> +/*\n> + * Copyright (C) 2021-2022, Ideas On Board\n> + *\n> + * blc.h - RkISP1 Black Level Correction control\n> + */\n> +\n> +#pragma once\n> +\n> +#include <linux/rkisp1-config.h>\n> +\n> +#include \"algorithm.h\"\n> +\n> +namespace libcamera {\n> +\n> +struct IPACameraSensorInfo;\n> +\n> +namespace ipa::rkisp1::algorithms {\n> +\n> +class BlackLevelCorrection : public Algorithm\n> +{\n> +public:\n> +\tBlackLevelCorrection() = default;\n> +\t~BlackLevelCorrection() = default;\n> +\n> +\tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\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 a19c1a4f..27c97731 100644\n> --- a/src/ipa/rkisp1/algorithms/meson.build\n> +++ b/src/ipa/rkisp1/algorithms/meson.build\n> @@ -2,4 +2,5 @@\n>  \n>  rkisp1_ipa_algorithms = files([\n>      'agc.cpp',\n> +    'blc.cpp',\n>  ])\n> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> index f119b3f3..bb3deb93 100644\n> --- a/src/ipa/rkisp1/rkisp1.cpp\n> +++ b/src/ipa/rkisp1/rkisp1.cpp\n> @@ -27,6 +27,7 @@\n>  \n>  #include \"algorithms/agc.h\"\n>  #include \"algorithms/algorithm.h\"\n> +#include \"algorithms/blc.h\"\n>  #include \"libipa/camera_sensor_helper.h\"\n>  \n>  #include \"ipa_context.h\"\n> @@ -126,6 +127,7 @@ int IPARkISP1::init(const IPASettings &settings, unsigned int hwRevision)\n>  \n>  \t/* Construct our Algorithms */\n>  \talgorithms_.push_back(std::make_unique<algorithms::Agc>());\n> +\talgorithms_.push_back(std::make_unique<algorithms::BlackLevelCorrection>());\n>  \n>  \treturn 0;\n>  }","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 44662C0F1B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSun, 27 Mar 2022 20:24:07 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 995B565631;\n\tSun, 27 Mar 2022 22:24:06 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BA7EE600AB\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun, 27 Mar 2022 22:24:05 +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 077742F7;\n\tSun, 27 Mar 2022 22:24:04 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1648412646;\n\tbh=Lod+1V8raqyy5OGXQL6QuulC9676+ZgZSNd5v3PCc/M=;\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=RGYx1nm/WI7ayGsG4hkg9I/DXNIn8Jllz+xrLIcU54LocsCBEdN8YosuD3XSoQ9wg\n\tYmmrQdNFhOlSXBH9dn7TqcjqPrg/+GXGPNVQh8pldguiAMhx7Lqe3lK2dOXRKe2ki0\n\tJt/5fuTziSNMp8hHBS/YAt+zX35I6eMX42bk8bOmxlDlESwJZvynBQkPPOJrphOW/D\n\tr8dC0BNXsYNFWMYk13LDJq400TnCrAlnJAHyL5y/yeegLhz9UCZ2vOIl0ImPSU5Tfe\n\tHErv8fwiCRVx9qS0lW1mJut1rSnakWxva0WpsSBhrV31bbx59o44h3wY4wzd6/YFMW\n\tPLpxDC/GUMx6g==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1648412645;\n\tbh=Lod+1V8raqyy5OGXQL6QuulC9676+ZgZSNd5v3PCc/M=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=aba2TYeo83Mu2n02YpSF7u3wx8oWQclNio9I7l8NkrYLmNPl6z36wr8d8HY7AinVM\n\tPgRwy0eRecTs9vjL4N29yHgPDq/AEmfvcebEIOzGHDpycMp3upLr36BWn/kDH65tun\n\tdZUNu/I+n2eBltZNnbAk9YYXUVtfD9GQ0BttLyUY="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"aba2TYeo\"; dkim-atps=neutral","Date":"Sun, 27 Mar 2022 23:24:03 +0300","To":"Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>","Message-ID":"<YkDH4/T7ndH+BDhN@pendragon.ideasonboard.com>","References":"<20220224113347.80001-1-jeanmichel.hautbois@ideasonboard.com>\n\t<20220224113347.80001-3-jeanmichel.hautbois@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20220224113347.80001-3-jeanmichel.hautbois@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v3 2/5] ipa: rkisp1: Introduce Black\n\tLevel Correction","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>","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]