{"id":25770,"url":"https://patchwork.libcamera.org/api/patches/25770/?format=json","web_url":"https://patchwork.libcamera.org/patch/25770/","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":"<20260114113016.25162-6-mzamazal@redhat.com>","date":"2026-01-14T11:30:07","name":"[v3,05/14] libcamera: ipa: simple: Introduce a general correction matrix","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"36e805edc78ebf0b3cd5044ece26393093e13588","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/25770/mbox/","series":[{"id":5706,"url":"https://patchwork.libcamera.org/api/series/5706/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5706","date":"2026-01-14T11:30:02","name":"Simple pipeline IPA cleanup","version":3,"mbox":"https://patchwork.libcamera.org/series/5706/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/25770/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/25770/checks/","tags":{},"headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 58F02C3274\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 14 Jan 2026 11:30:53 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1C07261FC6;\n\tWed, 14 Jan 2026 12:30:53 +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 D50EB61FBC\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 14 Jan 2026 12:30:50 +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-448-5zOTvLRXOQ6T8IVCYJsWsA-1;\n\tWed, 14 Jan 2026 06:30:48 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 2F6CE19560A3; Wed, 14 Jan 2026 11:30:47 +0000 (UTC)","from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.44.32.217])\n\tby mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 81C9718004D8; Wed, 14 Jan 2026 11:30:45 +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=\"Aq4AJErk\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1768390249;\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=GogNUcizGWkqY1wGn5jwu0XlCeZ9LCdwytV7K+BS068=;\n\tb=Aq4AJErkNXBhXsw6ZD3kOg6UCPxp+EiV/kj0GZsTCxojXmO1+I/VOitnWEKuvYByR2FLEJ\n\t62ZHaC9qnFa7a/sgdqjjMmUMT6GJux9QtB7rzSeTPeHWn+y6IkxqDmGQROZMmpIMkQ/Rh+\n\t5MGkAOwPXybanTf5sJYaiOXJ5bauoKM=","X-MC-Unique":"5zOTvLRXOQ6T8IVCYJsWsA-1","X-Mimecast-MFC-AGG-ID":"5zOTvLRXOQ6T8IVCYJsWsA_1768390247","From":"Milan Zamazal <mzamazal@redhat.com>","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal <mzamazal@redhat.com>, Kieran Bingham\n\t<kieran.bingham@ideasonboard.com>, =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?=\n\t<barnabas.pocze@ideasonboard.com>","Subject":"[PATCH v3 05/14] libcamera: ipa: simple: Introduce a general\n\tcorrection matrix","Date":"Wed, 14 Jan 2026 12:30:07 +0100","Message-ID":"<20260114113016.25162-6-mzamazal@redhat.com>","In-Reply-To":"<20260114113016.25162-1-mzamazal@redhat.com>","References":"<20260114113016.25162-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":"XScWL9v7rJkHp8pmpwULUUZzzJ8K5qzt_COJPOJVm1Q_1768390247","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":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"},"content":"Let's introduce IPAActiveState::combinedMatrix that is separate from\nIPAActiveState::ccm and represents the overall correction matrix, not\nonly the sensor colour correction matrix.\n\nIPAActiveState::ccm still includes everything; this is changed in the\nfollowup patch.\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nSigned-off-by: Milan Zamazal <mzamazal@redhat.com>\n---\n src/ipa/simple/algorithms/ccm.cpp | 1 +\n src/ipa/simple/algorithms/lut.cpp | 2 +-\n src/ipa/simple/ipa_context.h      | 1 +\n 3 files changed, 3 insertions(+), 1 deletion(-)","diff":"diff --git a/src/ipa/simple/algorithms/ccm.cpp b/src/ipa/simple/algorithms/ccm.cpp\nindex e05e5bc28..a3e8cd6c4 100644\n--- a/src/ipa/simple/algorithms/ccm.cpp\n+++ b/src/ipa/simple/algorithms/ccm.cpp\n@@ -104,6 +104,7 @@ void Ccm::prepare(IPAContext &context, const uint32_t frame,\n \tif (saturation)\n \t\tapplySaturation(ccm, saturation.value());\n \n+\tcontext.activeState.combinedMatrix = ccm;\n \tcontext.activeState.ccm = ccm;\n \tframeContext.saturation = saturation;\n \tcontext.activeState.matrixChanged = true;\ndiff --git a/src/ipa/simple/algorithms/lut.cpp b/src/ipa/simple/algorithms/lut.cpp\nindex 5c4683fd8..141ea17fa 100644\n--- a/src/ipa/simple/algorithms/lut.cpp\n+++ b/src/ipa/simple/algorithms/lut.cpp\n@@ -131,7 +131,7 @@ void Lut::prepare(IPAContext &context,\n \t\tMatrix<float, 3, 3> 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 matrix = context.activeState.combinedMatrix * gainMatrix;\n \t\tauto &red = params->redCcm;\n \t\tauto &green = params->greenCcm;\n \t\tauto &blue = params->blueCcm;\ndiff --git a/src/ipa/simple/ipa_context.h b/src/ipa/simple/ipa_context.h\nindex ea1852cd4..58dcad290 100644\n--- a/src/ipa/simple/ipa_context.h\n+++ b/src/ipa/simple/ipa_context.h\n@@ -63,6 +63,7 @@ struct IPAActiveState {\n \t} gamma;\n \n \tMatrix<float, 3, 3> ccm;\n+\tMatrix<float, 3, 3> combinedMatrix;\n \tbool matrixChanged = false;\n \n \tstruct {\n","prefixes":["v3","05/14"]}