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

15
src/ipa/raspberrypi/raspberrypi.cpp
View file

@ -1593,14 +1593,21 @@ void IPARPi::applyCCM(const struct CcmStatus *ccmStatus, ControlList &ctrls)
void IPARPi::applyGamma(const struct ContrastStatus *contrastStatus, ControlList &ctrls)
{
const unsigned int numGammaPoints = controller_.getHardwareConfig().numGammaPoints;
struct bcm2835_isp_gamma gamma;
gamma.enabled = 1;
for (unsigned int i = 0; i < ContrastNumPoints; i++) {
gamma.x[i] = contrastStatus->points[i].x;
gamma.y[i] = contrastStatus->points[i].y;
for (unsigned int i = 0; i < numGammaPoints - 1; i++) {
int x = i < 16 ? i * 1024
: (i < 24 ? (i - 16) * 2048 + 16384
: (i - 24) * 4096 + 32768);
gamma.x[i] = x;
gamma.y[i] = std::min<uint16_t>(65535, contrastStatus->gammaCurve.eval(x));
}
gamma.x[numGammaPoints - 1] = 65535;
gamma.y[numGammaPoints - 1] = 65535;
gamma.enabled = 1;
ControlValue c(Span<const uint8_t>{ reinterpret_cast<uint8_t *>(&gamma),
sizeof(gamma) });
ctrls.set(V4L2_CID_USER_BCM2835_ISP_GAMMA, c);