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

ipa: raspberrypi: Generalise the contrast algorithm

Browse source 
Generalise the contrast algorithm code by removing any hard-coded
assumptions about the target hardware platform. Instead, the algorithm
code creates a generic Pwl that gets returned to the IPA, where it gets
converted to the bcm2835 hardware specific lookup table.

As a drive-by, remove an unused mutex.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: David Plowman <david.plowman@raspberrypi.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Naushir Patuck 2023-03-27 13:20:26 +01:00 • committed by Kieran Bingham
parent a82d08973f
commit d8685a579c
4 changed files with 20 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/ipa/raspberrypi/controller/rpi/contrast.cpp
View file

@ -65,34 +65,19 @@ void Contrast::setContrast(double contrast)
contrast_ = contrast;
}
static void fillInStatus(ContrastStatus &status, double brightness,
double contrast, Pwl &gammaCurve)
{
status.brightness = brightness;
status.contrast = contrast;
for (unsigned int i = 0; i < ContrastNumPoints - 1; i++) {
int x = i < 16 ? i * 1024
: (i < 24 ? (i - 16) * 2048 + 16384
: (i - 24) * 4096 + 32768);
status.points[i].x = x;
status.points[i].y = std::min(65535.0, gammaCurve.eval(x));
}
status.points[ContrastNumPoints - 1].x = 65535;
status.points[ContrastNumPoints - 1].y = 65535;
}
void Contrast::initialise()
{
/*
* Fill in some default values as Prepare will run before Process gets
* called.
*/
fillInStatus(status_, brightness_, contrast_, config_.gammaCurve);
status_.brightness = brightness_;
status_.contrast = contrast_;
status_.gammaCurve = config_.gammaCurve;
}
void Contrast::prepare(Metadata *imageMetadata)
{
std::unique_lock<std::mutex> lock(mutex_);
imageMetadata->set("contrast.status", status_);
}
@ -183,12 +168,9 @@ void Contrast::process(StatisticsPtr &stats,
* And fill in the status for output. Use more points towards the bottom
* of the curve.
*/
ContrastStatus status;
fillInStatus(status, brightness_, contrast_, gammaCurve);
{
std::unique_lock<std::mutex> lock(mutex_);
status_ = status;
}
status_.brightness = brightness_;
status_.contrast = contrast_;
status_.gammaCurve = std::move(gammaCurve);
}
/* Register algorithm with the system. */