Skip to content

Commit 87868c4

Browse files
PineappleBeechPineappleBeech
committed
ipa: rpi: pisp: vc4: Update tuning files for new awb and add model
Update the tuning files to include the new Awb algorithm. It is enabled by renaming disable.rpi.nn.awb to rpi.nn.awb and rpi.awb to disable.rpi.awb. Add a model for the Awb algorithm to use by default. Signed-off-by: Peter Bailey <peter.bailey@raspberrypi.com>
1 parent 7e16bd3 commit 87868c4

23 files changed

+1254
-8
lines changed

‎src/ipa/rpi/pisp/data/awb_model.tflite‎

46.5 KB
Binary file not shown.

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

Lines changed: 64 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,69 @@
195195
"transverse_neg": 0.034
196196
}
197197
},
198+
{
199+
"disable.rpi.nn.awb":
200+
{
201+
"modes":
202+
{
203+
"auto":
204+
{
205+
"lo": 2500,
206+
"hi": 7700
207+
},
208+
"incandescent":
209+
{
210+
"lo": 2500,
211+
"hi": 3000
212+
},
213+
"tungsten":
214+
{
215+
"lo": 3000,
216+
"hi": 3500
217+
},
218+
"fluorescent":
219+
{
220+
"lo": 4000,
221+
"hi": 4700
222+
},
223+
"indoor":
224+
{
225+
"lo": 3000,
226+
"hi": 5000
227+
},
228+
"daylight":
229+
{
230+
"lo": 5500,
231+
"hi": 6500
232+
},
233+
"cloudy":
234+
{
235+
"lo": 7000,
236+
"hi": 8000
237+
}
238+
},
239+
"ct_curve":
240+
[
241+
2860.0, 0.9514, 0.4156,
242+
2960.0, 0.9289, 0.4372,
243+
3603.0, 0.8305, 0.5251,
244+
4650.0, 0.6756, 0.6433,
245+
5858.0, 0.6193, 0.6807,
246+
7580.0, 0.5019, 0.7495
247+
],
248+
"sensitivity_r": 1.0,
249+
"sensitivity_b": 1.0,
250+
"transverse_pos": 0.03392,
251+
"transverse_neg": 0.034,
252+
"ccm":
253+
[
254+
2.2229345364238413, -0.7596721523178808, -0.46326238410596027,
255+
-0.6834893874172185, 2.7118816887417223, -1.02839940397351,
256+
-0.2613746357615894, -0.668015927152318, 1.9293905629139072
257+
],
258+
"enable_nn": 1
259+
}
260+
},
198261
{
199262
"rpi.agc":
200263
{
@@ -1187,6 +1250,6 @@
11871250
"rpi.sync":
11881251
{
11891252
}
1190-
}
1253+
}
11911254
]
11921255
}

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

Lines changed: 63 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,68 @@
194194
"transverse_neg": 0.02154
195195
}
196196
},
197+
{
198+
"disable.rpi.nn.awb":
199+
{
200+
"modes":
201+
{
202+
"auto":
203+
{
204+
"lo": 2500,
205+
"hi": 7700
206+
},
207+
"incandescent":
208+
{
209+
"lo": 2500,
210+
"hi": 3000
211+
},
212+
"tungsten":
213+
{
214+
"lo": 3000,
215+
"hi": 3500
216+
},
217+
"fluorescent":
218+
{
219+
"lo": 4000,
220+
"hi": 4700
221+
},
222+
"indoor":
223+
{
224+
"lo": 3000,
225+
"hi": 5000
226+
},
227+
"daylight":
228+
{
229+
"lo": 5500,
230+
"hi": 6500
231+
},
232+
"cloudy":
233+
{
234+
"lo": 7000,
235+
"hi": 8000
236+
}
237+
},
238+
"ct_curve":
239+
[
240+
2875.0, 0.4699, 0.3209,
241+
3610.0, 0.4089, 0.4265,
242+
4640.0, 0.3281, 0.5417,
243+
5912.0, 0.2992, 0.5771,
244+
7630.0, 0.2285, 0.6524
245+
],
246+
"sensitivity_r": 1.0,
247+
"sensitivity_b": 1.0,
248+
"transverse_pos": 0.01783,
249+
"transverse_neg": 0.02154,
250+
"ccm":
251+
[
252+
2.1073753846153847, -0.8054946153846154, -0.30188076923076923,
253+
-0.43306999999999995, 2.162828076923077, -0.7297680769230768,
254+
-0.126655, -0.5027626923076922, 1.6294176923076922
255+
],
256+
"enable_nn": 1
257+
}
258+
},
197259
{
198260
"rpi.agc":
199261
{
@@ -1194,6 +1256,6 @@
11941256
"rpi.sync":
11951257
{
11961258
}
1197-
}
1259+
}
11981260
]
11991261
}

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

