{"id":25929,"url":"https://patchwork.libcamera.org/api/1.1/patches/25929/?format=json","web_url":"https://patchwork.libcamera.org/patch/25929/","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":"<20260122161935.208562-4-mzamazal@redhat.com>","date":"2026-01-22T16:19:23","name":"[v4,03/15] libcamera: ipa: simple: Generalize tracking matrix changes","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"4d0d53bf35defe56cdccf518966730e874f11a98","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/25929/mbox/","series":[{"id":5733,"url":"https://patchwork.libcamera.org/api/1.1/series/5733/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5733","date":"2026-01-22T16:19:20","name":"Simple pipeline IPA cleanup","version":4,"mbox":"https://patchwork.libcamera.org/series/5733/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/25929/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/25929/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 B19ADBDCBF\n\tfor ;\n\tThu, 22 Jan 2026 16:20:21 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2823E61FCF;\n\tThu, 22 Jan 2026 17:20:21 +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 A173F61FCF\n\tfor ;\n\tThu, 22 Jan 2026 17:20:17 +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-548-RDqJBJ_-PSa1paeHtY90fg-1;\n\tThu, 22 Jan 2026 11:20:15 -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 2F2AE1944EA8; Thu, 22 Jan 2026 16:20:14 +0000 (UTC)","from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.45.224.97])\n\tby mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id ACF1E1800577; Thu, 22 Jan 2026 16:20:11 +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=\"MuXrqwe4\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1769098816;\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=IEP7X+EchYL0d/Sa5J5GJDOjq0bnXvAMifj9sbuOl6c=;\n\tb=MuXrqwe4wRQlr360x6HDm+49perWxzvr2FboCKG1AiktxuSkpT4u7fOpzGn87G6K8TL3yO\n\tQT1YvERCjvp3m+i9ia7YrVEdTEiuYZzIEal7zZNz1Wct3ZWm2+W1yYCkvhSIn44g3dfG7M\n\tyiN/wHZs5m/E4K+qHSqsd1vndFqqVOQ=","X-MC-Unique":"RDqJBJ_-PSa1paeHtY90fg-1","X-Mimecast-MFC-AGG-ID":"RDqJBJ_-PSa1paeHtY90fg_1769098814","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, Bryan O'Donoghue ","Subject":"[PATCH v4 03/15] libcamera: ipa: simple: Generalize tracking matrix\n\tchanges","Date":"Thu, 22 Jan 2026 17:19:23 +0100","Message-ID":"<20260122161935.208562-4-mzamazal@redhat.com>","In-Reply-To":"<20260122161935.208562-1-mzamazal@redhat.com>","References":"<20260122161935.208562-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":"c2xh-wIrrSWjr8184HnX_9L3S-1QUcW4ZNBh-2c4PY4_1769098814","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":"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\nReviewed-by: Bryan O'Donoghue \nReviewed-by: Barnabás Pőcze \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 54cb804e7..c19b34482 100644\n--- a/src/ipa/simple/algorithms/lut.cpp\n+++ b/src/ipa/simple/algorithms/lut.cpp\n@@ -127,11 +127,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@@ -150,6 +150,7 @@ void Lut::prepare(IPAContext &context,\n \t\t\t\tparams->gammaLut[i] = gammaTable[i / div];\n \t\t\t}\n \t\t}\n+\t\tcontext.activeState.matrixChanged = false;\n \t}\n \n \tparams->gamma = context.configuration.gamma;\ndiff --git a/src/ipa/simple/ipa_context.h b/src/ipa/simple/ipa_context.h\nindex 74e77c841..ea1852cd4 100644\n--- a/src/ipa/simple/ipa_context.h\n+++ b/src/ipa/simple/ipa_context.h\n@@ -62,10 +62,8 @@ struct IPAActiveState {\n \t\tdouble contrastExp;\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":["v4","03/15"]}