{"id":25005,"url":"https://patchwork.libcamera.org/api/1.1/patches/25005/?format=json","web_url":"https://patchwork.libcamera.org/patch/25005/","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":"<20251112082715.17823-8-mzamazal@redhat.com>","date":"2025-11-12T08:27:15","name":"[RFC,7/7] libcamera: ipa: simple: Move contrast settings to adjust.cpp","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"ea1968689f2d208ac9e18744dbb3029c69bc4b06","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/25005/mbox/","series":[{"id":5582,"url":"https://patchwork.libcamera.org/api/1.1/series/5582/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5582","date":"2025-11-12T08:27:08","name":"Simple pipeline IPA cleanup","version":1,"mbox":"https://patchwork.libcamera.org/series/5582/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/25005/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/25005/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 78A4DC3241\n\tfor ;\n\tWed, 12 Nov 2025 08:27:40 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1593860AAC;\n\tWed, 12 Nov 2025 09:27:40 +0100 (CET)","from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.129.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id ADE3860A86\n\tfor ;\n\tWed, 12 Nov 2025 09:27:35 +0100 (CET)","from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-493-Qd_ITTY1MpiMW9KccB1FZA-1;\n\tWed, 12 Nov 2025 03:27:33 -0500","from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.93])\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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS\n\tid 9A3DE180034A for ;\n\tWed, 12 Nov 2025 08:27:32 +0000 (UTC)","from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.44.33.149])\n\tby mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 92F431800367; Wed, 12 Nov 2025 08:27:31 +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=\"fZwGcxo1\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1762936054;\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=JBpLen0K8pSkW9L5KMsCrcOcmyAwMdgMgtNvB6yjQf8=;\n\tb=fZwGcxo15Oghx3GetbfLpcjQjZH0hKTwrPbH+2x5+eGCBTEgEYEGfD74fx59C2/tFuedI5\n\tASN6XMG+C5MjLHgt1OQ5js0YT6j5ek5xUhLFQPDOVFFw1FIwj36BKZSGT4zEiWDZlWelvv\n\t2Pi9GdCOX5n/fcYilOTWuvRlPJ2CuLs=","X-MC-Unique":"Qd_ITTY1MpiMW9KccB1FZA-1","X-Mimecast-MFC-AGG-ID":"Qd_ITTY1MpiMW9KccB1FZA_1762936052","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal ","Subject":"[RFC PATCH 7/7] libcamera: ipa: simple: Move contrast settings to\n\tadjust.cpp","Date":"Wed, 12 Nov 2025 09:27:15 +0100","Message-ID":"<20251112082715.17823-8-mzamazal@redhat.com>","In-Reply-To":"<20251112082715.17823-1-mzamazal@redhat.com>","References":"<20251112082715.17823-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.93","X-Mimecast-Spam-Score":"0","X-Mimecast-MFC-PROC-ID":"P3QCJDR8oEBHFSDBtM28341YdM-BACBi3mw_YsMz3UU_1762936052","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":"Let's move the contrast settings from lut.cpp to adjust.cpp, where they\nbelong, similarly to saturation.\n\nSigned-off-by: Milan Zamazal \n---\n src/ipa/simple/algorithms/adjust.cpp | 14 +++++++++++\n src/ipa/simple/algorithms/lut.cpp | 35 +---------------------------\n src/ipa/simple/algorithms/lut.h | 11 ---------\n 3 files changed, 15 insertions(+), 45 deletions(-)","diff":"diff --git a/src/ipa/simple/algorithms/adjust.cpp b/src/ipa/simple/algorithms/adjust.cpp\nindex 282b3ccb0..b9a9fc710 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::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 \treturn 0;\n@@ -31,6 +32,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.contrast = std::optional();\n \tcontext.activeState.knobs.saturation = std::optional();\n \tcontext.activeState.correctionMatrix =\n \t\tMatrix{ { 1, 0, 0, 0, 1, 0, 0, 0, 1 } };\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 &contrast = controls.get(controls::Contrast);\n+\tif (contrast.has_value()) {\n+\t\tcontext.activeState.knobs.contrast = contrast;\n+\t\tLOG(IPASoftAdjust, Debug) << \"Setting contrast to \" << contrast.value();\n+\t}\n+\n \tconst auto &saturation = controls.get(controls::Saturation);\n \tif (saturation.has_value()) {\n \t\tcontext.activeState.knobs.saturation = saturation;\n@@ -77,6 +85,8 @@ void Adjust::prepare(IPAContext &context,\n \t\t IPAFrameContext &frameContext,\n \t\t [[maybe_unused]] DebayerParams *params)\n {\n+\tframeContext.contrast = context.activeState.knobs.contrast;\n+\n \tif (!context.ccmEnabled)\n \t\treturn;\n \n@@ -100,6 +110,10 @@ void Adjust::process([[maybe_unused]] IPAContext &context,\n \t\t [[maybe_unused]] const SwIspStats *stats,\n \t\t ControlList &metadata)\n {\n+\tconst auto &contrast = frameContext.contrast;\n+\tif (contrast)\n+\t\tmetadata.set(controls::Contrast, contrast.value());\n+\n \tconst auto &saturation = frameContext.saturation;\n \tmetadata.set(controls::Saturation, saturation.value_or(1.0));\n }\ndiff --git a/src/ipa/simple/algorithms/lut.cpp b/src/ipa/simple/algorithms/lut.cpp\nindex 8751bb31c..876cd5cb3 100644\n--- a/src/ipa/simple/algorithms/lut.cpp\n+++ b/src/ipa/simple/algorithms/lut.cpp\n@@ -24,36 +24,16 @@ LOG_DEFINE_CATEGORY(IPASoftLut)\n \n namespace ipa::soft::algorithms {\n \n-int Lut::init(IPAContext &context,\n-\t [[maybe_unused]] const YamlObject &tuningData)\n-{\n-\tcontext.ctrlMap[&controls::Contrast] = ControlInfo(0.0f, 2.0f, 1.0f);\n-\treturn 0;\n-}\n-\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-\tcontext.activeState.knobs.contrast = std::optional();\n \tupdateGammaTable(context);\n \n \treturn 0;\n }\n \n-void Lut::queueRequest(typename Module::Context &context,\n-\t\t [[maybe_unused]] const uint32_t frame,\n-\t\t [[maybe_unused]] typename Module::FrameContext &frameContext,\n-\t\t const ControlList &controls)\n-{\n-\tconst auto &contrast = controls.get(controls::Contrast);\n-\tif (contrast.has_value()) {\n-\t\tcontext.activeState.knobs.contrast = contrast;\n-\t\tLOG(IPASoftLut, Debug) << \"Setting contrast to \" << contrast.value();\n-\t}\n-}\n-\n void Lut::updateGammaTable(IPAContext &context)\n {\n \tauto &gammaTable = context.activeState.gamma.gammaTable;\n@@ -87,11 +67,9 @@ int16_t Lut::matrixValue(unsigned int i, float ccm) const\n \n void Lut::prepare(IPAContext &context,\n \t\t [[maybe_unused]] const uint32_t frame,\n-\t\t IPAFrameContext &frameContext,\n+\t\t [[maybe_unused]] IPAFrameContext &frameContext,\n \t\t DebayerParams *params)\n {\n-\tframeContext.contrast = context.activeState.knobs.contrast;\n-\n \t/*\n \t * Update the gamma table if needed. This means if black level changes\n \t * and since the black level gets updated only if a lower value is\n@@ -143,17 +121,6 @@ void Lut::prepare(IPAContext &context,\n \t}\n }\n \n-void Lut::process([[maybe_unused]] IPAContext &context,\n-\t\t [[maybe_unused]] const uint32_t frame,\n-\t\t [[maybe_unused]] IPAFrameContext &frameContext,\n-\t\t [[maybe_unused]] const SwIspStats *stats,\n-\t\t ControlList &metadata)\n-{\n-\tconst auto &contrast = frameContext.contrast;\n-\tif (contrast)\n-\t\tmetadata.set(controls::Contrast, contrast.value());\n-}\n-\n REGISTER_IPA_ALGORITHM(Lut, \"Lut\")\n \n } /* namespace ipa::soft::algorithms */\ndiff --git a/src/ipa/simple/algorithms/lut.h b/src/ipa/simple/algorithms/lut.h\nindex 0eafd0695..ad16d1e8e 100644\n--- a/src/ipa/simple/algorithms/lut.h\n+++ b/src/ipa/simple/algorithms/lut.h\n@@ -19,22 +19,11 @@ public:\n \tLut() = default;\n \t~Lut() = default;\n \n-\tint init(IPAContext &context, const YamlObject &tuningData) override;\n \tint configure(IPAContext &context, const IPAConfigInfo &configInfo) override;\n-\tvoid queueRequest(typename Module::Context &context,\n-\t\t\t const uint32_t frame,\n-\t\t\t typename Module::FrameContext &frameContext,\n-\t\t\t const ControlList &controls)\n-\t\toverride;\n \tvoid prepare(IPAContext &context,\n \t\t const uint32_t frame,\n \t\t IPAFrameContext &frameContext,\n \t\t DebayerParams *params) override;\n-\tvoid process(IPAContext &context,\n-\t\t const uint32_t frame,\n-\t\t IPAFrameContext &frameContext,\n-\t\t const SwIspStats *stats,\n-\t\t ControlList &metadata) override;\n \n private:\n \tvoid updateGammaTable(IPAContext &context);\n","prefixes":["RFC","7/7"]}