{"id":25095,"url":"https://patchwork.libcamera.org/api/patches/25095/?format=json","web_url":"https://patchwork.libcamera.org/patch/25095/","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":"<20251120104548.80268-10-mzamazal@redhat.com>","date":"2025-11-20T10:45:44","name":"[RFC,v2,09/13] libcamera: ipa: simple: Make gamma adjustable","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"3c0de015516aacc619bb1b656f9ac4f2ea0e6ce9","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/25095/mbox/","series":[{"id":5597,"url":"https://patchwork.libcamera.org/api/series/5597/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5597","date":"2025-11-20T10:45:35","name":"Simple pipeline IPA cleanup","version":2,"mbox":"https://patchwork.libcamera.org/series/5597/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/25095/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/25095/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 C7DAAC3330\n\tfor ;\n\tThu, 20 Nov 2025 10:46:30 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4F69760AB1;\n\tThu, 20 Nov 2025 11:46:30 +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 5721260A8A\n\tfor ;\n\tThu, 20 Nov 2025 11:46:27 +0100 (CET)","from mx-prod-mc-01.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-134-c_p03WtVM12ZMRe5E7KDhg-1;\n\tThu, 20 Nov 2025 05:46:22 -0500","from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.111])\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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 3A6DC19560A3; Thu, 20 Nov 2025 10:46:21 +0000 (UTC)","from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.44.34.39])\n\tby mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 8CA161800451; Thu, 20 Nov 2025 10:46:19 +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=\"fsCZUs3s\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1763635586;\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=vVfx98L7QettwdI59zv0fnwQbGjLUrVmHFrOP7RjXBA=;\n\tb=fsCZUs3snPqwaAlKcG2qmKp7hP8xha9ZArKDBydEqB9I9UxJ37jEc/byvsKgp3LNRJbSlX\n\tAR08Ha3dXSVg96PjiQfqxOXk+QB44LY4TKqFfxyI5CljKy4wWPOSL2E606qM1AnRmFUhXk\n\tCDvv5Y2ohqSheNI9CpV2KMjdwkSA8Z8=","X-MC-Unique":"c_p03WtVM12ZMRe5E7KDhg-1","X-Mimecast-MFC-AGG-ID":"c_p03WtVM12ZMRe5E7KDhg_1763635581","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal , Kieran Bingham\n\t, =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?=\n\t","Subject":"[RFC PATCH v2 09/13] libcamera: ipa: simple: Make gamma adjustable","Date":"Thu, 20 Nov 2025 11:45:44 +0100","Message-ID":"<20251120104548.80268-10-mzamazal@redhat.com>","In-Reply-To":"<20251120104548.80268-1-mzamazal@redhat.com>","References":"<20251120104548.80268-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.111","X-Mimecast-Spam-Score":"0","X-Mimecast-MFC-PROC-ID":"bRTtSDe0w5trTb4AYU0VWzZS1XoXce9TkIb49AL1lJE_1763635581","X-Mimecast-Originator":"redhat.com","Content-Transfer-Encoding":"8bit","content-type":"text/plain; charset=\"US-ASCII\"; x-default=true","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.\n\nThe default gamma value is changed from 1/2.0 to a more common value\n1/2.2, which is used in GPU ISP.\n\nSigned-off-by: Milan Zamazal \n---\n src/ipa/simple/algorithms/adjust.cpp | 8 ++++++++\n src/ipa/simple/algorithms/adjust.h | 2 ++\n src/ipa/simple/algorithms/lut.cpp | 9 ++++++---\n src/ipa/simple/ipa_context.h | 3 +++\n 4 files changed, 19 insertions(+), 3 deletions(-)","diff":"diff --git a/src/ipa/simple/algorithms/adjust.cpp b/src/ipa/simple/algorithms/adjust.cpp\nindex 49fa98c9d..600fd3c7b 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 = std::optional();\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;\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;\ndiff --git a/src/ipa/simple/algorithms/adjust.h b/src/ipa/simple/algorithms/adjust.h\nindex c4baa2503..190d2079f 100644\n--- a/src/ipa/simple/algorithms/adjust.h\n+++ b/src/ipa/simple/algorithms/adjust.h\n@@ -19,6 +19,8 @@ namespace libcamera {\n \n namespace ipa::soft::algorithms {\n \n+const 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 a4cb14673..a17a24c9e 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 = 0.5;\n \tupdateGammaTable(context);\n \n \treturn 0;\n@@ -39,6 +39,8 @@ void Lut::updateGammaTable(IPAContext &context)\n \tauto &gammaTable = context.activeState.gamma.gammaTable;\n \tconst auto blackLevel = context.activeState.blc.level;\n \tconst unsigned int blackIndex = blackLevel * gammaTable.size() / 256;\n+\tconst auto gamma =\n+\t\t1.0 / context.activeState.knobs.gamma.value_or(kDefaultGamma);\n \tconst auto contrast = context.activeState.knobs.contrast.value_or(1.0);\n \n \tconst float divisor = gammaTable.size() - blackIndex - 1.0;\n@@ -52,7 +54,7 @@ void Lut::updateGammaTable(IPAContext &context)\n \t\telse\n \t\t\tnormalized = 1.0 - 0.5 * std::pow((1.0 - normalized) / 0.5, contrastExp);\n \t\tgammaTable[i] = UINT8_MAX *\n-\t\t\t\tstd::pow(normalized, context.configuration.gamma);\n+\t\t\t\tstd::pow(normalized, gamma);\n \t}\n \t/*\n \t * Due to CCM operations, the table lookup may reach indices below the black\n@@ -63,6 +65,7 @@ void Lut::updateGammaTable(IPAContext &context)\n \tstd::fill(gammaTable.begin(), gammaTable.begin() + blackIndex,\n \t\t gammaTable[blackIndex]);\n \n+\tcontext.activeState.gamma.gamma = gamma;\n \tcontext.activeState.gamma.blackLevel = blackLevel;\n \tcontext.activeState.gamma.contrast = contrast;\n }\ndiff --git a/src/ipa/simple/ipa_context.h b/src/ipa/simple/ipa_context.h\nindex c69d59780..8f56c25bf 100644\n--- a/src/ipa/simple/ipa_context.h\n+++ b/src/ipa/simple/ipa_context.h\n@@ -57,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} gamma;\n \n@@ -65,6 +66,7 @@ struct IPAActiveState {\n \tbool matrixChanged = false;\n \n \tstruct {\n+\t\tstd::optional gamma;\n \t\t/* 0..2 range, 1.0 = normal */\n \t\tstd::optional contrast;\n \t\tstd::optional saturation;\n@@ -84,6 +86,7 @@ struct IPAFrameContext : public FrameContext {\n \t\tdouble blue;\n \t} gains;\n \n+\tstd::optional gamma;\n \tstd::optional contrast;\n \tstd::optional saturation;\n };\n","prefixes":["RFC","v2","09/13"]}