ipa: raspberrypi: AWB: Ignore invalid statistics zones correctly
Regions of the image where the statistics are not trusted should not be put in the zones_ list. This also means that the AWB may fail to run initially, so async_results_ needs to be initialised to some kind of default. Finally, the RGB zone structures can be zero-initialised safely now, the previous value of -1 would seem unusual. Signed-off-by: David Plowman <david.plowman@raspberrypi.com> Reviewed-by: Naushir Patuck <naush@raspberrypi.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
parent
b8bd37c6af
commit
cc22d2206d
2 changed files with 3 additions and 2 deletions
|
@ -169,6 +169,7 @@ void Awb::Initialise()
|
|||
sync_results_.gain_b = 1.0;
|
||||
}
|
||||
prev_sync_results_ = sync_results_;
|
||||
async_results_ = sync_results_;
|
||||
}
|
||||
|
||||
unsigned int Awb::GetConvergenceFrames() const
|
||||
|
@ -345,11 +346,11 @@ static void generate_stats(std::vector<Awb::RGB> &zones,
|
|||
if (zone.G >= min_G) {
|
||||
zone.R = stats[i].r_sum / counted;
|
||||
zone.B = stats[i].b_sum / counted;
|
||||
}
|
||||
}
|
||||
zones.push_back(zone);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Awb::prepareStats()
|
||||
{
|
||||
|
|
|
@ -90,7 +90,7 @@ public:
|
|||
void Prepare(Metadata *image_metadata) override;
|
||||
void Process(StatisticsPtr &stats, Metadata *image_metadata) override;
|
||||
struct RGB {
|
||||
RGB(double _R = -1.0, double _G = -1.0, double _B = -1.0)
|
||||
RGB(double _R = 0, double _G = 0, double _B = 0)
|
||||
: R(_R), G(_G), B(_B)
|
||||
{
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue