[v4,03/15] libcamera: ipa: simple: Generalize tracking matrix changes
diff mbox series

Message ID 20260122161935.208562-4-mzamazal@redhat.com
State New
Headers show
Series
  • Simple pipeline IPA cleanup
Related show

Commit Message

Milan Zamazal Jan. 22, 2026, 4:19 p.m. UTC 
IPAActiveState::ccm stores the colour correction matrix (CCM) and
whether it has been changed.  The change flag is later used when
recomputing or not the lookup tables.

But the CCM may include other corrections than just the sensor colour
correction, for example white balance and saturation adjustments.  These
things should be separated and IPAActiveState::ccm should represent just
the CCM itself.

As the first step towards that cleanup, let's separate the change flag
from the CCM.  And wrap the only remaining member of
IPAActiveState::ccm.

Also, let's reset the separated change flag in the lookup tables; it'll
be no longer tied to just CCM handling.

This patch doesn't change actual behaviour and it still reports the
combined matrix as CCM in metadata.  This is addressed in the followup
patches.

Reviewed-by: Bryan O'Donoghue <bod.linux@nxsw.ie>
Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
---
 src/ipa/simple/algorithms/ccm.cpp | 7 +++----
 src/ipa/simple/algorithms/lut.cpp | 5 +++--
 src/ipa/simple/ipa_context.h      | 6 ++----
 3 files changed, 8 insertions(+), 10 deletions(-)

Patch
diff mbox series 

diff --git a/src/ipa/simple/algorithms/ccm.cpp b/src/ipa/simple/algorithms/ccm.cpp
index d7d3dda76..e05e5bc28 100644
--- a/src/ipa/simple/algorithms/ccm.cpp
+++ b/src/ipa/simple/algorithms/ccm.cpp
@@ -94,8 +94,7 @@  void Ccm::prepare(IPAContext &context, const uint32_t frame,
 	if (frame > 0 &&
 	    utils::abs_diff(ct, lastCt_) < kTemperatureThreshold &&
 	    saturation == lastSaturation_) {
-		frameContext.ccm = context.activeState.ccm.ccm;
-		context.activeState.ccm.changed = false;
+		frameContext.ccm = context.activeState.ccm;
 		return;
 	}
 
@@ -105,9 +104,9 @@  void Ccm::prepare(IPAContext &context, const uint32_t frame,
 	if (saturation)
 		applySaturation(ccm, saturation.value());
 
-	context.activeState.ccm.ccm = ccm;
+	context.activeState.ccm = ccm;
 	frameContext.saturation = saturation;
-	context.activeState.ccm.changed = true;
+	context.activeState.matrixChanged = true;
 	frameContext.ccm = ccm;
 }
 
diff --git a/src/ipa/simple/algorithms/lut.cpp b/src/ipa/simple/algorithms/lut.cpp
index 54cb804e7..c19b34482 100644
--- a/src/ipa/simple/algorithms/lut.cpp
+++ b/src/ipa/simple/algorithms/lut.cpp
@@ -127,11 +127,11 @@  void Lut::prepare(IPAContext &context,
 			params->green[i] = gammaTable[static_cast<unsigned int>(lutGains.g())];
 			params->blue[i] = gammaTable[static_cast<unsigned int>(lutGains.b())];
 		}
-	} else if (context.activeState.ccm.changed || gammaUpdateNeeded) {
+	} else if (context.activeState.matrixChanged || gammaUpdateNeeded) {
 		Matrix<float, 3, 3> gainCcm = { { gains.r(), 0, 0,
 						  0, gains.g(), 0,
 						  0, 0, gains.b() } };
-		auto ccm = context.activeState.ccm.ccm * gainCcm;
+		auto ccm = context.activeState.ccm * gainCcm;
 		auto &red = params->redCcm;
 		auto &green = params->greenCcm;
 		auto &blue = params->blueCcm;
@@ -150,6 +150,7 @@  void Lut::prepare(IPAContext &context,
 				params->gammaLut[i] = gammaTable[i / div];
 			}
 		}
+		context.activeState.matrixChanged = false;
 	}
 
 	params->gamma = context.configuration.gamma;
diff --git a/src/ipa/simple/ipa_context.h b/src/ipa/simple/ipa_context.h
index 74e77c841..ea1852cd4 100644
--- a/src/ipa/simple/ipa_context.h
+++ b/src/ipa/simple/ipa_context.h
@@ -62,10 +62,8 @@  struct IPAActiveState {
 		double contrastExp;
 	} gamma;
 
-	struct {
-		Matrix<float, 3, 3> ccm;
-		bool changed;
-	} ccm;
+	Matrix<float, 3, 3> ccm;
+	bool matrixChanged = false;
 
 	struct {
 		/* 0..2 range, 1.0 = normal */