summaryrefslogtreecommitdiff
path: root/src/ipa/ipu3
diff options
context:
space:
mode:
authorJean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>2021-08-23 08:25:26 +0200
committerJean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>2021-10-06 15:59:40 +0200
commit03132d0ff9aaaa709b9db21c0e272ea8f51f3a7d (patch)
tree5e070e12b150f13f56ad74bad15caa5f5c591b72 /src/ipa/ipu3
parent3a240e56a8d266846548f9d9b3c70da3ee9533c9 (diff)
ipa: ipu3: awb: Correct the gain multipliers
The gains have a precision u3.13, range [0, 8[ which means that a gain multiplier value of 1.0 is represented as a multiplication by 8192 in the ImgU. Correct the gains as this was misunderstood in the first place. 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>
Diffstat (limited to 'src/ipa/ipu3')
-rw-r--r--src/ipa/ipu3/algorithms/awb.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/ipa/ipu3/algorithms/awb.cpp b/src/ipa/ipu3/algorithms/awb.cpp
index 1c294f31..2d875d0b 100644
--- a/src/ipa/ipu3/algorithms/awb.cpp
+++ b/src/ipa/ipu3/algorithms/awb.cpp
@@ -317,6 +317,7 @@ void Awb::awbGreyWorld()
/* Color temperature is not relevant in Grey world but still useful to estimate it :-) */
asyncResults_.temperatureK = estimateCCT(sumRed.R, sumRed.G, sumBlue.B);
asyncResults_.redGain = redGain;
+ /* Hardcode the green gain to 1.0. */
asyncResults_.greenGain = 1.0;
asyncResults_.blueGain = blueGain;
}
@@ -380,15 +381,11 @@ void Awb::prepare(IPAContext &context, ipu3_uapi_params *params)
* params->acc_param.bnr.opt_center.x_reset;
params->acc_param.bnr.opt_center_sqr.y_sqr_reset = params->acc_param.bnr.opt_center.y_reset
* params->acc_param.bnr.opt_center.y_reset;
- /*
- * Green gains should not be touched and considered 1.
- * Default is 16, so do not change it at all.
- * 4096 is the value for a gain of 1.0
- */
- params->acc_param.bnr.wb_gains.gr = 16 * context.frameContext.awb.gains.green;
- params->acc_param.bnr.wb_gains.r = 4096 * context.frameContext.awb.gains.red;
- params->acc_param.bnr.wb_gains.b = 4096 * context.frameContext.awb.gains.blue;
- params->acc_param.bnr.wb_gains.gb = 16 * context.frameContext.awb.gains.green;
+ /* Convert to u3.13 fixed point values */
+ params->acc_param.bnr.wb_gains.gr = 8192 * context.frameContext.awb.gains.green;
+ params->acc_param.bnr.wb_gains.r = 8192 * context.frameContext.awb.gains.red;
+ params->acc_param.bnr.wb_gains.b = 8192 * context.frameContext.awb.gains.blue;
+ params->acc_param.bnr.wb_gains.gb = 8192 * context.frameContext.awb.gains.green;
LOG(IPU3Awb, Debug) << "Color temperature estimated: " << asyncResults_.temperatureK;