ipa: raspberrypi: Use the generic statistics structure in the algorithms

Repurpose the StatisticsPtr type from being a shared_ptr<bcm2835_isp_stats> to
shared_ptr<RPiController::Statistics>. This removes any hardware specific header
files and structures from the algorithms source code.

Add a new function in the Raspberry Pi IPA to populate the generic statistics
structure from the values provided by the hardware in the bcm2835_isp_stats
structure.

Update the Lux, AWB, AGC, ALSC, Contrast, and Focus algorithms to use the
generic statistics structure appropriately in their calculations. Additionally,
remove references to any hardware specific headers and defines in these source
files.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: David Plowman <david.plowman@raspberrypi.com>
Tested-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

1 files changed, 7 insertions, 1 deletions

diff --git a/src/ipa/raspberrypi/controller/rpi/af.h b/src/ipa/raspberrypi/controller/rpi/af.h
index f7baf897..7959371b 100644
--- a/src/ipa/raspberrypi/controller/rpi/af.h
+++ b/src/ipa/raspberrypi/controller/rpi/af.h
@@ -12,6 +12,12 @@
 #include "../pwl.h"
 
 /*
+ * \todo FOCUS_REGIONS is taken from bcm2835-isp.h, but should be made as a
+ * generic RegionStats structure.
+ */
+#define FOCUS_REGIONS 12
+
+/*
  * This algorithm implements a hybrid of CDAF and PDAF, favouring PDAF.
  *
  * Whenever PDAF is available, it is used in a continuous feedback loop.
@@ -117,7 +123,7 @@ private:
 
 	void computeWeights();
 	bool getPhase(PdafData const &data, double &phase, double &conf) const;
-	double getContrast(struct bcm2835_isp_stats_focus const focus_stats[FOCUS_REGIONS]) const;
+	double getContrast(const FocusRegions &focusStats) const;
 	void doPDAF(double phase, double conf);
 	bool earlyTerminationByPhase(double phase);
 	double findPeak(unsigned index) const;