{"id":25090,"url":"https://patchwork.libcamera.org/api/patches/25090/?format=json","web_url":"https://patchwork.libcamera.org/patch/25090/","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-5-mzamazal@redhat.com>","date":"2025-11-20T10:45:39","name":"[RFC,v2,04/13] libcamera: ipa: simple: Rename \"ccm\" identifiers not specific to CCM","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"d130b8a9babfea836606479384530b1cce427fcf","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/25090/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/25090/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/25090/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 BA67EC3330\n\tfor ;\n\tThu, 20 Nov 2025 10:46:18 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6907D60AA1;\n\tThu, 20 Nov 2025 11:46:18 +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 CE81E60AA4\n\tfor ;\n\tThu, 20 Nov 2025 11:46:15 +0100 (CET)","from mx-prod-mc-03.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-80-bfwlGw95MBivy_whXL3p4g-1;\n\tThu, 20 Nov 2025 05:46:10 -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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id BC0041956058; Thu, 20 Nov 2025 10:46:09 +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 E5580180087B; Thu, 20 Nov 2025 10:46:07 +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=\"ddY58Qk3\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1763635574;\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=uUNVsOkuEdWJt6qvUcutuM1g7bn7nYqqke8eSWJ01G4=;\n\tb=ddY58Qk3ZbE8A31Xn4rnI7MsY0ADCaezmDyy2D1S10sdJN2YnKvwV1sGf18IHWU6UfdsRs\n\txw4j8Zd9zyko2wSb8lJm8rpPoFPU+i8AXATviBKF/DzWjFS9ZefPoHqMYuqp/5IsrjIMPu\n\t7ENctTcYVwyTHGNpLm0btY5/wGf+rQM=","X-MC-Unique":"bfwlGw95MBivy_whXL3p4g-1","X-Mimecast-MFC-AGG-ID":"bfwlGw95MBivy_whXL3p4g_1763635569","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 04/13] libcamera: ipa: simple: Rename \"ccm\"\n\tidentifiers not specific to CCM","Date":"Thu, 20 Nov 2025 11:45:39 +0100","Message-ID":"<20251120104548.80268-5-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":"oYTxfV5edpcbRaKD-xU8AsdPlezVyIS2HkAUEQA6gO0_1763635569","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 rename the identifiers that are related to general colour\ncorrections applied by matrix operations, rather than directly to the\nsensor colour correction matrix.\n\nSigned-off-by: Milan Zamazal \n---\n src/ipa/simple/algorithms/lut.cpp | 28 ++++++++++++++--------------\n src/ipa/simple/algorithms/lut.h | 2 +-\n 2 files changed, 15 insertions(+), 15 deletions(-)","diff":"diff --git a/src/ipa/simple/algorithms/lut.cpp b/src/ipa/simple/algorithms/lut.cpp\nindex 1cd7ef92e..39d8cca1d 100644\n--- a/src/ipa/simple/algorithms/lut.cpp\n+++ b/src/ipa/simple/algorithms/lut.cpp\n@@ -87,7 +87,7 @@ void Lut::updateGammaTable(IPAContext &context)\n \tcontext.activeState.gamma.contrast = contrast;\n }\n \n-int16_t Lut::ccmValue(unsigned int i, float ccm) const\n+int16_t Lut::matrixValue(unsigned int i, float ccm) const\n {\n \treturn std::round(i * ccm);\n }\n@@ -126,23 +126,23 @@ void Lut::prepare(IPAContext &context,\n \t\t\tparams->blue[i] = gammaTable[static_cast(lutGains.b())];\n \t\t}\n \t} else if (context.activeState.matrixChanged || gammaUpdateNeeded) {\n-\t\tMatrix gainCcm = { { gains.r(), 0, 0,\n-\t\t\t\t\t\t 0, gains.g(), 0,\n-\t\t\t\t\t\t 0, 0, gains.b() } };\n-\t\tauto ccm = context.activeState.ccm * gainCcm;\n+\t\tMatrix gainMatrix = { { gains.r(), 0, 0,\n+\t\t\t\t\t\t 0, gains.g(), 0,\n+\t\t\t\t\t\t 0, 0, gains.b() } };\n+\t\tauto matrix = context.activeState.ccm * gainMatrix;\n \t\tauto &red = params->redCcm;\n \t\tauto &green = params->greenCcm;\n \t\tauto &blue = params->blueCcm;\n \t\tfor (unsigned int i = 0; i < DebayerParams::kRGBLookupSize; i++) {\n-\t\t\tred[i].r = ccmValue(i, ccm[0][0]);\n-\t\t\tred[i].g = ccmValue(i, ccm[1][0]);\n-\t\t\tred[i].b = ccmValue(i, ccm[2][0]);\n-\t\t\tgreen[i].r = ccmValue(i, ccm[0][1]);\n-\t\t\tgreen[i].g = ccmValue(i, ccm[1][1]);\n-\t\t\tgreen[i].b = ccmValue(i, ccm[2][1]);\n-\t\t\tblue[i].r = ccmValue(i, ccm[0][2]);\n-\t\t\tblue[i].g = ccmValue(i, ccm[1][2]);\n-\t\t\tblue[i].b = ccmValue(i, ccm[2][2]);\n+\t\t\tred[i].r = matrixValue(i, matrix[0][0]);\n+\t\t\tred[i].g = matrixValue(i, matrix[1][0]);\n+\t\t\tred[i].b = matrixValue(i, matrix[2][0]);\n+\t\t\tgreen[i].r = matrixValue(i, matrix[0][1]);\n+\t\t\tgreen[i].g = matrixValue(i, matrix[1][1]);\n+\t\t\tgreen[i].b = matrixValue(i, matrix[2][1]);\n+\t\t\tblue[i].r = matrixValue(i, matrix[0][2]);\n+\t\t\tblue[i].g = matrixValue(i, matrix[1][2]);\n+\t\t\tblue[i].b = matrixValue(i, matrix[2][2]);\n \t\t\tparams->gammaLut[i] = gammaTable[i / div];\n \t\t}\n \t\tcontext.activeState.matrixChanged = false;\ndiff --git a/src/ipa/simple/algorithms/lut.h b/src/ipa/simple/algorithms/lut.h\nindex ba8b9021b..0eafd0695 100644\n--- a/src/ipa/simple/algorithms/lut.h\n+++ b/src/ipa/simple/algorithms/lut.h\n@@ -38,7 +38,7 @@ public:\n \n private:\n \tvoid updateGammaTable(IPAContext &context);\n-\tint16_t ccmValue(unsigned int i, float ccm) const;\n+\tint16_t matrixValue(unsigned int i, float ccm) const;\n };\n \n } /* namespace ipa::soft::algorithms */\n","prefixes":["RFC","v2","04/13"]}