{"id":20195,"url":"https://patchwork.libcamera.org/api/1.1/patches/20195/?format=json","web_url":"https://patchwork.libcamera.org/patch/20195/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20240603140806.90045-4-stefan.klug@ideasonboard.com>","date":"2024-06-03T14:06:30","name":"[v3,3/3] ipa: rkisp1: Add GammaOutCorrection algorithm","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"55ec24093b30d6c728f44005d660750e2ad578b2","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/1.1/people/184/?format=json","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/20195/mbox/","series":[{"id":4354,"url":"https://patchwork.libcamera.org/api/1.1/series/4354/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4354","date":"2024-06-03T14:06:27","name":"libcamera: Add gamma control for rkisp1","version":3,"mbox":"https://patchwork.libcamera.org/series/4354/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/20195/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/20195/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 49BFABD87C\n\tfor ;\n\tMon, 3 Jun 2024 14:08:53 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 049DE634CA;\n\tMon, 3 Jun 2024 16:08:53 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8D720634CA\n\tfor ;\n\tMon, 3 Jun 2024 16:08:51 +0200 (CEST)","from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:6067:153a:95aa:2e07])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8D2D0BC0;\n\tMon, 3 Jun 2024 16:08:44 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"Dd42fWpJ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1717423724;\n\tbh=FoPfA8pz6SeybmeBzZnxWEYHeCauLwujNrCcrFak5KU=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=Dd42fWpJWUaLet0bzbrGPcI36u9g8yYMxj2QxWFOdzubua35r6yX3UR5oSWP60zkr\n\tsNL47LzpJAmFJXbNbmfNGDUGG6ypALPu79Mwe8aeWUPiTg+TafBLfsY7KElsUvzPRe\n\tgM79lW7ikXy6S4pYez4A6a0NDtyDvFKnkV5ZuILs=","From":"Stefan Klug ","To":"libcamera-devel@lists.libcamera.org","Cc":"Stefan Klug ","Subject":"[PATCH v3 3/3] ipa: rkisp1: Add GammaOutCorrection algorithm","Date":"Mon, 3 Jun 2024 16:06:30 +0200","Message-ID":"<20240603140806.90045-4-stefan.klug@ideasonboard.com>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20240603140806.90045-1-stefan.klug@ideasonboard.com>","References":"<20240603140806.90045-1-stefan.klug@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","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":"Add a gamma algorithm for the rkisp1. It defaults to a gamma of 2.2 which\nclosely resembles sRGB. No seperate sRGB mode was implemented because the pwl\nthat models the gamma curve is so coarse that there is basically no difference\nbetween srgb and gamma=2.2. The default can be overridden within the tuning\nfile or set at runtime using the gamma control.\n\nThe gamma algorithm is not enabled by default. This will be done in future\ntuning file updates.\n\nSigned-off-by: Stefan Klug \n---\nv2 -> v3:\n- Squashed with patch 1/4 from previous series\n- Renamed from Gamma to GammaOutCorrection\n- Read default gamma value from tuning file\n- Some stylistic fixes from review\n\n src/ipa/rkisp1/algorithms/goc.cpp | 161 ++++++++++++++++++++++++++\n src/ipa/rkisp1/algorithms/goc.h | 48 ++++++++\n src/ipa/rkisp1/algorithms/meson.build | 1 +\n src/ipa/rkisp1/ipa_context.h | 4 +\n 4 files changed, 214 insertions(+)\n create mode 100644 src/ipa/rkisp1/algorithms/goc.cpp\n create mode 100644 src/ipa/rkisp1/algorithms/goc.h","diff":"diff --git a/src/ipa/rkisp1/algorithms/goc.cpp b/src/ipa/rkisp1/algorithms/goc.cpp\nnew file mode 100644\nindex 00000000..875c82e5\n--- /dev/null\n+++ b/src/ipa/rkisp1/algorithms/goc.cpp\n@@ -0,0 +1,161 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2024, Ideas On Board\n+ *\n+ * RkISP1 Gamma out control\n+ */\n+#include \"goc.h\"\n+\n+#include \n+\n+#include \n+#include \n+\n+#include \n+\n+#include \"libcamera/internal/yaml_parser.h\"\n+\n+#include \"linux/rkisp1-config.h\"\n+\n+/**\n+ * \\file goc.h\n+ */\n+\n+namespace libcamera {\n+\n+namespace ipa::rkisp1::algorithms {\n+\n+/**\n+ * \\class GammaOutCorrection\n+ * \\brief RkISP1 Gamma out correction\n+ *\n+ * This algorithm implements the gamma out curve for the RkISP1.\n+ * It defaults to a gamma value of 2.2\n+ * As gamma is internally represented as a piecewise linear function with only\n+ * 17 knots, the difference between gamma=2.2 and sRGB gamma is minimal.\n+ * Therefore sRGB gamma was not implemented as special case.\n+ *\n+ * Useful links:\n+ * https://www.cambridgeincolour.com/tutorials/gamma-correction.htm\n+ * https://en.wikipedia.org/wiki/SRGB\n+ */\n+\n+LOG_DEFINE_CATEGORY(RkISP1Gamma)\n+\n+const double kDefaultGamma = 2.2;\n+\n+GammaOutCorrection::GammaOutCorrection()\n+\t: gamma_(0)\n+{\n+}\n+\n+/**\n+ * \\copydoc libcamera::ipa::Algorithm::init\n+ */\n+int GammaOutCorrection::init([[maybe_unused]] IPAContext &context,\n+\t\t\t [[maybe_unused]] const YamlObject &tuningData)\n+{\n+\tcontext.ctrlMap[&controls::Gamma] = ControlInfo(0.1f, 10.0f, 2.2f);\n+\tdefaultGamma_ = tuningData[\"gamma\"].get(kDefaultGamma);\n+\n+\tif (context.hw->numGammaOutSamples !=\n+\t RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES_V10) {\n+\t\tLOG(RkISP1Gamma, Error)\n+\t\t\t<< \"Gamma is not implemented for RkISP1 V12\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+/**\n+ * \\brief Configure the Gamma given a configInfo\n+ * \\param[in] context The shared IPA context\n+ * \\param[in] configInfo The IPA configuration data\n+ *\n+ * \\return 0\n+ */\n+int GammaOutCorrection::configure(IPAContext &context,\n+\t\t\t\t [[maybe_unused]] const IPACameraSensorInfo &configInfo)\n+{\n+\tcontext.activeState.gamma = defaultGamma_;\n+\treturn 0;\n+}\n+\n+/**\n+ * \\copydoc libcamera::ipa::Algorithm::queueRequest\n+ */\n+void GammaOutCorrection::queueRequest([[maybe_unused]] IPAContext &context,\n+\t\t\t\t [[maybe_unused]] const uint32_t frame,\n+\t\t\t\t IPAFrameContext &frameContext,\n+\t\t\t\t const ControlList &controls)\n+{\n+\tconst auto &gamma = controls.get(controls::Gamma);\n+\tif (gamma) {\n+\t\t/*\n+\t\t * \\todo This is not correct as it updates the current state with a\n+\t\t * future value. But it does no harm at the moment an allows us to\n+\t\t * track the last active gamma\n+\t\t */\n+\t\tcontext.activeState.gamma = *gamma;\n+\t\tLOG(RkISP1Gamma, Debug) << \"Set gamma to \" << *gamma;\n+\t}\n+\n+\tframeContext.gamma = context.activeState.gamma;\n+}\n+\n+/**\n+ * \\copydoc libcamera::ipa::Algorithm::prepare\n+ */\n+void GammaOutCorrection::prepare([[maybe_unused]] IPAContext &context,\n+\t\t\t\t const uint32_t frame,\n+\t\t\t\t [[maybe_unused]] IPAFrameContext &frameContext,\n+\t\t\t\t rkisp1_params_cfg *params)\n+{\n+\tASSERT(context.hw->numGammaOutSamples ==\n+\t RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES_V10);\n+\n+\t/*\n+\t * The logarithmic segments as specified in the reference.\n+\t * Plus an additional 0 to make the loop easier\n+\t */\n+\tstd::array segments = {\n+\t\t64, 64, 64, 64, 128, 128, 128, 128, 256,\n+\t\t256, 256, 512, 512, 512, 512, 512, 0\n+\t};\n+\tauto gamma_y = params->others.goc_config.gamma_y;\n+\n+\tif (frame > 0 && std::fabs(frameContext.gamma - gamma_) < 0.001)\n+\t\treturn;\n+\n+\tgamma_ = frameContext.gamma;\n+\n+\tunsigned x = 0;\n+\tfor (auto [i, size] : utils::enumerate(segments)) {\n+\t\tgamma_y[i] = std::pow(x / 4096.0, 1.0 / gamma_) * 1023.0;\n+\t\tx += size;\n+\t}\n+\n+\tparams->others.goc_config.mode = RKISP1_CIF_ISP_GOC_MODE_LOGARITHMIC;\n+\tparams->module_cfg_update |= RKISP1_CIF_ISP_MODULE_GOC;\n+\tparams->module_en_update |= RKISP1_CIF_ISP_MODULE_GOC;\n+\tparams->module_ens |= RKISP1_CIF_ISP_MODULE_GOC;\n+}\n+\n+/**\n+ * \\copydoc libcamera::ipa::Algorithm::process\n+ */\n+void GammaOutCorrection::process([[maybe_unused]] IPAContext &context,\n+\t\t\t\t [[maybe_unused]] const uint32_t frame,\n+\t\t\t\t IPAFrameContext &frameContext,\n+\t\t\t\t [[maybe_unused]] const rkisp1_stat_buffer *stats,\n+\t\t\t\t ControlList &metadata)\n+{\n+\tmetadata.set(controls::Gamma, frameContext.gamma);\n+}\n+\n+REGISTER_IPA_ALGORITHM(GammaOutCorrection, \"GammaOutCorrection\")\n+\n+} /* namespace ipa::rkisp1::algorithms */\n+\n+} /* namespace libcamera */\ndiff --git a/src/ipa/rkisp1/algorithms/goc.h b/src/ipa/rkisp1/algorithms/goc.h\nnew file mode 100644\nindex 00000000..d45e4194\n--- /dev/null\n+++ b/src/ipa/rkisp1/algorithms/goc.h\n@@ -0,0 +1,48 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2024, Ideas On Board\n+ *\n+ * RkISP1 Gamma out control\n+ */\n+\n+#pragma once\n+\n+#include \"algorithm.h\"\n+\n+namespace libcamera {\n+\n+namespace ipa::rkisp1::algorithms {\n+\n+class GammaOutCorrection : public Algorithm\n+{\n+public:\n+\tGammaOutCorrection();\n+\t~GammaOutCorrection() = default;\n+\n+\tint init(IPAContext &context, const YamlObject &tuningData) override;\n+\tint configure(IPAContext &context, const IPACameraSensorInfo &configInfo) override;\n+\tvoid queueRequest(IPAContext &context,\n+\t\t\t 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+\tvoid process(IPAContext &context, const uint32_t frame,\n+\t\t IPAFrameContext &frameContext,\n+\t\t const rkisp1_stat_buffer *stats,\n+\t\t ControlList &metadata) override;\n+\n+private:\n+\t/*\n+\t * \\todo: gamma_ holds the current state of the hardware. context.activeState\n+\t * can not be used as that holds the \"future state\" after applying all known\n+\t * requests. The intended usage of activeState needs to be clarified.\n+\t */\n+\tdouble gamma_;\n+\n+\tdouble defaultGamma_;\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 93a48329..6ee71a9b 100644\n--- a/src/ipa/rkisp1/algorithms/meson.build\n+++ b/src/ipa/rkisp1/algorithms/meson.build\n@@ -8,6 +8,7 @@ rkisp1_ipa_algorithms = files([\n 'dpcc.cpp',\n 'dpf.cpp',\n 'filter.cpp',\n+ 'goc.cpp',\n 'gsl.cpp',\n 'lsc.cpp',\n ])\ndiff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h\nindex bd02a7a2..5252e222 100644\n--- a/src/ipa/rkisp1/ipa_context.h\n+++ b/src/ipa/rkisp1/ipa_context.h\n@@ -104,6 +104,8 @@ struct IPAActiveState {\n \t\tuint8_t denoise;\n \t\tuint8_t sharpness;\n \t} filter;\n+\n+\tdouble gamma;\n };\n \n struct IPAFrameContext : public FrameContext {\n@@ -146,6 +148,8 @@ struct IPAFrameContext : public FrameContext {\n \t\tuint32_t exposure;\n \t\tdouble gain;\n \t} sensor;\n+\n+\tdouble gamma;\n };\n \n struct IPAContext {\n","prefixes":["v3","3/3"]}