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

ipa: raspberrypi: AWB: Remove unused code

Browse source 
Some more code from pre-libcamera versions is removed. There is no
functional change.

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:
David Plowman 2021-02-25 17:01:40 +00:00 • committed by Kieran Bingham
parent f8a70a8a74
commit b8bd37c6af
2 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ipa/raspberrypi/controller/rpi/awb.cpp
View file

@ -21,8 +21,6 @@ LOG_DEFINE_CATEGORY(RPiAwb)
#define AWB_STATS_SIZE_X DEFAULT_AWB_REGIONS_X #define AWB_STATS_SIZE_X DEFAULT_AWB_REGIONS_X
#define AWB_STATS_SIZE_Y DEFAULT_AWB_REGIONS_Y #define AWB_STATS_SIZE_Y DEFAULT_AWB_REGIONS_Y
const double Awb::RGB::INVALID = -1.0;
// todo - the locking in this algorithm needs some tidying up as has been done // todo - the locking in this algorithm needs some tidying up as has been done
// elsewhere (ALSC and AGC). // elsewhere (ALSC and AGC).
@ -340,7 +338,7 @@ static void generate_stats(std::vector<Awb::RGB> &zones,
double min_G) double min_G)
{ {
for (int i = 0; i < AWB_STATS_SIZE_X * AWB_STATS_SIZE_Y; i++) { for (int i = 0; i < AWB_STATS_SIZE_X * AWB_STATS_SIZE_Y; i++) {
Awb::RGB zone; // this is "invalid", unless R gets overwritten later Awb::RGB zone;
double counted = stats[i].counted; double counted = stats[i].counted;
if (counted >= min_pixels) { if (counted >= min_pixels) {
zone.G = stats[i].g_sum / counted; zone.G = stats[i].g_sum / counted;

7
src/ipa/raspberrypi/controller/rpi/awb.hpp
View file

@ -90,21 +90,16 @@ public:
void Prepare(Metadata *image_metadata) override; void Prepare(Metadata *image_metadata) override;
void Process(StatisticsPtr &stats, Metadata *image_metadata) override; void Process(StatisticsPtr &stats, Metadata *image_metadata) override;
struct RGB { struct RGB {
RGB(double _R = INVALID, double _G = INVALID, RGB(double _R = -1.0, double _G = -1.0, double _B = -1.0)
double _B = INVALID)
: R(_R), G(_G), B(_B) : R(_R), G(_G), B(_B)
{ {
} }
double R, G, B; double R, G, B;
static const double INVALID;
bool Valid() const { return G != INVALID; }
bool Invalid() const { return G == INVALID; }
RGB &operator+=(RGB const &other) RGB &operator+=(RGB const &other)
{ {
R += other.R, G += other.G, B += other.B; R += other.R, G += other.G, B += other.B;
return *this; return *this;
} }
RGB Square() const { return RGB(R * R, G * G, B * B); }
}; };
private: private: