{"id":15378,"url":"https://patchwork.libcamera.org/api/patches/15378/?format=json","web_url":"https://patchwork.libcamera.org/patch/15378/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20220224113347.80001-3-jeanmichel.hautbois@ideasonboard.com>","date":"2022-02-24T11:33:44","name":"[libcamera-devel,v3,2/5] ipa: rkisp1: Introduce Black Level Correction","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"f45f1c075c2c96d5542a3575c984084decc2be4b","submitter":{"id":75,"url":"https://patchwork.libcamera.org/api/people/75/?format=json","name":"Jean-Michel Hautbois","email":"jeanmichel.hautbois@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/15378/mbox/","series":[{"id":2937,"url":"https://patchwork.libcamera.org/api/series/2937/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2937","date":"2022-02-24T11:33:42","name":"IPA RkISP1 awb and misc improvements","version":3,"mbox":"https://patchwork.libcamera.org/series/2937/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15378/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15378/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 EEF50BF415\n\tfor ;\n\tThu, 24 Feb 2022 11:33:58 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E102E61154;\n\tThu, 24 Feb 2022 12:33:56 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 53F73601F9\n\tfor ;\n\tThu, 24 Feb 2022 12:33:53 +0100 (CET)","from tatooine.ideasonboard.com (unknown\n\t[IPv6:2a01:e0a:169:7140:ce74:6df2:4b76:b230])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id D93E5E70;\n\tThu, 24 Feb 2022 12:33:52 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"q06qM5U/\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1645702432;\n\tbh=+wwL6yirfVOYDT15H5q9AQSn5oqquclWdLrpplCrrtI=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=q06qM5U/hQyU+4wR419iE/p+xeaRzcD0SQk+9nXWF1RXzq3o/uPAPhvwxENYx1ZmG\n\tUGN2SIEHb3wfO7ErZrhZZHS+J8Ojz7N4iSnTxqoquya/zx6eCI123SU16Ndx8PeenS\n\tk/n/MqyaleTHLbH/JSyNVUSoitWU6orqe2AmJPeo=","From":"Jean-Michel Hautbois ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 24 Feb 2022 12:33:44 +0100","Message-Id":"<20220224113347.80001-3-jeanmichel.hautbois@ideasonboard.com>","X-Mailer":"git-send-email 2.32.0","In-Reply-To":"<20220224113347.80001-1-jeanmichel.hautbois@ideasonboard.com>","References":"<20220224113347.80001-1-jeanmichel.hautbois@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 2/5] ipa: rkisp1: Introduce Black Level\n\tCorrection","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":"In order to have the proper pixel levels, apply a fixed black level\ncorrection, based on the imx219 tuning file in RPi. The value is 4096 on\n16 bits, and the pipeline for RkISP1 is on 12 bits, scale it.\n\nSigned-off-by: Jean-Michel Hautbois \nTested-by: Peter Griffin \n\n---\nv3: - 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","diff":"diff --git a/src/ipa/rkisp1/algorithms/blc.cpp b/src/ipa/rkisp1/algorithms/blc.cpp\nnew file mode 100644\nindex 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 */\ndiff --git a/src/ipa/rkisp1/algorithms/blc.h b/src/ipa/rkisp1/algorithms/blc.h\nnew file mode 100644\nindex 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 \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 */\ndiff --git a/src/ipa/rkisp1/algorithms/meson.build b/src/ipa/rkisp1/algorithms/meson.build\nindex 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 ])\ndiff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex 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());\n+\talgorithms_.push_back(std::make_unique());\n \n \treturn 0;\n }\n","prefixes":["libcamera-devel","v3","2/5"]}