NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

ipa: ipu3: Change Accumulator structure layout

Browse source 
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>
This commit is contained in:
Jean-Michel Hautbois 2021-09-02 10:22:33 +02:00
parent 25ae4ad89f
commit a90bc0e7b2
2 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/ipa/ipu3/algorithms/awb.cpp
View file

@ -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;
}
}

8
src/ipa/ipu3/algorithms/awb.h
View file

@ -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