{"id":25089,"url":"https://patchwork.libcamera.org/api/1.1/patches/25089/?format=json","web_url":"https://patchwork.libcamera.org/patch/25089/","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":"<20251120104548.80268-4-mzamazal@redhat.com>","date":"2025-11-20T10:45:38","name":"[RFC,v2,03/13] libcamera: ipa: simple: Generalise tracking matrix changes","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"a102549ce0b4435de56cd178aa18defdb799c5b1","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/25089/mbox/","series":[{"id":5597,"url":"https://patchwork.libcamera.org/api/1.1/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/25089/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/25089/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 B788AC3330\n\tfor ;\n\tThu, 20 Nov 2025 10:46:15 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6683760A81;\n\tThu, 20 Nov 2025 11:46:15 +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 63CFF60AA1\n\tfor ;\n\tThu, 20 Nov 2025 11:46:13 +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-349-bozH9i00NZ2qUXvSj2rrNw-1;\n\tThu, 20 Nov 2025 05:46:08 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 5011C180047F; Thu, 20 Nov 2025 10:46:07 +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 A2AA6180087B; Thu, 20 Nov 2025 10:46:05 +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=\"X6EsWQpn\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1763635572;\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=4edCUQmK8Wq8zdYgI7wKO9gtoQsozmvbFwxYfwtEcrc=;\n\tb=X6EsWQpnSIiYFz3+Tj9YZIlqbxqF3vgkGDDC9F/SDZNJuPiVB6pNn86roUp6DMtJYSJWSm\n\tMhMNjo1dY1EPAxnKtqS87DfiBeS0Ym1BjT9C0sCUjP2uzYeR0AMH0+t7z6emVmGO1wiNwr\n\t72sz0adC9ck49cUmXeS4Z4RpT4l8Gvc=","X-MC-Unique":"bozH9i00NZ2qUXvSj2rrNw-1","X-Mimecast-MFC-AGG-ID":"bozH9i00NZ2qUXvSj2rrNw_1763635567","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 03/13] libcamera: ipa: simple: Generalise tracking\n\tmatrix changes","Date":"Thu, 20 Nov 2025 11:45:38 +0100","Message-ID":"<20251120104548.80268-4-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":"ZAb1-dAqxRB7crFcvfS_51bOjyjyoYEmRfFgssE_0vA_1763635567","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":"IPAActiveState::ccm stores the colour correction matrix (CCM) and\nwhether it has been changed. The change flag is later used when\nrecomputing or not the lookup tables.\n\nBut the CCM may include other corrections than just the sensor colour\ncorrection, for example white balance and saturation adjustments. These\nthings should be separated and IPAActiveState::ccm should represent just\nthe CCM itself.\n\nAs the first step towards that cleanup, let's separate the change flag\nfrom the CCM. And wrap the only remaining member of\nIPAActiveState::ccm.\n\nAlso, let's reset the separated change flag in the lookup tables; it'll\nbe no longer tied to just CCM handling.\n\nThis patch doesn't change actual behaviour and it still reports the\ncombined matrix as CCM in metadata. This is addressed in the followup\npatches.\n\nSigned-off-by: Milan Zamazal \n---\n src/ipa/simple/algorithms/ccm.cpp | 7 +++----\n src/ipa/simple/algorithms/lut.cpp | 5 +++--\n src/ipa/simple/ipa_context.h | 6 ++----\n 3 files changed, 8 insertions(+), 10 deletions(-)","diff":"diff --git a/src/ipa/simple/algorithms/ccm.cpp b/src/ipa/simple/algorithms/ccm.cpp\nindex d7d3dda76..e05e5bc28 100644\n--- a/src/ipa/simple/algorithms/ccm.cpp\n+++ b/src/ipa/simple/algorithms/ccm.cpp\n@@ -94,8 +94,7 @@ void Ccm::prepare(IPAContext &context, const uint32_t frame,\n \tif (frame > 0 &&\n \t utils::abs_diff(ct, lastCt_) < kTemperatureThreshold &&\n \t saturation == lastSaturation_) {\n-\t\tframeContext.ccm = context.activeState.ccm.ccm;\n-\t\tcontext.activeState.ccm.changed = false;\n+\t\tframeContext.ccm = context.activeState.ccm;\n \t\treturn;\n \t}\n \n@@ -105,9 +104,9 @@ void Ccm::prepare(IPAContext &context, const uint32_t frame,\n \tif (saturation)\n \t\tapplySaturation(ccm, saturation.value());\n \n-\tcontext.activeState.ccm.ccm = ccm;\n+\tcontext.activeState.ccm = ccm;\n \tframeContext.saturation = saturation;\n-\tcontext.activeState.ccm.changed = true;\n+\tcontext.activeState.matrixChanged = true;\n \tframeContext.ccm = ccm;\n }\n \ndiff --git a/src/ipa/simple/algorithms/lut.cpp b/src/ipa/simple/algorithms/lut.cpp\nindex d4a79e101..1cd7ef92e 100644\n--- a/src/ipa/simple/algorithms/lut.cpp\n+++ b/src/ipa/simple/algorithms/lut.cpp\n@@ -125,11 +125,11 @@ void Lut::prepare(IPAContext &context,\n \t\t\tparams->green[i] = gammaTable[static_cast(lutGains.g())];\n \t\t\tparams->blue[i] = gammaTable[static_cast(lutGains.b())];\n \t\t}\n-\t} else if (context.activeState.ccm.changed || gammaUpdateNeeded) {\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.ccm * gainCcm;\n+\t\tauto ccm = context.activeState.ccm * gainCcm;\n \t\tauto &red = params->redCcm;\n \t\tauto &green = params->greenCcm;\n \t\tauto &blue = params->blueCcm;\n@@ -145,6 +145,7 @@ void Lut::prepare(IPAContext &context,\n \t\t\tblue[i].b = ccmValue(i, ccm[2][2]);\n \t\t\tparams->gammaLut[i] = gammaTable[i / div];\n \t\t}\n+\t\tcontext.activeState.matrixChanged = false;\n \t}\n }\n \ndiff --git a/src/ipa/simple/ipa_context.h b/src/ipa/simple/ipa_context.h\nindex 330fe39cb..b6b3cbfed 100644\n--- a/src/ipa/simple/ipa_context.h\n+++ b/src/ipa/simple/ipa_context.h\n@@ -60,10 +60,8 @@ struct IPAActiveState {\n \t\tdouble contrast;\n \t} gamma;\n \n-\tstruct {\n-\t\tMatrix ccm;\n-\t\tbool changed;\n-\t} ccm;\n+\tMatrix ccm;\n+\tbool matrixChanged = false;\n \n \tstruct {\n \t\t/* 0..2 range, 1.0 = normal */\n","prefixes":["RFC","v2","03/13"]}