1 files changed, 33 insertions, 17 deletions

diff --git a/src/ipa/raspberrypi/controller/rpi/agc.hpp b/src/ipa/raspberrypi/controller/rpi/agc.hpp
index ba7ae092..85067dc6 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/base/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);
 };
@@ -52,6 +56,7 @@ struct AgcConfig {
 	Pwl Y_target;
 	double speed;
 	uint16_t startup_frames;
+	unsigned int convergence_frames;
 	double max_change;
 	double min_change;
 	double fast_reduce_threshold;
@@ -60,6 +65,8 @@ struct AgcConfig {
 	std::string default_exposure_mode;
 	std::string default_constraint_mode;
 	double base_ev;
+	libcamera::utils::Duration default_exposure_time;
+	double default_analogue_gain;
 };
 
 class Agc : public AgcAlgorithm
@@ -68,9 +75,15 @@ public:
 	Agc(Controller *controller);
 	char const *Name() const override;
 	void Read(boost::property_tree::ptree const &params) override;
+	// AGC handles "pausing" for itself.
+	bool IsPaused() const override;
+	void Pause() override;
+	void Resume() override;
+	unsigned int GetConvergenceFrames() const override;
 	void SetEv(double ev) override;
-	void SetFlickerPeriod(double flicker_period) override;
-	void SetFixedShutter(double fixed_shutter) override; // microseconds
+	void SetFlickerPeriod(libcamera::utils::Duration flicker_period) override;
+	void SetMaxShutter(libcamera::utils::Duration max_shutter) override;
+	void SetFixedShutter(libcamera::utils::Duration fixed_shutter) override;
 	void SetFixedAnalogueGain(double fixed_analogue_gain) override;
 	void SetMeteringMode(std::string const &metering_mode_name) override;
 	void SetExposureMode(std::string const &exposure_mode_name) override;
@@ -80,44 +93,47 @@ public:
 	void Process(StatisticsPtr &stats, Metadata *image_metadata) override;
 
 private:
+	void updateLockStatus(DeviceStatus const &device_status);
 	AgcConfig config_;
 	void housekeepConfig();
 	void fetchCurrentExposure(Metadata *image_metadata);
+	void fetchAwbStatus(Metadata *image_metadata);
 	void computeGain(bcm2835_isp_stats *statistics, Metadata *image_metadata,
 			 double &gain, double &target_Y);
 	void computeTargetExposure(double gain);
-	bool applyDigitalGain(Metadata *image_metadata, double gain,
-			      double target_Y);
+	bool applyDigitalGain(double gain, double target_Y);
 	void filterExposure(bool desaturate);
-	void divvyupExposure();
+	void divideUpExposure();
 	void writeAndFinish(Metadata *image_metadata, bool desaturate);
+	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
 	ExposureValues filtered_; // these values are filtered towards target
-	AgcStatus status_;        // to "latch" settings so they can't change
-	AgcStatus output_status_; // the status we will write out
-	std::mutex output_mutex_;
+	AgcStatus status_;
 	int lock_count_;
+	DeviceStatus last_device_status_;
+	libcamera::utils::Duration last_target_exposure_;
 	// Below here the "settings" that applications can change.
-	std::mutex settings_mutex_;
 	std::string metering_mode_name_;
 	std::string exposure_mode_name_;
 	std::string constraint_mode_name_;
 	double ev_;
-	double flicker_period_;
-	double fixed_shutter_;
+	libcamera::utils::Duration flicker_period_;
+	libcamera::utils::Duration max_shutter_;
+	libcamera::utils::Duration fixed_shutter_;
 	double fixed_analogue_gain_;
 };