From bd755df7e71ab89a06c0cb9b1247f3ffeee20017 Mon Sep 17 00:00:00 2001 From: Ken Wang Date: Mon, 16 Dec 2024 20:27:56 +0800 Subject: [PATCH 1/2] update ae and ccm configurations Signed-off-by: Ken Wang --- .../imx415_RADXA-CAMERA-4K_DEFAULT.json | 53 ++++++++++++++++--- 1 file changed, 46 insertions(+), 7 deletions(-) diff --git a/rockchip-iqfiles-rk3588/imx415_RADXA-CAMERA-4K_DEFAULT.json b/rockchip-iqfiles-rk3588/imx415_RADXA-CAMERA-4K_DEFAULT.json index 09799b3..a2f9717 100644 --- a/rockchip-iqfiles-rk3588/imx415_RADXA-CAMERA-4K_DEFAULT.json +++ b/rockchip-iqfiles-rk3588/imx415_RADXA-CAMERA-4K_DEFAULT.json @@ -134,7 +134,7 @@ "HistStatsMode": "CAM_HISTV2_MODE_Y", "RawStatsMode": "CAM_RAWSTATSV2_MODE_Y", "YRangeMode": "CAM_YRANGEV2_MODE_FULL", - "AecGridWeight": [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], + "AecGridWeight": [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 3, 3, 4, 3, 3, 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 3, 3, 4, 3, 3, 2, 2, 1, 1, 1, 1, 1, 2, 3, 3, 4, 4, 5, 4, 4, 3, 3, 2, 1, 1, 1, 1, 1, 2, 2, 3, 3, 4, 3, 3, 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 3, 3, 4, 3, 3, 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], "AecManualCtrl": { "LinearAE": { "ManualTimeEn": 1, @@ -221,9 +221,9 @@ "InitHDCIrisTargetValue": 0 }, "Route": { - "TimeDot": [0, 0.03, 0.03, 0.04, 0.04, 0.04], + "TimeDot": [0, 0.01, 0.01, 0.03, 0.03, 0.03], "TimeDot_len": 6, - "GainDot": [1, 1, 4, 8, 8, 850], + "GainDot": [1, 1, 4, 4, 8, 512], "GainDot_len": 6, "IspDGainDot": [1, 1, 1, 1, 1, 1], "IspDGainDot_len": 6, @@ -231,9 +231,9 @@ "PIrisDot_len": 6 }, "DySetpoint": { - "ExpLevel": [0, 0.1, 0.3, 0.5, 0.7, 1], + "ExpLevel": [0, 0.096, 0.192, 0.576, 0.96, 1.344], "ExpLevel_len": 6, - "DySetpoint": [55, 50, 45, 40, 35, 30], + "DySetpoint": [45, 45, 40, 38, 33, 30], "DySetpoint_len": 6 }, "BackLightCtrl": { @@ -245,7 +245,7 @@ "LvLowTh": 0.3125, "LvHighTh": 7.5, "BacklitSetPoint": { - "ExpLevel": [0, 0.1, 0.3, 0.5, 0.7, 1], + "ExpLevel": [0.096, 0.192, 0.384, 0.576, 0.96, 1.344], "ExpLevel_len": 6, "NonOEPdfTh": [0.4, 0.45, 0.55, 0.65, 0.75, 1], "NonOEPdfTh_len": 6, @@ -1027,7 +1027,46 @@ "lumaCCM": { "rgb2y_para": [38, 75, 15], "low_bound_pos_bit": 8, - "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024], + "gain_yalp_curve": [{ + "iso": 50, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 100, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 200, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 400, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 800, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 1600, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 3200, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 6400, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 12800, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 25600, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 51200, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 102400, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 204800, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }], "gain_alphaScale_curve": { "gain": [1, 2, 4, 8, 16, 32, 64, 128, 256], "scale": [1, 1, 1, 1, 1, 1, 1, 1, 1] From 541e567532a021af3a080e320dea8b0addaf98a3 Mon Sep 17 00:00:00 2001 From: Ken Wang Date: Thu, 19 Dec 2024 16:34:55 +0800 Subject: [PATCH 2/2] feat: add ccm gain_yalp_curve Fix darking effect after update rkaiq to 6.8. Signed-off-by: Ken Wang --- .../imx219_RADXA-CAMERA-8M_default.json | 40 +++++++++++++++++++ .../imx219_rpi-camera-v2_default.json | 40 +++++++++++++++++++ .../ov5647_OKDO-5MP_default.json | 40 +++++++++++++++++++ .../ov5647_rpi-camera-v1p3_default.json | 40 +++++++++++++++++++ 4 files changed, 160 insertions(+) diff --git a/rockchip-iqfiles-rk3588/imx219_RADXA-CAMERA-8M_default.json b/rockchip-iqfiles-rk3588/imx219_RADXA-CAMERA-8M_default.json index 0b6a972..1654b9e 100644 --- a/rockchip-iqfiles-rk3588/imx219_RADXA-CAMERA-8M_default.json +++ b/rockchip-iqfiles-rk3588/imx219_RADXA-CAMERA-8M_default.json @@ -991,6 +991,46 @@ "rgb2y_para": [38, 75, 15], "low_bound_pos_bit": 8, "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024], + "gain_yalp_curve": [{ + "iso": 50, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 100, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 200, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 400, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 800, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 1600, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 3200, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 6400, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 12800, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 25600, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 51200, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 102400, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 204800, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }], "gain_alphaScale_curve": { "gain": [1, 2, 4, 8, 16, 32, 64, 128, 256], "scale": [0.95, 0.9, 0.85, 0.85, 0.8, 0.7, 0.7, 0.7, 0.7] diff --git a/rockchip-iqfiles-rk3588/imx219_rpi-camera-v2_default.json b/rockchip-iqfiles-rk3588/imx219_rpi-camera-v2_default.json index 0b6a972..1654b9e 100644 --- a/rockchip-iqfiles-rk3588/imx219_rpi-camera-v2_default.json +++ b/rockchip-iqfiles-rk3588/imx219_rpi-camera-v2_default.json @@ -991,6 +991,46 @@ "rgb2y_para": [38, 75, 15], "low_bound_pos_bit": 8, "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024], + "gain_yalp_curve": [{ + "iso": 50, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 100, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 200, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 400, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 800, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 1600, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 3200, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 6400, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 12800, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 25600, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 51200, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 102400, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 204800, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }], "gain_alphaScale_curve": { "gain": [1, 2, 4, 8, 16, 32, 64, 128, 256], "scale": [0.95, 0.9, 0.85, 0.85, 0.8, 0.7, 0.7, 0.7, 0.7] diff --git a/rockchip-iqfiles-rk3588/ov5647_OKDO-5MP_default.json b/rockchip-iqfiles-rk3588/ov5647_OKDO-5MP_default.json index b935fd3..3ff7458 100644 --- a/rockchip-iqfiles-rk3588/ov5647_OKDO-5MP_default.json +++ b/rockchip-iqfiles-rk3588/ov5647_OKDO-5MP_default.json @@ -904,6 +904,46 @@ "rgb2y_para": [38, 75, 15], "low_bound_pos_bit": 8, "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024], + "gain_yalp_curve": [{ + "iso": 50, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 100, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 200, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 400, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 800, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 1600, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 3200, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 6400, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 12800, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 25600, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 51200, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 102400, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 204800, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }], "gain_alphaScale_curve": { "gain": [1, 2, 4, 8, 16, 32, 64, 128, 256], "scale": [0.92, 0.9, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8] diff --git a/rockchip-iqfiles-rk3588/ov5647_rpi-camera-v1p3_default.json b/rockchip-iqfiles-rk3588/ov5647_rpi-camera-v1p3_default.json index b935fd3..3ff7458 100644 --- a/rockchip-iqfiles-rk3588/ov5647_rpi-camera-v1p3_default.json +++ b/rockchip-iqfiles-rk3588/ov5647_rpi-camera-v1p3_default.json @@ -904,6 +904,46 @@ "rgb2y_para": [38, 75, 15], "low_bound_pos_bit": 8, "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024], + "gain_yalp_curve": [{ + "iso": 50, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 100, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 200, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 400, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 800, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 1600, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 3200, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 6400, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 12800, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 25600, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 51200, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 102400, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }, { + "iso": 204800, + "y_alpha_curve": [0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024] + }], "gain_alphaScale_curve": { "gain": [1, 2, 4, 8, 16, 32, 64, 128, 256], "scale": [0.92, 0.9, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8]