Patch Detail
Show a patch.
GET /api/patches/27172/?format=api
{ "id": 27172, "url": "https://patchwork.libcamera.org/api/patches/27172/?format=api", "web_url": "https://patchwork.libcamera.org/patch/27172/", "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": "<20260703122543.1991189-14-paul.elder@ideasonboard.com>", "date": "2026-07-03T12:25:19", "name": "[RFC,13/19] ipa: rkisp2: algo: goc: Implement gamma out correction", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "e250f2e505cbbe7d80ef5f3b2fa05eaf8a2fcd50", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/27172/mbox/", "series": [ { "id": 6035, "url": "https://patchwork.libcamera.org/api/series/6035/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=6035", "date": "2026-07-03T12:25:06", "name": "Add support for rkisp2", "version": 1, "mbox": "https://patchwork.libcamera.org/series/6035/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/27172/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/27172/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 9BF6CC328C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 3 Jul 2026 12:26:47 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 57CB765FEA;\n\tFri, 3 Jul 2026 14:26:47 +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 7268265FDF\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 3 Jul 2026 14:26:46 +0200 (CEST)", "from neptunite.hamster-moth.ts.net (unknown\n\t[IPv6:2404:7a81:160:2100:a2cc:2f45:3bd7:2589])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 995ED8E0;\n\tFri, 3 Jul 2026 14:25:57 +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=\"BzS6oDX7\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1783081560;\n\tbh=4LOkjL+2uX7mJcASdeNtWhBkBEuTo6ErAi5Zr5hjz7U=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=BzS6oDX7OFtH5J+iUNp5cVdehrIq3ok7Hl01IqLB9bhtn6lKRW3/UBoRLNb5VTSyc\n\tkxGcDz45id3IBrj/eyfwk6JFUZgVQWG3pCrWo+hA/w0nCzl1JwP534U0UJHtSgpE6h\n\tFuQDQOqcanpXFx7jduEm7S4CGXB8jYeswu++43ik=", "From": "Paul Elder <paul.elder@ideasonboard.com>", "To": "laurent.pinchart@ideasonboard.com", "Cc": "Paul Elder <paul.elder@ideasonboard.com>, michael.riesch@collabora.com, \n\txuhf@rock-chips.com, stefan.klug@ideasonboard.com,\n\tkieran.bingham@ideasonboard.com, dan.scally@ideasonboard.com,\n\tjacopo.mondi@ideasonboard.com, nicolas.dufresne@collabora.com,\n\tlibcamera-devel@lists.libcamera.org", "Subject": "[RFC PATCH 13/19] ipa: rkisp2: algo: goc: Implement gamma out\n\tcorrection", "Date": "Fri, 3 Jul 2026 21:25:19 +0900", "Message-ID": "<20260703122543.1991189-14-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.47.2", "In-Reply-To": "<20260703122543.1991189-1-paul.elder@ideasonboard.com>", "References": "<20260703122543.1991189-1-paul.elder@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": "<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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Implement a manual gamma out correction algorithm for the rkisp2 IPA. It\ntakes the gamma control and applies the gamma out correction curve to\nthe ISP.\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\n---\n src/ipa/rkisp2/algorithms/goc.cpp | 143 ++++++++++++++++++++++++++\n src/ipa/rkisp2/algorithms/goc.h | 42 ++++++++\n src/ipa/rkisp2/algorithms/meson.build | 1 +\n 3 files changed, 186 insertions(+)\n create mode 100644 src/ipa/rkisp2/algorithms/goc.cpp\n create mode 100644 src/ipa/rkisp2/algorithms/goc.h", "diff": "diff --git a/src/ipa/rkisp2/algorithms/goc.cpp b/src/ipa/rkisp2/algorithms/goc.cpp\nnew file mode 100644\nindex 000000000000..d5cabeab8900\n--- /dev/null\n+++ b/src/ipa/rkisp2/algorithms/goc.cpp\n@@ -0,0 +1,143 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2026, Ideas On Board\n+ *\n+ * RkISP2 Gamma out control\n+ */\n+\n+#include \"goc.h\"\n+\n+#include <cmath>\n+\n+#include <libcamera/base/log.h>\n+#include <libcamera/base/utils.h>\n+\n+#include <libcamera/control_ids.h>\n+\n+#include \"linux/rkisp2-config.h\"\n+\n+/**\n+ * \\file goc.h\n+ */\n+\n+namespace libcamera {\n+\n+namespace ipa::rkisp2::algorithms {\n+\n+/**\n+ * \\class GammaOutCorrection\n+ * \\brief RkISP2 Gamma out correction\n+ *\n+ * This algorithm implements the gamma out curve for the RkISP2. It defaults to\n+ * a gamma value of 2.2.\n+ *\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(RkISP2Gamma)\n+\n+const float kDefaultGamma = 2.2f;\n+\n+/**\n+ * \\copydoc libcamera::ipa::Algorithm::init\n+ */\n+int GammaOutCorrection::init(IPAContext &context, const ValueNode &tuningData)\n+{\n+\tdefaultGamma_ = tuningData[\"gamma\"].get<double>(kDefaultGamma);\n+\tcontext.ctrlMap[&controls::Gamma] = ControlInfo(0.1f, 10.0f, defaultGamma_);\n+\n+\treturn 0;\n+}\n+\n+/**\n+ * \\copydoc libcamera::ipa::Algorithm::configure\n+ */\n+int GammaOutCorrection::configure(IPAContext &context,\n+\t\t\t\t [[maybe_unused]] const IPACameraSensorInfo &configInfo)\n+{\n+\tcontext.activeState.goc.gamma = defaultGamma_;\n+\treturn 0;\n+}\n+\n+/**\n+ * \\copydoc libcamera::ipa::Algorithm::queueRequest\n+ */\n+void GammaOutCorrection::queueRequest(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+\tframeContext.goc.gamma = context.activeState.goc.gamma;\n+\n+\tconst auto &gamma = controls.get(controls::Gamma);\n+\tif (!gamma)\n+\t\treturn;\n+\n+\tcontext.activeState.goc.gamma = *gamma;\n+\n+\tframeContext.goc.gamma = context.activeState.goc.gamma;\n+}\n+\n+/**\n+ * \\copydoc libcamera::ipa::Algorithm::prepare\n+ */\n+void GammaOutCorrection::prepare([[maybe_unused]] IPAContext &context,\n+\t\t\t\t [[maybe_unused]] const uint32_t frame,\n+\t\t\t\t [[maybe_unused]] IPAFrameContext &frameContext,\n+\t\t\t\t [[maybe_unused]] RkISP2Params *params)\n+{\n+\t/* \\todo Optimize so we don't have to write it every frame */\n+\n+\t/*\n+\t * The logarithmic segments as specified in the reference, plus an\n+\t * additional 0 to make the loop easier\n+\t *\n+\t * Just use 44 mode for now. 48 mode is when the last four 512 are\n+\t * split into eight pieces of 256.\n+\t */\n+\tstatic constexpr std::array<unsigned int, 45> segments = {\n+\t\t0, 1, 1, 1, 1, 1, 1, 1, 1,\n+\t\t2, 2, 2, 2, 4, 4, 4, 4,\n+\t\t8, 8, 8, 8, 16, 16, 16, 16,\n+\t\t32, 32, 32, 32, 64, 64, 64, 64,\n+\t\t128, 128, 128, 128, 256, 256, 256, 256,\n+\t\t512, 512, 512, 512\n+\t};\n+\n+\tauto config = params->block<RkISP2Blocks::Goc>();\n+\tconfig.setEnabled(true);\n+\n+\tunsigned x = 0;\n+\tfor (const auto [i, size] : utils::enumerate(segments)) {\n+\t\tconfig->gamma_y[i] = static_cast<uint16_t>(std::pow(x / 4096.0, 1.0 / frameContext.goc.gamma) * 4096.0);\n+\t\tx += size;\n+\t}\n+\n+\tconfig->mode = RKISP2_ISP_GOC_MODE_LOGARITHMIC;\n+\tconfig->segments = RKISP2_ISP_GOC_SEGMENTS_44;\n+\tconfig->offset = 0;\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 rkisp2_stats_buffer *stats,\n+\t\t\t\t ControlList &metadata)\n+{\n+\tmetadata.set(controls::Gamma, frameContext.goc.gamma);\n+}\n+\n+REGISTER_IPA_ALGORITHM(GammaOutCorrection, \"GammaOutCorrection\")\n+\n+} /* namespace ipa::rkisp2::algorithms */\n+\n+} /* namespace libcamera */\ndiff --git a/src/ipa/rkisp2/algorithms/goc.h b/src/ipa/rkisp2/algorithms/goc.h\nnew file mode 100644\nindex 000000000000..e859f6606cd6\n--- /dev/null\n+++ b/src/ipa/rkisp2/algorithms/goc.h\n@@ -0,0 +1,42 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2026, Ideas On Board\n+ *\n+ * RkISP2 Gamma out control\n+ */\n+\n+#pragma once\n+\n+#include \"algorithm.h\"\n+\n+namespace libcamera {\n+\n+namespace ipa::rkisp2::algorithms {\n+\n+class GammaOutCorrection : public Algorithm\n+{\n+public:\n+\tGammaOutCorrection() = default;\n+\t~GammaOutCorrection() = default;\n+\n+\tint init(IPAContext &context, const ValueNode &tuningData) override;\n+\tint configure(IPAContext &context,\n+\t\t 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 RkISP2Params *params) override;\n+\tvoid process(IPAContext &context, const uint32_t frame,\n+\t\t IPAFrameContext &frameContext,\n+\t\t const rkisp2_stats_buffer *stats,\n+\t\t ControlList &metadata) override;\n+\n+private:\n+\tfloat defaultGamma_;\n+};\n+\n+} /* namespace ipa::rkisp2::algorithms */\n+} /* namespace libcamera */\ndiff --git a/src/ipa/rkisp2/algorithms/meson.build b/src/ipa/rkisp2/algorithms/meson.build\nindex 01829e25d254..3d73b0a99320 100644\n--- a/src/ipa/rkisp2/algorithms/meson.build\n+++ b/src/ipa/rkisp2/algorithms/meson.build\n@@ -6,5 +6,6 @@ rkisp2_ipa_algorithms = files([\n 'bls.cpp',\n 'ccm.cpp',\n 'csm.cpp',\n+ 'goc.cpp',\n ])\n \n", "prefixes": [ "RFC", "13/19" ] }