ipa: raspberrypi: Switch the AGC/Lux code to use utils::Duration

Convert the core AGC and Lux controller code to use
utils::Duration for all exposure time related variables and
calculations.

Convert the exposure/shutter time fields in AgcStatus and DeviceStatus
to use utils::Duration.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: David Plowman <david.plowman@raspberrypi.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

1 files changed, 16 insertions, 12 deletions

diff --git a/src/ipa/raspberrypi/controller/rpi/agc.hpp b/src/ipa/raspberrypi/controller/rpi/agc.hpp
index b52aaa23..75078948 100644
--- a/src/ipa/raspberrypi/controller/rpi/agc.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/agc.hpp
@@ -9,6 +9,8 @@
 #include <vector>
 #include <mutex>
 
+#include "libcamera/internal/utils.h"
+
 #include "../agc_algorithm.hpp"
 #include "../agc_status.h"
 #include "../pwl.hpp"
@@ -22,13 +24,15 @@
 
 namespace RPiController {
 
+using namespace std::literals::chrono_literals;
+
 struct AgcMeteringMode {
 	double weights[AGC_STATS_SIZE];
 	void Read(boost::property_tree::ptree const &params);
 };
 
 struct AgcExposureMode {
-	std::vector<double> shutter;
+	std::vector<libcamera::utils::Duration> shutter;
 	std::vector<double> gain;
 	void Read(boost::property_tree::ptree const &params);
 };
@@ -61,7 +65,7 @@ struct AgcConfig {
 	std::string default_exposure_mode;
 	std::string default_constraint_mode;
 	double base_ev;
-	double default_exposure_time;
+	libcamera::utils::Duration default_exposure_time;
 	double default_analogue_gain;
 };
 
@@ -101,19 +105,19 @@ private:
 	void filterExposure(bool desaturate);
 	void divideUpExposure();
 	void writeAndFinish(Metadata *image_metadata, bool desaturate);
-	double clipShutter(double shutter);
+	libcamera::utils::Duration clipShutter(libcamera::utils::Duration shutter);
 	AgcMeteringMode *metering_mode_;
 	AgcExposureMode *exposure_mode_;
 	AgcConstraintMode *constraint_mode_;
 	uint64_t frame_count_;
 	AwbStatus awb_;
 	struct ExposureValues {
-		ExposureValues() : shutter(0), analogue_gain(0),
-				   total_exposure(0), total_exposure_no_dg(0) {}
-		double shutter;
+		ExposureValues() : shutter(0s), analogue_gain(0),
+				   total_exposure(0s), total_exposure_no_dg(0s) {}
+		libcamera::utils::Duration shutter;
 		double analogue_gain;
-		double total_exposure;
-		double total_exposure_no_dg; // without digital gain
+		libcamera::utils::Duration total_exposure;
+		libcamera::utils::Duration total_exposure_no_dg; // without digital gain
 	};
 	ExposureValues current_;  // values for the current frame
 	ExposureValues target_;   // calculate the values we want here
@@ -121,15 +125,15 @@ private:
 	AgcStatus status_;
 	int lock_count_;
 	DeviceStatus last_device_status_;
-	double last_target_exposure_;
+	libcamera::utils::Duration last_target_exposure_;
 	// Below here the "settings" that applications can change.
 	std::string metering_mode_name_;
 	std::string exposure_mode_name_;
 	std::string constraint_mode_name_;
 	double ev_;
-	double flicker_period_;
-	double max_shutter_;
-	double fixed_shutter_;
+	libcamera::utils::Duration flicker_period_;
+	libcamera::utils::Duration max_shutter_;
+	libcamera::utils::Duration fixed_shutter_;
 	double fixed_analogue_gain_;
 };