Lines changed: 63 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,68 @@
194194
"transverse_neg": 0.02154
195195
}
196196
},
197+
{
198+
"disable.rpi.nn.awb":
199+
{
200+
"modes":
201+
{
202+
"auto":
203+
{
204+
"lo": 2500,
205+
"hi": 7700
206+
},
207+
"incandescent":
208+
{
209+
"lo": 2500,
210+
"hi": 3000
211+
},
212+
"tungsten":
213+
{
214+
"lo": 3000,
215+
"hi": 3500
216+
},
217+
"fluorescent":
218+
{
219+
"lo": 4000,
220+
"hi": 4700
221+
},
222+
"indoor":
223+
{
224+
"lo": 3000,
225+
"hi": 5000
226+
},
227+
"daylight":
228+
{
229+
"lo": 5500,
230+
"hi": 6500
231+
},
232+
"cloudy":
233+
{
234+
"lo": 7000,
235+
"hi": 8000
236+
}
237+
},
238+
"ct_curve":
239+
[
240+
2875.0, 0.4699, 0.3209,
241+
3610.0, 0.4089, 0.4265,
242+
4640.0, 0.3281, 0.5417,
243+
5912.0, 0.2992, 0.5771,
244+
7630.0, 0.2285, 0.6524
245+
],
246+
"sensitivity_r": 1.0,
247+
"sensitivity_b": 1.0,
248+
"transverse_pos": 0.01783,
249+
"transverse_neg": 0.02154,
250+
"ccm":
251+
[
252+
2.1073753846153847, -0.8054946153846154, -0.30188076923076923,
253+
-0.43306999999999995, 2.162828076923077, -0.7297680769230768,
254+
-0.126655, -0.5027626923076922, 1.6294176923076922
255+
],
256+
"enable_nn": 1
257+
}
258+
},
197259
{
198260
"rpi.agc":
199261
{
@@ -1247,6 +1309,6 @@
12471309
"rpi.sync":
12481310
{
12491311
}
1250-
}
1312+
}
12511313
]
12521314
}

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

Lines changed: 63 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,68 @@
194194
"transverse_neg": 0.02154
195195
}
196196
},
197+
{
198+
"disable.rpi.nn.awb":
199+
{
200+
"modes":
201+
{
202+
"auto":
203+
{
204+
"lo": 2500,
205+
"hi": 7700
206+
},
207+
"incandescent":
208+
{
209+
"lo": 2500,
210+
"hi": 3000
211+
},
212+
"tungsten":
213+
{
214+
"lo": 3000,
215+
"hi": 3500
216+
},
217+
"fluorescent":
218+
{
219+
"lo": 4000,
220+
"hi": 4700
221+
},
222+
"indoor":
223+
{
224+
"lo": 3000,
225+
"hi": 5000
226+
},
227+
"daylight":
228+
{
229+
"lo": 5500,
230+
"hi": 6500
231+
},
232+
"cloudy":
233+
{
234+
"lo": 7000,
235+
"hi": 8000
236+
}
237+
},
238+
"ct_curve":
239+
[
240+
2875.0, 0.4699, 0.3209,
241+
3610.0, 0.4089, 0.4265,
242+
4640.0, 0.3281, 0.5417,
243+
5912.0, 0.2992, 0.5771,
244+
7630.0, 0.2285, 0.6524
245+
],
246+
"sensitivity_r": 1.0,
247+
"sensitivity_b": 1.0,
248+
"transverse_pos": 0.01783,
249+
"transverse_neg": 0.02154,
250+
"ccm":
251+
[
252+
2.1073753846153847, -0.8054946153846154, -0.30188076923076923,
253+
-0.43306999999999995, 2.162828076923077, -0.7297680769230768,
254+
-0.126655, -0.5027626923076922, 1.6294176923076922
255+
],
256+
"enable_nn": 1
257+
}
258+
},
197259
{
198260
"rpi.agc":
199261
{
@@ -1247,6 +1309,6 @@
12471309
"rpi.sync":
12481310
{
12491311
}
1250-
}
1312+
}
12511313
]
12521314
}

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

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,69 @@
195195
"transverse_neg": 0.02255
196196
}
197197
},
198+
{
199+
"disable.rpi.nn.awb":
200+
{
201+
"modes":
202+
{
203+
"auto":
204+
{
205+
"lo": 2500,
206+
"hi": 7700
207+
},
208+
"incandescent":
209+
{
210+
"lo": 2500,
211+
"hi": 3000
212+
},
213+
"tungsten":
214+
{
215+
"lo": 3000,
216+
"hi": 3500
217+
},
218+
"fluorescent":
219+
{
220+
"lo": 4000,
221+
"hi": 4700
222+
},
223+
"indoor":
224+
{
225+
"lo": 3000,
226+
"hi": 5000
227+
},
228+
"daylight":
229+
{
230+
"lo": 5500,
231+
"hi": 6500
232+
},
233+
"cloudy":
234+
{
235+
"lo": 7000,
236+
"hi": 8000
237+
}
238+
},
239+
"ct_curve":
240+
[
241+
2850.0, 0.4307, 0.3957,
242+
2960.0, 0.4159, 0.4313,
243+
3580.0, 0.3771, 0.5176,
244+
4559.0, 0.3031, 0.6573,
245+
5881.0, 0.2809, 0.6942,
246+
7600.0, 0.2263, 0.7762
247+
],
248+
"sensitivity_r": 1.0,
249+
"sensitivity_b": 1.0,
250+
"transverse_pos": 0.02634,
251+
"transverse_neg": 0.02255,
252+
"ccm":
253+
[
254+
2.1643743343419066, -0.972589984871407, -0.19177768532526474,
255+
-0.3769567095310136, 2.0993768608169443, -0.722416815431165,
256+
-0.11786965204236007, -0.4893621633888049, 1.607231815431165
257+
],
258+
"enable_nn": 1
259+
}
260+
},
198261
{
199262
"rpi.agc":
200263
{

0 commit comments

Comments
 (0)