summaryrefslogtreecommitdiff
path: root/src/ipa/ipu3/algorithms/awb.cpp
diff options
context:
space:
mode:
authorJean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>2021-09-02 10:22:33 +0200
committerJean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>2021-10-06 15:27:22 +0200
commita90bc0e7b24516379fa18831d3fe9fb88f30bd4e (patch)
tree1718b4c4db382e96ee8bfa320aa522a3767ae523 /src/ipa/ipu3/algorithms/awb.cpp
parent25ae4ad89f5aa071bf371ef50f8b2d295d48bcab (diff)
ipa: ipu3: Change Accumulator structure layout
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>
Diffstat (limited to 'src/ipa/ipu3/algorithms/awb.cpp')
-rw-r--r--src/ipa/ipu3/algorithms/awb.cpp27
1 files changed, 15 insertions, 12 deletions
diff --git a/src/ipa/ipu3/algorithms/awb.cpp b/src/ipa/ipu3/algorithms/awb.cpp
index 964d6995..c1a303e2 100644
--- a/src/ipa/ipu3/algorithms/awb.cpp
+++ b/src/ipa/ipu3/algorithms/awb.cpp
@@ -76,13 +76,16 @@ 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
+ * \brief A structure containing the average red, green and blue sums
+ *
+ * \var Accumulator::sum.red
* \brief Sum of the average red values of each unsaturated cell in the zone
*
- * \var Accumulator::gSum
+ * \var Accumulator::sum.green
* \brief Sum of the average green values of each unsaturated cell in the zone
*
- * \var Accumulator::bSum
+ * \var Accumulator::sum.blue
* \brief Sum of the average blue values of each unsaturated cell in the zone
*/
@@ -207,10 +210,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);
}
}
@@ -243,9 +246,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;
}
}
}
@@ -254,9 +257,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;
}
}