ipa: rkisp1: Move ov4689 and ov5640 black levels into sensor helpers

Move black levels for tuning files that contained a BLC block into
the camera sensor helpers.

ov4689.yaml had 66@12bit while the datasheet states 64@12bit. Use the
value from the datasheet (scaled to 16bit).

ov5640.yaml had 256@12bit while the datasheet states 16@10bit. Looking
at the commit message the 256 most likely stems from the imx219 tuning
file and 16@10bit is the same as the 64@12bit from the ov4689. This
seems more likely and is therefore used.

Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Stefan Klug 2024-07-03 15:49:54 +02:00
parent 27e4d3fc3a
commit 196abb8d1d
3 changed files with 4 additions and 8 deletions

View file

@ -553,6 +553,8 @@ class CameraSensorHelperOv4689 : public CameraSensorHelper
public: public:
CameraSensorHelperOv4689() CameraSensorHelperOv4689()
{ {
/* From datasheet: 0x40 at 12bits. */
blackLevel_ = 1024;
gainType_ = AnalogueGainLinear; gainType_ = AnalogueGainLinear;
gainConstants_.linear = { 1, 0, 0, 128 }; gainConstants_.linear = { 1, 0, 0, 128 };
} }
@ -564,6 +566,8 @@ class CameraSensorHelperOv5640 : public CameraSensorHelper
public: public:
CameraSensorHelperOv5640() CameraSensorHelperOv5640()
{ {
/* From datasheet: 0x10 at 10bits. */
blackLevel_ = 1024;
gainType_ = AnalogueGainLinear; gainType_ = AnalogueGainLinear;
gainConstants_.linear = { 1, 0, 0, 16 }; gainConstants_.linear = { 1, 0, 0, 16 };
} }

View file

@ -6,8 +6,4 @@ algorithms:
- Agc: - Agc:
- Awb: - Awb:
- BlackLevelCorrection: - BlackLevelCorrection:
R: 66
Gr: 66
Gb: 66
B: 66
... ...

View file

@ -6,10 +6,6 @@ algorithms:
- Agc: - Agc:
- Awb: - Awb:
- BlackLevelCorrection: - BlackLevelCorrection:
R: 256
Gr: 256
Gb: 256
B: 256
- ColorProcessing: - ColorProcessing:
- GammaSensorLinearization: - GammaSensorLinearization:
x-intervals: [ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 ] x-intervals: [ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 ]