Skip to content

Commit 06d67e8

Browse files
njhollinghurstnjhollinghurst
committed
ipa: rpi: Update IMX708 camera tuning files for AutoFocus changes
Explicitly add new parameters: "retrigger_ratio", "retrigger_delay", "check_for_ir". Tweak other parameters to suit algorithm changes. (Though existing tuning files should still work acceptably.) Add AfSpeedFast parameters for the Raspberry Pi V3 standard lens. Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
1 parent 310bf3f commit 06d67e8

File tree

8 files changed

+124
-36
lines changed

8 files changed

+124
-36
lines changed

‎src/ipa/rpi/pisp/data/imx708.json

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,18 +1139,35 @@
11391139
"step_coarse": 1.0,
11401140
"step_fine": 0.25,
11411141
"contrast_ratio": 0.75,
1142-
"pdaf_gain": -0.02,
1142+
"retrigger_ratio": 0.75,
1143+
"retrigger_delay": 10,
1144+
"pdaf_gain": -0.018,
11431145
"pdaf_squelch": 0.125,
1144-
"max_slew": 2.0,
1146+
"max_slew": 1.5,
11451147
"pdaf_frames": 20,
11461148
"dropout_frames": 6,
1149+
"step_frames": 5
1150+
},
1151+
"fast":
1152+
{
1153+
"step_coarse": 1.0,
1154+
"step_fine": 0.0,
1155+
"contrast_ratio": 0.75,
1156+
"retrigger_ratio": 0.75,
1157+
"retrigger_delay": 8,
1158+
"pdaf_gain": -0.02,
1159+
"pdaf_squelch": 0.125,
1160+
"max_slew": 2.0,
1161+
"pdaf_frames": 16,
1162+
"dropout_frames": 4,
11471163
"step_frames": 4
11481164
}
11491165
},
11501166
"conf_epsilon": 8,
11511167
"conf_thresh": 16,
11521168
"conf_clip": 512,
11531169
"skip_frames": 5,
1170+
"check_for_ir": false,
11541171
"map": [ 0.0, 445, 15.0, 925 ]
11551172
}
11561173
},
@@ -1272,4 +1289,4 @@
12721289
}
12731290
}
12741291
]
1275-
}
1292+
}

‎src/ipa/rpi/pisp/data/imx708_noir.json

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1156,18 +1156,35 @@
11561156
"step_coarse": 1.0,
11571157
"step_fine": 0.25,
11581158
"contrast_ratio": 0.75,
1159-
"pdaf_gain": -0.02,
1159+
"retrigger_ratio": 0.75,
1160+
"retrigger_delay": 10,
1161+
"pdaf_gain": -0.018,
11601162
"pdaf_squelch": 0.125,
1161-
"max_slew": 2.0,
1163+
"max_slew": 1.5,
11621164
"pdaf_frames": 20,
11631165
"dropout_frames": 6,
1166+
"step_frames": 5
1167+
},
1168+
"fast":
1169+
{
1170+
"step_coarse": 1.0,
1171+
"step_fine": 0.0,
1172+
"contrast_ratio": 0.75,
1173+
"retrigger_ratio": 0.75,
1174+
"retrigger_delay": 8,
1175+
"pdaf_gain": -0.02,
1176+
"pdaf_squelch": 0.125,
1177+
"max_slew": 2.0,
1178+
"pdaf_frames": 16,
1179+
"dropout_frames": 4,
11641180
"step_frames": 4
11651181
}
11661182
},
11671183
"conf_epsilon": 8,
11681184
"conf_thresh": 16,
11691185
"conf_clip": 512,
11701186
"skip_frames": 5,
1187+
"check_for_ir": true,
11711188
"map": [ 0.0, 445, 15.0, 925 ]
11721189
}
11731190
},
@@ -1235,4 +1252,4 @@
12351252
}
12361253
}
12371254
]
1238-
}
1255+
}

