From b4cbb5c38828de6854117a6cca8dfb65f1b365c4 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Mon, 18 Jul 2022 09:16:02 +0100 Subject: ipa: raspberrypi: Convert existing cameara tuning files to version 2.0 Use the convert_tuning.py script to convert all existing tuning files to version 2.0. Signed-off-by: Naushir Patuck Reviewed-by: Laurent Pinchart Signed-off-by: Laurent Pinchart Tested-by: Naushir Patuck --- src/ipa/raspberrypi/data/uncalibrated.json | 180 +++++++++++++++++------------ 1 file changed, 108 insertions(+), 72 deletions(-) (limited to 'src/ipa/raspberrypi/data/uncalibrated.json') diff --git a/src/ipa/raspberrypi/data/uncalibrated.json b/src/ipa/raspberrypi/data/uncalibrated.json index 16a01e94..13eb3f17 100644 --- a/src/ipa/raspberrypi/data/uncalibrated.json +++ b/src/ipa/raspberrypi/data/uncalibrated.json @@ -1,82 +1,118 @@ { - "rpi.black_level": - { - "black_level": 4096 - }, - "rpi.awb": - { - "use_derivatives": 0, - "bayes": 0 - }, - "rpi.agc": - { - "metering_modes": + "version": 2.0, + "target": "bcm2835", + "algorithms": [ { - "centre-weighted": { - "weights": [4, 4, 4, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0] + "rpi.black_level": + { + "black_level": 4096 + } + }, + { + "rpi.awb": + { + "use_derivatives": 0, + "bayes": 0 } }, - "exposure_modes": { - "normal": + "rpi.agc": { - "shutter": [ 100, 15000, 30000, 60000, 120000 ], - "gain": [ 1.0, 2.0, 3.0, 4.0, 6.0 ] + "metering_modes": + { + "centre-weighted": + { + "weights": [ 4, 4, 4, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ] + } + }, + "exposure_modes": + { + "normal": + { + "shutter": [ 100, 15000, 30000, 60000, 120000 ], + "gain": [ 1.0, 2.0, 3.0, 4.0, 6.0 ] + } + }, + "constraint_modes": + { + "normal": [ + { + "bound": "LOWER", + "q_lo": 0.98, + "q_hi": 1.0, + "y_target": + [ + 0, 0.4, + 1000, 0.4 + ] + } + ] + }, + "y_target": + [ + 0, 0.16, + 1000, 0.165, + 10000, 0.17 + ] } }, - "constraint_modes": { - "normal": - [ - { "bound": "LOWER", "q_lo": 0.98, "q_hi": 1.0, "y_target": [ 0, 0.4, 1000, 0.4 ] } - ] + "rpi.ccm": + { + "ccms": [ + { + "ct": 4000, + "ccm": + [ + 2.0, -1.0, 0.0, + -0.5, 2.0, -0.5, + 0, -1.0, 2.0 + ] + } + ] + } }, - "y_target": [ 0, 0.16, 1000, 0.165, 10000, 0.17 ] - }, - "rpi.ccm": - { - "ccms": - [ - { "ct": 4000, "ccm": [ 2.0, -1.0, 0.0, -0.5, 2.0, -0.5, 0, -1.0, 2.0 ] } - ] - }, - "rpi.contrast": - { - "ce_enable": 0, - "gamma_curve": [ - 0, 0, - 1024, 5040, - 2048, 9338, - 3072, 12356, - 4096, 15312, - 5120, 18051, - 6144, 20790, - 7168, 23193, - 8192, 25744, - 9216, 27942, - 10240, 30035, - 11264, 32005, - 12288, 33975, - 13312, 35815, - 14336, 37600, - 15360, 39168, - 16384, 40642, - 18432, 43379, - 20480, 45749, - 22528, 47753, - 24576, 49621, - 26624, 51253, - 28672, 52698, - 30720, 53796, - 32768, 54876, - 36864, 57012, - 40960, 58656, - 45056, 59954, - 49152, 61183, - 53248, 62355, - 57344, 63419, - 61440, 64476, - 65535, 65535 - ] - } -} + { + "rpi.contrast": + { + "ce_enable": 0, + "gamma_curve": + [ + 0, 0, + 1024, 5040, + 2048, 9338, + 3072, 12356, + 4096, 15312, + 5120, 18051, + 6144, 20790, + 7168, 23193, + 8192, 25744, + 9216, 27942, + 10240, 30035, + 11264, 32005, + 12288, 33975, + 13312, 35815, + 14336, 37600, + 15360, 39168, + 16384, 40642, + 18432, 43379, + 20480, 45749, + 22528, 47753, + 24576, 49621, + 26624, 51253, + 28672, 52698, + 30720, 53796, + 32768, 54876, + 36864, 57012, + 40960, 58656, + 45056, 59954, + 49152, 61183, + 53248, 62355, + 57344, 63419, + 61440, 64476, + 65535, 65535 + ] + } + } + ] +} \ No newline at end of file -- cgit v1.2.1