[v6,10/24] ipa: libipa: exposure_mode_helper: Consider last stage as hard-limit
diff mbox series

Message ID 20261102101610.877390-11-barnabas.pocze@ideasonboard.com
State New
Headers show
Series
  • ipa: libipa: agc: Take exposure margin into account
Related show

Commit Message

Barnabás Pőcze Nov. 2, 2026, 10:15 a.m. UTC 
Currently `splitExposure()` will raise the exposure and analogue gain above
what is specified in the last stage, if the desired exposure could not be
reached. This behaviour is different from that of the raspberry pi ipa,
and also could be surprising to the user / tuning file creator.

So make sure that the exposure time and analogue gain is limited by the
last stage, in addition to the runtime controlled upper bound.

With this change, at least one stage is required, so an assertions are added.
And the general agc algorithm is adjusted to provide stages for the fallback
"Maximize" mode.

Closes: https://gitlab.freedesktop.org/camera/libcamera/-/work_items/362
Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
---
 src/ipa/libipa/agc.cpp                  |  7 ++++++-
 src/ipa/libipa/exposure_mode_helper.cpp | 23 +++++++++++------------
 2 files changed, 17 insertions(+), 13 deletions(-)

Patch
diff mbox series 

diff --git a/src/ipa/libipa/agc.cpp b/src/ipa/libipa/agc.cpp
index 3bc7e67b71..2a8dd36244 100644
--- a/src/ipa/libipa/agc.cpp
+++ b/src/ipa/libipa/agc.cpp
@@ -463,7 +463,12 @@  void addFallbacks(AgcMeanLuminance::Configuration &config)
 	if (config.exposureModeHelpers.empty())
 		config.exposureModeHelpers.try_emplace(
 			controls::AeExposureModeMaximize,
-			std::vector<ExposureModeHelper::Stage>{});
+			std::vector{
+				ExposureModeHelper::Stage{
+					.exposureTime = utils::Duration::max(),
+					.gain = std::numeric_limits<double>::max(),
+				},
+			});
 }
 
 } /* namespace */
diff --git a/src/ipa/libipa/exposure_mode_helper.cpp b/src/ipa/libipa/exposure_mode_helper.cpp
index 4076d6f385..9714cc950e 100644
--- a/src/ipa/libipa/exposure_mode_helper.cpp
+++ b/src/ipa/libipa/exposure_mode_helper.cpp
@@ -84,6 +84,7 @@  ExposureModeHelper::ExposureModeHelper(std::vector<Stage> &&stages)
 	: stages_(std::move(stages)), lineDuration_(1us), minExposureTime_(0us),
 	  maxExposureTime_(0us), minGain_(0), maxGain_(0), sensorHelper_(nullptr)
 {
+	ASSERT(!stages_.empty());
 }
 
 /**
@@ -203,8 +204,8 @@  double ExposureModeHelper::clampGain(double gain, double *quantizationGain) cons
  * value.
  *
  * If no combination of exposure time and gain limits is found that meets the
- * required exposure, the helper falls-back to simply maximising the exposure
- * time first, followed by analogue gain, followed by digital gain.
+ * required exposure, then the exposure and gain of the last stage will be used,
+ * and the digital gain will be increased as necessary.
  *
  * During the calculations the gain missed due to quantization is recorded and
  * returned as quantization gain. The quantization gain is not included in the
@@ -219,6 +220,7 @@  ExposureModeHelper::splitExposure(utils::Duration exposure) const
 {
 	ASSERT(maxExposureTime_);
 	ASSERT(maxGain_);
+	ASSERT(!stages_.empty());
 
 	utils::Duration exposureTime;
 	double gain;
@@ -240,11 +242,11 @@  ExposureModeHelper::splitExposure(utils::Duration exposure) const
 			 exposure / (exposureTime * gain * quantGain) };
 	}
 
+	utils::Duration stageExposureTime = {};
 	double stageGain = clampGain(1.0);
 
 	for (const auto &stage : stages_) {
-		utils::Duration stageExposureTime = clampExposureTime(stage.exposureTime,
-								      &quantGain);
+		stageExposureTime = clampExposureTime(stage.exposureTime, &quantGain);
 
 		/*
 		 * We perform the clamping on both exposure time and gain in
@@ -265,7 +267,7 @@  ExposureModeHelper::splitExposure(utils::Duration exposure) const
 		}
 
 		/* Clamp the exposure time to stageExposureTime and regulate gain. */
-		stageGain = clampGain(stage.gain);
+		stageGain = clampGain(stage.gain, &quantGain2);
 
 		if (stageExposureTime * stageGain >= exposure) {
 			exposureTime = stageExposureTime;
@@ -278,14 +280,11 @@  ExposureModeHelper::splitExposure(utils::Duration exposure) const
 	}
 
 	/*
-	 * From here on all we can do is max out the exposure time, followed by
-	 * the analogue gain. If we still haven't achieved the target we send
-	 * the rest of the exposure time to digital gain. If we were given no
-	 * stages to use then the default stageGain of 1.0 is used so that
-	 * exposure time is maxed before gain is touched at all.
+	 * If no stages could satisfy the desired exposure, then use the last
+	 * stage's exposure time and gain, which is the maximum allowed.
 	 */
-	exposureTime = clampExposureTime(exposure / stageGain, &quantGain);
-	gain = clampGain(exposure / exposureTime, &quantGain2);
+	exposureTime = stageExposureTime;
+	gain = stageGain;
 	quantGain *= quantGain2;
 
 	return { exposureTime, gain, quantGain,