‎src/ipa/rpi/pisp/data/imx708_wide.json

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1148,30 +1148,35 @@
11481148
"step_coarse": 2.0,
11491149
"step_fine": 0.5,
11501150
"contrast_ratio": 0.75,
1151+
"retrigger_ratio" : 0.75,
1152+
"retrigger_delay" : 10,
11511153
"pdaf_gain": -0.03,
11521154
"pdaf_squelch": 0.2,
1153-
"max_slew": 4.0,
1155+
"max_slew": 3.0,
11541156
"pdaf_frames": 20,
11551157
"dropout_frames": 6,
1156-
"step_frames": 4
1158+
"step_frames": 5
11571159
},
11581160
"fast":
11591161
{
11601162
"step_coarse": 2.0,
1161-
"step_fine": 0.5,
1163+
"step_fine": 0.0,
11621164
"contrast_ratio": 0.75,
1165+
"retrigger_ratio" : 0.75,
1166+
"retrigger_delay" : 8,
11631167
"pdaf_gain": -0.05,
11641168
"pdaf_squelch": 0.2,
1165-
"max_slew": 5.0,
1169+
"max_slew": 4.0,
11661170
"pdaf_frames": 16,
1167-
"dropout_frames": 6,
1171+
"dropout_frames": 4,
11681172
"step_frames": 4
11691173
}
11701174
},
11711175
"conf_epsilon": 8,
11721176
"conf_thresh": 12,
11731177
"conf_clip": 512,
11741178
"skip_frames": 5,
1179+
"check_for_ir": false,
11751180
"map": [ 0.0, 420, 35.0, 920 ]
11761181
}
11771182
},
@@ -1295,4 +1300,4 @@
12951300
}
12961301
}
12971302
]
1298-
}
1303+
}

‎src/ipa/rpi/pisp/data/imx708_wide_noir.json

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1057,30 +1057,35 @@
10571057
"step_coarse": 2.0,
10581058
"step_fine": 0.5,
10591059
"contrast_ratio": 0.75,
1060+
"retrigger_ratio" : 0.75,
1061+
"retrigger_delay" : 10,
10601062
"pdaf_gain": -0.03,
10611063
"pdaf_squelch": 0.2,
1062-
"max_slew": 4.0,
1064+
"max_slew": 3.0,
10631065
"pdaf_frames": 20,
10641066
"dropout_frames": 6,
1065-
"step_frames": 4
1067+
"step_frames": 5
10661068
},
10671069
"fast":
10681070
{
10691071
"step_coarse": 2.0,
1070-
"step_fine": 0.5,
1072+
"step_fine": 0.0,
10711073
"contrast_ratio": 0.75,
1074+
"retrigger_ratio" : 0.75,
1075+
"retrigger_delay" : 8,
10721076
"pdaf_gain": -0.05,
10731077
"pdaf_squelch": 0.2,
1074-
"max_slew": 5.0,
1078+
"max_slew": 4.0,
10751079
"pdaf_frames": 16,
1076-
"dropout_frames": 6,
1080+
"dropout_frames": 4,
10771081
"step_frames": 4
10781082
}
10791083
},
10801084
"conf_epsilon": 8,
10811085
"conf_thresh": 12,
10821086
"conf_clip": 512,
10831087
"skip_frames": 5,
1088+
"check_for_ir": true,
10841089
"map": [ 0.0, 420, 35.0, 920 ]
10851090
}
10861091
},
@@ -1150,4 +1155,4 @@
11501155
}
11511156
}
11521157
]
1153-
}
1158+
}

‎src/ipa/rpi/vc4/data/imx708.json

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -638,18 +638,35 @@
638638
"step_coarse": 1.0,
639639
"step_fine": 0.25,
640640
"contrast_ratio": 0.75,
641-
"pdaf_gain": -0.02,
641+
"retrigger_ratio": 0.75,
642+
"retrigger_delay": 10,
643+
"pdaf_gain": -0.018,
642644
"pdaf_squelch": 0.125,
643-
"max_slew": 2.0,
645+
"max_slew": 1.5,
644646
"pdaf_frames": 20,
645647
"dropout_frames": 6,
648+
"step_frames": 5
649+
},
650+
"fast":
651+
{
652+
"step_coarse": 1.0,
653+
"step_fine": 0.0,
654+
"contrast_ratio": 0.75,
655+
"retrigger_ratio": 0.75,
656+
"retrigger_delay": 8,
657+
"pdaf_gain": -0.02,
658+
"pdaf_squelch": 0.125,
659+
"max_slew": 2.0,
660+
"pdaf_frames": 16,
661+
"dropout_frames": 4,
646662
"step_frames": 4
647663
}
648664
},
649665
"conf_epsilon": 8,
650666
"conf_thresh": 16,
651667
"conf_clip": 512,
652668
"skip_frames": 5,
669+
"check_for_ir": false,
653670
"map": [ 0.0, 445, 15.0, 925 ]
654671
}
655672
},
@@ -673,4 +690,4 @@
673690
}
674691
}
675692
]
676-
}
693+
}

