{"id":26002,"url":"https://patchwork.libcamera.org/api/1.1/patches/26002/?format=json","web_url":"https://patchwork.libcamera.org/patch/26002/","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":"<20260128114402.31570-10-mzamazal@redhat.com>","date":"2026-01-28T11:43:56","name":"[v5,09/15] libcamera: ipa: simple: Make gamma adjustable","commit_ref":"0f01a68086cbf1485bc886fe375e7aedbbc2e523","pull_url":null,"state":"accepted","archived":false,"hash":"12e1f35272982808fd42dda96ae4046309d0aeef","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/1.1/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/26002/mbox/","series":[{"id":5748,"url":"https://patchwork.libcamera.org/api/1.1/series/5748/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5748","date":"2026-01-28T11:43:47","name":"Simple pipeline IPA cleanup","version":5,"mbox":"https://patchwork.libcamera.org/series/5748/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/26002/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/26002/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 D3E1DC3200\n\tfor ;\n\tWed, 28 Jan 2026 11:44:41 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5D7A461FF3;\n\tWed, 28 Jan 2026 12:44:41 +0100 (CET)","from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.133.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A964961FE4\n\tfor ;\n\tWed, 28 Jan 2026 12:44:36 +0100 (CET)","from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-114-vNC20Hk9Np6Ohz1jtbBI3g-1;\n\tWed, 28 Jan 2026 06:44:31 -0500","from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.12])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (2048 bits)\n\tserver-digest SHA256) (No client certificate requested)\n\tby mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 43C041956094; Wed, 28 Jan 2026 11:44:30 +0000 (UTC)","from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.44.34.236])\n\tby mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 1A59219560B2; Wed, 28 Jan 2026 11:44:27 +0000 (UTC)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"PfaHRys/\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1769600675;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=B8b9P/jOysXNgAcGTUf2CVjuo3yT7LK/GQDxrlEUCQ8=;\n\tb=PfaHRys/PdGMTB2Hq2IYOnXPewfNepu6w6RIFGMlkB6rRsKjHAUg+SIqIpSWJoFbfu8r/F\n\t8D2omw8ky4XA/AG5nKzRlN4wO+MfXOmUiSDLdC9wxmx4af+sKE09vhwFa6axLO3OaS3wRw\n\tHDqzecthg0GdcxIBz+jFeoRd59lESQk=","X-MC-Unique":"vNC20Hk9Np6Ohz1jtbBI3g-1","X-Mimecast-MFC-AGG-ID":"vNC20Hk9Np6Ohz1jtbBI3g_1769600670","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal , Kieran Bingham\n\t, Robert Mader\n\t, =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?=\n\t","Subject":"[PATCH v5 09/15] libcamera: ipa: simple: Make gamma adjustable","Date":"Wed, 28 Jan 2026 12:43:56 +0100","Message-ID":"<20260128114402.31570-10-mzamazal@redhat.com>","In-Reply-To":"<20260128114402.31570-1-mzamazal@redhat.com>","References":"<20260128114402.31570-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.0 on 10.30.177.12","X-Mimecast-Spam-Score":"0","X-Mimecast-MFC-PROC-ID":"6Cib53E1CObkh9eLNPLR1__pZuCktdQMD-UU0poBJDc_1769600670","X-Mimecast-Originator":"redhat.com","Content-Type":"text/plain; charset=UTF-8","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":"The gamma value is fixed in software ISP. Let's make it adjustable,\nsimilarly to contrast and saturation, and report it in metadata.\n\nReviewed-by: Robert Mader \nReviewed-by: Barnabás Pőcze \nSigned-off-by: Milan Zamazal \n---\n src/ipa/simple/algorithms/adjust.cpp | 12 ++++++++++++\n src/ipa/simple/algorithms/adjust.h | 4 +++-\n src/ipa/simple/algorithms/lut.cpp | 11 ++++++-----\n src/ipa/simple/ipa_context.h | 6 ++++--\n 4 files changed, 25 insertions(+), 8 deletions(-)","diff":"diff --git a/src/ipa/simple/algorithms/adjust.cpp b/src/ipa/simple/algorithms/adjust.cpp\nindex 27ae2a53a..a067f7b84 100644\n--- a/src/ipa/simple/algorithms/adjust.cpp\n+++ b/src/ipa/simple/algorithms/adjust.cpp\n@@ -23,6 +23,7 @@ LOG_DEFINE_CATEGORY(IPASoftAdjust)\n \n int Adjust::init(IPAContext &context, [[maybe_unused]] const YamlObject &tuningData)\n {\n+\tcontext.ctrlMap[&controls::Gamma] = ControlInfo(0.1f, 10.0f, kDefaultGamma);\n \tcontext.ctrlMap[&controls::Contrast] = ControlInfo(0.0f, 2.0f, 1.0f);\n \tif (context.ccmEnabled)\n \t\tcontext.ctrlMap[&controls::Saturation] = ControlInfo(0.0f, 2.0f, 1.0f);\n@@ -32,6 +33,7 @@ int Adjust::init(IPAContext &context, [[maybe_unused]] const YamlObject &tuningD\n int Adjust::configure(IPAContext &context,\n \t\t [[maybe_unused]] const IPAConfigInfo &configInfo)\n {\n+\tcontext.activeState.knobs.gamma = kDefaultGamma;\n \tcontext.activeState.knobs.contrast = std::optional();\n \tcontext.activeState.knobs.saturation = std::optional();\n \n@@ -43,6 +45,12 @@ void Adjust::queueRequest(typename Module::Context &context,\n \t\t\t [[maybe_unused]] typename Module::FrameContext &frameContext,\n \t\t\t const ControlList &controls)\n {\n+\tconst auto &gamma = controls.get(controls::Gamma);\n+\tif (gamma.has_value()) {\n+\t\tcontext.activeState.knobs.gamma = gamma.value();\n+\t\tLOG(IPASoftAdjust, Debug) << \"Setting gamma to \" << gamma.value();\n+\t}\n+\n \tconst auto &contrast = controls.get(controls::Contrast);\n \tif (contrast.has_value()) {\n \t\tcontext.activeState.knobs.contrast = contrast;\n@@ -83,6 +91,7 @@ void Adjust::prepare(IPAContext &context,\n \t\t IPAFrameContext &frameContext,\n \t\t [[maybe_unused]] DebayerParams *params)\n {\n+\tframeContext.gamma = context.activeState.knobs.gamma;\n \tframeContext.contrast = context.activeState.knobs.contrast;\n \n \tif (!context.ccmEnabled)\n@@ -105,6 +114,9 @@ void Adjust::process([[maybe_unused]] IPAContext &context,\n \t\t [[maybe_unused]] const SwIspStats *stats,\n \t\t ControlList &metadata)\n {\n+\tconst auto &gamma = frameContext.gamma;\n+\tmetadata.set(controls::Gamma, gamma);\n+\n \tconst auto &contrast = frameContext.contrast;\n \tif (contrast)\n \t\tmetadata.set(controls::Contrast, contrast.value());\ndiff --git a/src/ipa/simple/algorithms/adjust.h b/src/ipa/simple/algorithms/adjust.h\nindex c4baa2503..7644138ff 100644\n--- a/src/ipa/simple/algorithms/adjust.h\n+++ b/src/ipa/simple/algorithms/adjust.h\n@@ -1,6 +1,6 @@\n /* SPDX-License-Identifier: LGPL-2.1-or-later */\n /*\n- * Copyright (C) 2024-2025, Red Hat Inc.\n+ * Copyright (C) 2024-2026, Red Hat Inc.\n *\n * Color correction matrix\n */\n@@ -19,6 +19,8 @@ namespace libcamera {\n \n namespace ipa::soft::algorithms {\n \n+constexpr float kDefaultGamma = 2.2f;\n+\n class Adjust : public Algorithm\n {\n public:\ndiff --git a/src/ipa/simple/algorithms/lut.cpp b/src/ipa/simple/algorithms/lut.cpp\nindex 3a00bf4ee..9740f8c8d 100644\n--- a/src/ipa/simple/algorithms/lut.cpp\n+++ b/src/ipa/simple/algorithms/lut.cpp\n@@ -18,6 +18,8 @@\n \n #include \"simple/ipa_context.h\"\n \n+#include \"adjust.h\"\n+\n namespace libcamera {\n \n LOG_DEFINE_CATEGORY(IPASoftLut)\n@@ -27,8 +29,6 @@ namespace ipa::soft::algorithms {\n int Lut::configure(IPAContext &context,\n \t\t [[maybe_unused]] const IPAConfigInfo &configInfo)\n {\n-\t/* Gamma value is fixed */\n-\tcontext.configuration.gamma = 1.0 / 2.2;\n \tupdateGammaTable(context);\n \n \treturn 0;\n@@ -37,6 +37,7 @@ int Lut::configure(IPAContext &context,\n void Lut::updateGammaTable(IPAContext &context)\n {\n \tconst auto blackLevel = context.activeState.blc.level;\n+\tconst auto gamma = 1.0 / context.activeState.knobs.gamma;\n \tconst auto contrast = context.activeState.knobs.contrast.value_or(1.0);\n \t/* Convert 0..2 to 0..infinity; avoid actual inifinity at tan(pi/2) */\n \tdouble contrastExp = tan(std::clamp(contrast * M_PI_4, 0.0, M_PI_2 - 0.00001));\n@@ -52,8 +53,7 @@ void Lut::updateGammaTable(IPAContext &context)\n \t\t\t\tnormalized = 0.5 * std::pow(normalized / 0.5, contrastExp);\n \t\t\telse\n \t\t\t\tnormalized = 1.0 - 0.5 * std::pow((1.0 - normalized) / 0.5, contrastExp);\n-\t\t\tgammaTable[i] = UINT8_MAX *\n-\t\t\t\t\tstd::pow(normalized, context.configuration.gamma);\n+\t\t\tgammaTable[i] = UINT8_MAX * std::pow(normalized, gamma);\n \t\t}\n \t\t/*\n \t\t * Due to CCM operations, the table lookup may reach indices below the black\n@@ -65,6 +65,7 @@ void Lut::updateGammaTable(IPAContext &context)\n \t\t\t gammaTable[blackIndex]);\n \t}\n \n+\tcontext.activeState.gamma.gamma = gamma;\n \tcontext.activeState.gamma.blackLevel = blackLevel;\n \tcontext.activeState.gamma.contrastExp = contrastExp;\n }\n@@ -131,7 +132,7 @@ void Lut::prepare(IPAContext &context,\n \t\tcontext.activeState.matrixChanged = false;\n \t}\n \n-\tparams->gamma = context.configuration.gamma;\n+\tparams->gamma = context.activeState.gamma.gamma;\n \tparams->contrastExp = context.activeState.gamma.contrastExp;\n }\n \ndiff --git a/src/ipa/simple/ipa_context.h b/src/ipa/simple/ipa_context.h\nindex a3ff3d038..eeade9d35 100644\n--- a/src/ipa/simple/ipa_context.h\n+++ b/src/ipa/simple/ipa_context.h\n@@ -1,6 +1,6 @@\n /* SPDX-License-Identifier: LGPL-2.1-or-later */\n /*\n- * Copyright (C) 2024-2025 Red Hat, Inc.\n+ * Copyright (C) 2024-2026 Red Hat, Inc.\n *\n * Simple pipeline IPA Context\n */\n@@ -25,7 +25,6 @@ namespace libcamera {\n namespace ipa::soft {\n \n struct IPASessionConfiguration {\n-\tfloat gamma;\n \tstruct {\n \t\tint32_t exposureMin, exposureMax;\n \t\tdouble againMin, againMax, again10, againMinStep;\n@@ -58,6 +57,7 @@ struct IPAActiveState {\n \tstruct {\n \t\tstd::array gammaTable;\n \t\tuint8_t blackLevel;\n+\t\tfloat gamma;\n \t\tdouble contrast;\n \t\tdouble contrastExp;\n \t} gamma;\n@@ -66,6 +66,7 @@ struct IPAActiveState {\n \tbool matrixChanged = false;\n \n \tstruct {\n+\t\tfloat gamma;\n \t\t/* 0..2 range, 1.0 = normal */\n \t\tstd::optional contrast;\n \t\tstd::optional saturation;\n@@ -85,6 +86,7 @@ struct IPAFrameContext : public FrameContext {\n \t\tdouble blue;\n \t} gains;\n \n+\tfloat gamma;\n \tstd::optional contrast;\n \tstd::optional saturation;\n };\n","prefixes":["v5","09/15"]}