[libcamera-devel,v6,3/5] ipa: ipu3: Change Accumulator structure layout

13791 diff mbox series

The pixel component sums for the Accumulator are inconsistent with other
similar structures such as the IPAFrameContext::awb::gains. Group the
red, green, and blue sums together in a struct and store them as
uint64_t to reduce potential architectural differences.

Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 src/ipa/ipu3/algorithms/awb.cpp | 24 ++++++++++++------------
 src/ipa/ipu3/algorithms/awb.h   |  8 +++++---
 2 files changed, 17 insertions(+), 15 deletions(-)

Hi Jean-Michel,

Thank you for the patch.

On Thu, Sep 09, 2021 at 03:54:47PM +0200, Jean-Michel Hautbois wrote:
> The pixel component sums for the Accumulator are inconsistent with other
> similar structures such as the IPAFrameContext::awb::gains. Group the
> red, green, and blue sums together in a struct and store them as
> uint64_t to reduce potential architectural differences.
> 
> Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  src/ipa/ipu3/algorithms/awb.cpp | 24 ++++++++++++------------
>  src/ipa/ipu3/algorithms/awb.h   |  8 +++++---
>  2 files changed, 17 insertions(+), 15 deletions(-)
> 
> diff --git a/src/ipa/ipu3/algorithms/awb.cpp b/src/ipa/ipu3/algorithms/awb.cpp
> index 9b22c783..6bf114ac 100644
> --- a/src/ipa/ipu3/algorithms/awb.cpp
> +++ b/src/ipa/ipu3/algorithms/awb.cpp
> @@ -77,13 +77,13 @@ static constexpr uint32_t kMinGreenLevelInZone = 32;
>   * \var Accumulator::counted
>   * \brief Number of unsaturated cells used to calculate the sums
>   *
> - * \var Accumulator::rSum
> + * \var Accumulator::sum::red
>   * \brief Sum of the average red values of each cell in the zone
>   *
> - * \var Accumulator::gSum
> + * \var Accumulator::sum::green
>   * \brief Sum of the average green values of each cell in the zone
>   *
> - * \var Accumulator::bSum
> + * \var Accumulator::sum::blue
>   * \brief Sum of the average blue values of each cell in the zone
>   */
>  
> @@ -208,10 +208,10 @@ void Awb::generateZones(std::vector<RGB> &zones)
>  		RGB zone;
>  		double counted = awbStats_[i].counted;
>  		if (counted >= kMinZonesCounted) {
> -			zone.G = awbStats_[i].gSum / counted;
> +			zone.G = awbStats_[i].sum.green / counted;
>  			if (zone.G >= kMinGreenLevelInZone) {
> -				zone.R = awbStats_[i].rSum / counted;
> -				zone.B = awbStats_[i].bSum / counted;
> +				zone.R = awbStats_[i].sum.red / counted;
> +				zone.B = awbStats_[i].sum.blue / counted;
>  				zones.push_back(zone);
>  			}
>  		}
> @@ -244,9 +244,9 @@ void Awb::generateAwbStats(const ipu3_uapi_stats_3a *stats,
>  				/* The cell is not saturated, use the current cell */
>  				awbStats_[awbRegionPosition].counted++;
>  				uint32_t greenValue = currentCell->greenRedAvg + currentCell->greenBlueAvg;
> -				awbStats_[awbRegionPosition].gSum += greenValue / 2;
> -				awbStats_[awbRegionPosition].rSum += currentCell->redAvg;
> -				awbStats_[awbRegionPosition].bSum += currentCell->blueAvg;
> +				awbStats_[awbRegionPosition].sum.green += greenValue / 2;
> +				awbStats_[awbRegionPosition].sum.red += currentCell->redAvg;
> +				awbStats_[awbRegionPosition].sum.blue += currentCell->blueAvg;
>  			}
>  		}
>  	}
> @@ -255,9 +255,9 @@ void Awb::generateAwbStats(const ipu3_uapi_stats_3a *stats,
>  void Awb::clearAwbStats()
>  {
>  	for (unsigned int i = 0; i < kAwbStatsSizeX * kAwbStatsSizeY; i++) {
> -		awbStats_[i].bSum = 0;
> -		awbStats_[i].rSum = 0;
> -		awbStats_[i].gSum = 0;
> +		awbStats_[i].sum.blue = 0;
> +		awbStats_[i].sum.red = 0;
> +		awbStats_[i].sum.green = 0;
>  		awbStats_[i].counted = 0;
>  	}
>  }
> diff --git a/src/ipa/ipu3/algorithms/awb.h b/src/ipa/ipu3/algorithms/awb.h
> index ac8ccc84..3385ebe7 100644
> --- a/src/ipa/ipu3/algorithms/awb.h
> +++ b/src/ipa/ipu3/algorithms/awb.h
> @@ -35,9 +35,11 @@ struct Ipu3AwbCell {
>  
>  struct Accumulator {
>  	unsigned int counted;
> -	unsigned long long rSum;
> -	unsigned long long gSum;
> -	unsigned long long bSum;
> +	struct {
> +		uint64_t red;
> +		uint64_t green;
> +		uint64_t blue;
> +	} sum;
>  };
>  
>  class Awb : public Algorithm