‎src/ipa/rpi/vc4/data/imx708_noir.json

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -737,18 +737,35 @@
737737
"step_coarse": 1.0,
738738
"step_fine": 0.25,
739739
"contrast_ratio": 0.75,
740-
"pdaf_gain": -0.02,
740+
"retrigger_ratio": 0.75,
741+
"retrigger_delay": 10,
742+
"pdaf_gain": -0.018,
741743
"pdaf_squelch": 0.125,
742-
"max_slew": 2.0,
744+
"max_slew": 1.5,
743745
"pdaf_frames": 20,
744746
"dropout_frames": 6,
747+
"step_frames": 5
748+
},
749+
"fast":
750+
{
751+
"step_coarse": 1.0,
752+
"step_fine": 0.0,
753+
"contrast_ratio": 0.75,
754+
"retrigger_ratio": 0.75,
755+
"retrigger_delay": 8,
756+
"pdaf_gain": -0.02,
757+
"pdaf_squelch": 0.125,
758+
"max_slew": 2.0,
759+
"pdaf_frames": 16,
760+
"dropout_frames": 4,
745761
"step_frames": 4
746762
}
747763
},
748764
"conf_epsilon": 8,
749765
"conf_thresh": 16,
750766
"conf_clip": 512,
751767
"skip_frames": 5,
768+
"check_for_ir": true,
752769
"map": [ 0.0, 445, 15.0, 925 ]
753770
}
754771
},
@@ -772,4 +789,4 @@
772789
}
773790
}
774791
]
775-
}
792+
}

‎src/ipa/rpi/vc4/data/imx708_wide.json

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -637,30 +637,35 @@
637637
"step_coarse": 2.0,
638638
"step_fine": 0.5,
639639
"contrast_ratio": 0.75,
640+
"retrigger_ratio": 0.75,
641+
"retrigger_delay": 10,
640642
"pdaf_gain": -0.03,
641643
"pdaf_squelch": 0.2,
642-
"max_slew": 4.0,
644+
"max_slew": 3.0,
643645
"pdaf_frames": 20,
644646
"dropout_frames": 6,
645-
"step_frames": 4
647+
"step_frames": 5
646648
},
647649
"fast":
648650
{
649651
"step_coarse": 2.0,
650-
"step_fine": 0.5,
652+
"step_fine": 0.0,
651653
"contrast_ratio": 0.75,
654+
"retrigger_ratio": 0.75,
655+
"retrigger_delay": 8,
652656
"pdaf_gain": -0.05,
653657
"pdaf_squelch": 0.2,
654-
"max_slew": 5.0,
658+
"max_slew": 4.0,
655659
"pdaf_frames": 16,
656-
"dropout_frames": 6,
660+
"dropout_frames": 4,
657661
"step_frames": 4
658662
}
659663
},
660664
"conf_epsilon": 8,
661665
"conf_thresh": 12,
662666
"conf_clip": 512,
663667
"skip_frames": 5,
668+
"check_for_ir": false,
664669
"map": [ 0.0, 420, 35.0, 920 ]
665670
}
666671
},
@@ -684,4 +689,4 @@
684689
}
685690
}
686691
]
687-
}
692+
}

‎src/ipa/rpi/vc4/data/imx708_wide_noir.json

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -628,30 +628,35 @@
628628
"step_coarse": 2.0,
629629
"step_fine": 0.5,
630630
"contrast_ratio": 0.75,
631+
"retrigger_ratio": 0.75,
632+
"retrigger_delay": 10,
631633
"pdaf_gain": -0.03,
632634
"pdaf_squelch": 0.2,
633-
"max_slew": 4.0,
635+
"max_slew": 3.0,
634636
"pdaf_frames": 20,
635637
"dropout_frames": 6,
636-
"step_frames": 4
638+
"step_frames": 5
637639
},
638640
"fast":
639641
{
640642
"step_coarse": 2.0,
641-
"step_fine": 0.5,
643+
"step_fine": 0.0,
642644
"contrast_ratio": 0.75,
645+
"retrigger_ratio": 0.75,
646+
"retrigger_delay": 8,
643647
"pdaf_gain": -0.05,
644648
"pdaf_squelch": 0.2,
645-
"max_slew": 5.0,
649+
"max_slew": 4.0,
646650
"pdaf_frames": 16,
647-
"dropout_frames": 6,
651+
"dropout_frames": 4,
648652
"step_frames": 4
649653
}
650654
},
651655
"conf_epsilon": 8,
652656
"conf_thresh": 12,
653657
"conf_clip": 512,
654658
"skip_frames": 5,
659+
"check_for_ir": true,
655660
"map": [ 0.0, 420, 35.0, 920 ]
656661
}
657662
},
@@ -675,4 +680,4 @@
675680
}
676681
}
677682
]
678-
}
683+
}

0 commit comments

Comments
 (0)