[11/13] ipa: libipa: awb: Move configure to common
diff mbox series

Message ID 20260407-kbingham-awb-split-v1-11-a39af3f4dc20@ideasonboard.com
State New
Headers show
Series
  • ipa: simple: Convert to libipa AWB implementation
Related show

Commit Message

Kieran Bingham April 7, 2026, 10:01 p.m. UTC 
Refactor the AWB configuration to use the common implementation supplied
by libipa awb module.

Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 src/ipa/libipa/awb.cpp            | 29 +++++++++++++++++++++++++++++
 src/ipa/libipa/awb.h              |  3 +++
 src/ipa/rkisp1/algorithms/awb.cpp | 13 +------------
 src/ipa/simple/algorithms/awb.cpp | 16 ++--------------
 4 files changed, 35 insertions(+), 26 deletions(-)

Patch
diff mbox series 

diff --git a/src/ipa/libipa/awb.cpp b/src/ipa/libipa/awb.cpp
index f215bea0b59483eadf95572f073928a4eb1275f4..d0c577958caebc0b7e24fe58506da964df2200fe 100644
--- a/src/ipa/libipa/awb.cpp
+++ b/src/ipa/libipa/awb.cpp
@@ -11,6 +11,8 @@ 
 
 #include <libcamera/control_ids.h>
 
+constexpr int32_t kDefaultColourTemperature = 5000;
+
 /**
  * \file awb.h
  * \brief Base classes for AWB algorithms
@@ -139,6 +141,33 @@  namespace ipa {
  * \return 0 on success, a negative error code otherwise
  */
 
+/**
+ * \brief Configure the Awb algorithm given an IPAConfigInfo
+ * \param[in] state The AWB specific active state shared across frames
+ * \param[in] session The AWB specific session configuration
+ *
+ * Configure and initialise the AWB algorithm module.
+ *
+ * \return 0 if successful, an error code otherwise
+ */
+int AwbAlgorithm::configure(awb::ActiveState &state, awb::Session &session)
+{
+	state.manual.gains = RGB<double>{ 1.0 };
+	auto gains = gainsFromColourTemperature(kDefaultColourTemperature);
+	if (gains)
+		state.automatic.gains = *gains;
+	else
+		state.automatic.gains = RGB<double>{ 1.0 };
+
+	state.autoEnabled = true;
+	state.manual.temperatureK = kDefaultColourTemperature;
+	state.automatic.temperatureK = kDefaultColourTemperature;
+
+	session.enabled = true;
+
+	return 0;
+}
+
 /**
  * \fn AwbAlgorithm::calculateAwb()
  * \brief Calculate AWB data from the given statistics
diff --git a/src/ipa/libipa/awb.h b/src/ipa/libipa/awb.h
index 764be849270bcd42ecdf67aea3d13afa170c7499..4ceae537686f8f4c93686fab4b9efbc06e112b1d 100644
--- a/src/ipa/libipa/awb.h
+++ b/src/ipa/libipa/awb.h
@@ -65,6 +65,9 @@  public:
 	virtual ~AwbAlgorithm() = default;
 
 	virtual int init(const YamlObject &tuningData) = 0;
+
+	int configure(awb::ActiveState &state, awb::Session &session);
+
 	virtual AwbResult calculateAwb(const AwbStats &stats, unsigned int lux) = 0;
 	virtual std::optional<RGB<double>> gainsFromColourTemperature(double colourTemperature) = 0;
 
diff --git a/src/ipa/rkisp1/algorithms/awb.cpp b/src/ipa/rkisp1/algorithms/awb.cpp
index f83da545be856c08cd758dc20a5ace91344101cf..86d5dfed3e1c2bb587705f05362229db3cdadafd 100644
--- a/src/ipa/rkisp1/algorithms/awb.cpp
+++ b/src/ipa/rkisp1/algorithms/awb.cpp
@@ -128,16 +128,7 @@  int Awb::init(IPAContext &context, const YamlObject &tuningData)
 int Awb::configure(IPAContext &context,
 		   const IPACameraSensorInfo &configInfo)
 {
-	context.activeState.awb.manual.gains = RGB<double>{ 1.0 };
-	auto gains = awbAlgo_->gainsFromColourTemperature(kDefaultColourTemperature);
-	if (gains)
-		context.activeState.awb.automatic.gains = *gains;
-	else
-		context.activeState.awb.automatic.gains = RGB<double>{ 1.0 };
-
-	context.activeState.awb.autoEnabled = true;
-	context.activeState.awb.manual.temperatureK = kDefaultColourTemperature;
-	context.activeState.awb.automatic.temperatureK = kDefaultColourTemperature;
+	awbAlgo_->configure(context.activeState.awb, context.configuration.awb);
 
 	/*
 	 * Define the measurement window for AWB as a centered rectangle
@@ -148,8 +139,6 @@  int Awb::configure(IPAContext &context,
 	context.configuration.awb.measureWindow.h_size = 3 * configInfo.outputSize.width / 4;
 	context.configuration.awb.measureWindow.v_size = 3 * configInfo.outputSize.height / 4;
 
-	context.configuration.awb.enabled = true;
-
 	return 0;
 }
 
diff --git a/src/ipa/simple/algorithms/awb.cpp b/src/ipa/simple/algorithms/awb.cpp
index 90c05e86bae6eefe4874feeb1263af07acd5fcfc..230b7807075941f086911549066e39c0a04dff5c 100644
--- a/src/ipa/simple/algorithms/awb.cpp
+++ b/src/ipa/simple/algorithms/awb.cpp
@@ -106,20 +106,8 @@  int Awb::init(IPAContext &context, const YamlObject &tuningData)
 int Awb::configure(IPAContext &context,
 		   [[maybe_unused]] const IPAConfigInfo &configInfo)
 {
-	context.activeState.awb.manual.gains = RGB<double>{ 1.0 };
-	auto gains = awbAlgo_->gainsFromColourTemperature(kDefaultColourTemperature);
-	if (gains)
-		context.activeState.awb.automatic.gains = *gains;
-	else
-		context.activeState.awb.automatic.gains = RGB<double>{ 1.0 };
-
-	context.activeState.awb.autoEnabled = true;
-	context.activeState.awb.manual.temperatureK = kDefaultColourTemperature;
-	context.activeState.awb.automatic.temperatureK = kDefaultColourTemperature;
-
-	context.configuration.awb.enabled = true;
-
-	return 0;
+	return awbAlgo_->configure(context.activeState.awb,
+				   context.configuration.awb);
 }
 
 /**