ipa: rpi: vc4: data: Update tuning files for HDR

All the Raspberry Pi official camera tuning files are updated for
HDR. As stated previously, there is no mechanism in the hardware for
combining images so all this does is enable multi-channel AGC to
produce short and long exposure frames. It will be up to the
application to deal with them.

The changes are identical in every tuning file.

1. The existing AGC tuning is duplicated twice so that we have 3 AGC
channels.

2. The first is left alone (the default AGC channel), the second is
tweaked to under-expose significantly (ev -3) and the final one is
tweaked to over-exposure slightly (ev +0.5)

3. Control parameters are provided to the "rpi.hdr" algorithm to
associate these AGC channels correctly with the HDR modes.

Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
Acked-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
David Plowman 2024-01-09 10:25:47 +00:00 committed by Kieran Bingham
parent 7ba0053ede
commit d8a17149cb
9 changed files with 2524 additions and 776 deletions

View file

@ -131,95 +131,282 @@
{ {
"rpi.agc": "rpi.agc":
{ {
"metering_modes": "channels":
{ [
"centre-weighted": {
{ "metering_modes":
"weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ] {
}, "centre-weighted":
"spot": {
{ "weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]
"weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ] },
}, "spot":
"matrix": {
{ "weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
"weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ] },
} "matrix":
}, {
"exposure_modes": "weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
{ }
"normal": },
{ "exposure_modes":
"shutter": [ 100, 10000, 30000, 60000, 66666 ], {
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ] "normal":
}, {
"short": "shutter": [ 100, 10000, 30000, 60000, 66666 ],
{ "gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
"shutter": [ 100, 5000, 10000, 20000, 33333 ], },
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ] "short":
}, {
"long": "shutter": [ 100, 5000, 10000, 20000, 33333 ],
{ "gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
"shutter": [ 100, 10000, 30000, 60000, 120000 ], },
"gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ] "long":
} {
}, "shutter": [ 100, 10000, 30000, 60000, 120000 ],
"constraint_modes": "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
{ }
"normal": [ },
{ "constraint_modes":
"bound": "LOWER", {
"q_lo": 0.98, "normal": [
"q_hi": 1.0, {
"y_target": "bound": "LOWER",
[ "q_lo": 0.98,
0, 0.5, "q_hi": 1.0,
1000, 0.5 "y_target":
] [
} 0, 0.5,
], 1000, 0.5
"highlight": [ ]
{ }
"bound": "LOWER", ],
"q_lo": 0.98, "highlight": [
"q_hi": 1.0, {
"y_target": "bound": "LOWER",
[ "q_lo": 0.98,
0, 0.5, "q_hi": 1.0,
1000, 0.5 "y_target":
] [
}, 0, 0.5,
{ 1000, 0.5
"bound": "UPPER", ]
"q_lo": 0.98, },
"q_hi": 1.0, {
"y_target": "bound": "UPPER",
[ "q_lo": 0.98,
0, 0.8, "q_hi": 1.0,
1000, 0.8 "y_target":
] [
} 0, 0.8,
], 1000, 0.8
"shadows": [ ]
{ }
"bound": "LOWER", ],
"q_lo": 0.0, "shadows": [
"q_hi": 0.5, {
"y_target": "bound": "LOWER",
[ "q_lo": 0.0,
0, 0.17, "q_hi": 0.5,
1000, 0.17 "y_target":
] [
} 0, 0.17,
] 1000, 0.17
}, ]
"y_target": }
[ ]
0, 0.16, },
1000, 0.165, "y_target":
10000, 0.17 [
] 0, 0.16,
} 1000, 0.165,
10000, 0.17
]
},
{
"base_ev": 0.125,
"metering_modes":
{
"centre-weighted":
{
"weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]
},
"spot":
{
"weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
},
"matrix":
{
"weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
}
},
"exposure_modes":
{
"normal":
{
"shutter": [ 100, 10000, 30000, 60000, 66666 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
},
"short":
{
"shutter": [ 100, 5000, 10000, 20000, 33333 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
},
"long":
{
"shutter": [ 100, 10000, 30000, 60000, 120000 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
}
},
"constraint_modes":
{
"normal": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.5,
1000, 0.5
]
}
],
"highlight": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.5,
1000, 0.5
]
},
{
"bound": "UPPER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.8,
1000, 0.8
]
}
],
"shadows": [
{
"bound": "LOWER",
"q_lo": 0.0,
"q_hi": 0.5,
"y_target":
[
0, 0.17,
1000, 0.17
]
}
]
},
"y_target":
[
0, 0.16,
1000, 0.165,
10000, 0.17
]
},
{
"base_ev": 1.5,
"metering_modes":
{
"centre-weighted":
{
"weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]
},
"spot":
{
"weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
},
"matrix":
{
"weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
}
},
"exposure_modes":
{
"normal":
{
"shutter": [ 100, 10000, 30000, 60000, 66666 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
},
"short":
{
"shutter": [ 100, 5000, 10000, 20000, 33333 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
},
"long":
{
"shutter": [ 100, 10000, 30000, 60000, 120000 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
}
},
"constraint_modes":
{
"normal": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.5,
1000, 0.5
]
}
],
"highlight": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.5,
1000, 0.5
]
},
{
"bound": "UPPER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.8,
1000, 0.8
]
}
],
"shadows": [
{
"bound": "LOWER",
"q_lo": 0.0,
"q_hi": 0.5,
"y_target":
[
0, 0.17,
1000, 0.17
]
}
]
},
"y_target":
[
0, 0.16,
1000, 0.165,
10000, 0.17
]
}
]
}
}, },
{ {
"rpi.alsc": "rpi.alsc":
@ -463,6 +650,21 @@
}, },
{ {
"rpi.sharpen": { } "rpi.sharpen": { }
} },
{
"rpi.hdr":
{
"MultiExposure":
{
"cadence": [ 1, 2 ],
"channel_map": { "short": 1, "long": 2 }
},
"SingleExposure":
{
"cadence": [ 1 ],
"channel_map": { "short": 1 }
}
}
}
] ]
} }

View file

@ -47,95 +47,282 @@
{ {
"rpi.agc": "rpi.agc":
{ {
"metering_modes": "channels":
{ [
"centre-weighted": {
{ "metering_modes":
"weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ] {
}, "centre-weighted":
"spot": {
{ "weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]
"weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ] },
}, "spot":
"matrix": {
{ "weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
"weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ] },
} "matrix":
}, {
"exposure_modes": "weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
{ }
"normal": },
{ "exposure_modes":
"shutter": [ 100, 10000, 30000, 60000, 66666 ], {
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ] "normal":
}, {
"short": "shutter": [ 100, 10000, 30000, 60000, 66666 ],
{ "gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
"shutter": [ 100, 5000, 10000, 20000, 33333 ], },
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ] "short":
}, {
"long": "shutter": [ 100, 5000, 10000, 20000, 33333 ],
{ "gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
"shutter": [ 100, 10000, 30000, 60000, 120000 ], },
"gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ] "long":
} {
}, "shutter": [ 100, 10000, 30000, 60000, 120000 ],
"constraint_modes": "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
{ }
"normal": [ },
{ "constraint_modes":
"bound": "LOWER", {
"q_lo": 0.98, "normal": [
"q_hi": 1.0, {
"y_target": "bound": "LOWER",
[ "q_lo": 0.98,
0, 0.5, "q_hi": 1.0,
1000, 0.5 "y_target":
] [
} 0, 0.5,
], 1000, 0.5
"highlight": [ ]
{ }
"bound": "LOWER", ],
"q_lo": 0.98, "highlight": [
"q_hi": 1.0, {
"y_target": "bound": "LOWER",
[ "q_lo": 0.98,
0, 0.5, "q_hi": 1.0,
1000, 0.5 "y_target":
] [
}, 0, 0.5,
{ 1000, 0.5
"bound": "UPPER", ]
"q_lo": 0.98, },
"q_hi": 1.0, {
"y_target": "bound": "UPPER",
[ "q_lo": 0.98,
0, 0.8, "q_hi": 1.0,
1000, 0.8 "y_target":
] [
} 0, 0.8,
], 1000, 0.8
"shadows": [ ]
{ }
"bound": "LOWER", ],
"q_lo": 0.0, "shadows": [
"q_hi": 0.5, {
"y_target": "bound": "LOWER",
[ "q_lo": 0.0,
0, 0.17, "q_hi": 0.5,
1000, 0.17 "y_target":
] [
} 0, 0.17,
] 1000, 0.17
}, ]
"y_target": }
[ ]
0, 0.16, },
1000, 0.165, "y_target":
10000, 0.17 [
] 0, 0.16,
} 1000, 0.165,
10000, 0.17
]
},
{
"base_ev": 0.125,
"metering_modes":
{
"centre-weighted":
{
"weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]
},
"spot":
{
"weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
},
"matrix":
{
"weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
}
},
"exposure_modes":
{
"normal":
{
"shutter": [ 100, 10000, 30000, 60000, 66666 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
},
"short":
{
"shutter": [ 100, 5000, 10000, 20000, 33333 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
},
"long":
{
"shutter": [ 100, 10000, 30000, 60000, 120000 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
}
},
"constraint_modes":
{
"normal": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.5,
1000, 0.5
]
}
],
"highlight": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.5,
1000, 0.5
]
},
{
"bound": "UPPER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.8,
1000, 0.8
]
}
],
"shadows": [
{
"bound": "LOWER",
"q_lo": 0.0,
"q_hi": 0.5,
"y_target":
[
0, 0.17,
1000, 0.17
]
}
]
},
"y_target":
[
0, 0.16,
1000, 0.165,
10000, 0.17
]
},
{
"base_ev": 1.5,
"metering_modes":
{
"centre-weighted":
{
"weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]
},
"spot":
{
"weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
},
"matrix":
{
"weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
}
},
"exposure_modes":
{
"normal":
{
"shutter": [ 100, 10000, 30000, 60000, 66666 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
},
"short":
{
"shutter": [ 100, 5000, 10000, 20000, 33333 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
},
"long":
{
"shutter": [ 100, 10000, 30000, 60000, 120000 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
}
},
"constraint_modes":
{
"normal": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.5,
1000, 0.5
]
}
],
"highlight": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.5,
1000, 0.5
]
},
{
"bound": "UPPER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.8,
1000, 0.8
]
}
],
"shadows": [
{
"bound": "LOWER",
"q_lo": 0.0,
"q_hi": 0.5,
"y_target":
[
0, 0.17,
1000, 0.17
]
}
]
},
"y_target":
[
0, 0.16,
1000, 0.165,
10000, 0.17
]
}
]
}
}, },
{ {
"rpi.alsc": "rpi.alsc":
@ -397,6 +584,21 @@
}, },
{ {
"rpi.sharpen": { } "rpi.sharpen": { }
} },
{
"rpi.hdr":
{
"MultiExposure":
{
"cadence": [ 1, 2 ],
"channel_map": { "short": 1, "long": 2 }
},
"SingleExposure":
{
"cadence": [ 1 ],
"channel_map": { "short": 1 }
}
}
}
] ]
} }

View file

@ -136,95 +136,282 @@
{ {
"rpi.agc": "rpi.agc":
{ {
"metering_modes": "channels":
{ [
"centre-weighted":
{ {
"weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ] "metering_modes":
}, {
"spot": "centre-weighted":
{
"weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]
},
"spot":
{
"weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
},
"matrix":
{
"weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
}
},
"exposure_modes":
{
"normal":
{
"shutter": [ 100, 10000, 30000, 60000, 66666 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
},
"short":
{
"shutter": [ 100, 5000, 10000, 20000, 33333 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
},
"long":
{
"shutter": [ 100, 10000, 30000, 60000, 120000 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
}
},
"constraint_modes":
{
"normal": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.3,
1000, 0.3
]
}
],
"highlight": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.3,
1000, 0.3
]
},
{
"bound": "UPPER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.8,
1000, 0.8
]
}
],
"shadows": [
{
"bound": "LOWER",
"q_lo": 0.0,
"q_hi": 0.5,
"y_target":
[
0, 0.17,
1000, 0.17
]
}
]
},
"y_target":
[
0, 0.16,
1000, 0.165,
10000, 0.17
]
},
{ {
"weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ] "base_ev": 0.125,
}, "metering_modes":
"matrix": {
"centre-weighted":
{
"weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]
},
"spot":
{
"weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
},
"matrix":
{
"weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
}
},
"exposure_modes":
{
"normal":
{
"shutter": [ 100, 10000, 30000, 60000, 66666 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
},
"short":
{
"shutter": [ 100, 5000, 10000, 20000, 33333 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
},
"long":
{
"shutter": [ 100, 10000, 30000, 60000, 120000 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
}
},
"constraint_modes":
{
"normal": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.3,
1000, 0.3
]
}
],
"highlight": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.3,
1000, 0.3
]
},
{
"bound": "UPPER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.8,
1000, 0.8
]
}
],
"shadows": [
{
"bound": "LOWER",
"q_lo": 0.0,
"q_hi": 0.5,
"y_target":
[
0, 0.17,
1000, 0.17
]
}
]
},
"y_target":
[
0, 0.16,
1000, 0.165,
10000, 0.17
]
},
{ {
"weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ] "base_ev": 1.5,
} "metering_modes":
}, {
"exposure_modes": "centre-weighted":
{ {
"normal": "weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]
{ },
"shutter": [ 100, 10000, 30000, 60000, 66666 ], "spot":
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ] {
}, "weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
"short": },
{ "matrix":
"shutter": [ 100, 5000, 10000, 20000, 33333 ], {
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ] "weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
}, }
"long": },
{ "exposure_modes":
"shutter": [ 100, 10000, 30000, 60000, 120000 ], {
"gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ] "normal":
} {
}, "shutter": [ 100, 10000, 30000, 60000, 66666 ],
"constraint_modes": "gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
{ },
"normal": [ "short":
{ {
"bound": "LOWER", "shutter": [ 100, 5000, 10000, 20000, 33333 ],
"q_lo": 0.98, "gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
"q_hi": 1.0, },
"y_target": "long":
[ {
0, 0.3, "shutter": [ 100, 10000, 30000, 60000, 120000 ],
1000, 0.3 "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
] }
} },
], "constraint_modes":
"highlight": [ {
{ "normal": [
"bound": "LOWER", {
"q_lo": 0.98, "bound": "LOWER",
"q_hi": 1.0, "q_lo": 0.98,
"y_target": "q_hi": 1.0,
[ "y_target":
0, 0.3, [
1000, 0.3 0, 0.3,
] 1000, 0.3
}, ]
{ }
"bound": "UPPER", ],
"q_lo": 0.98, "highlight": [
"q_hi": 1.0, {
"y_target": "bound": "LOWER",
[ "q_lo": 0.98,
0, 0.8, "q_hi": 1.0,
1000, 0.8 "y_target":
] [
} 0, 0.3,
], 1000, 0.3
"shadows": [ ]
{ },
"bound": "LOWER", {
"q_lo": 0.0, "bound": "UPPER",
"q_hi": 0.5, "q_lo": 0.98,
"y_target": "q_hi": 1.0,
[ "y_target":
0, 0.17, [
1000, 0.17 0, 0.8,
] 1000, 0.8
} ]
] }
}, ],
"y_target": "shadows": [
[ {
0, 0.16, "bound": "LOWER",
1000, 0.165, "q_lo": 0.0,
10000, 0.17 "q_hi": 0.5,
] "y_target":
} [
0, 0.17,
1000, 0.17
]
}
]
},
"y_target":
[
0, 0.16,
1000, 0.165,
10000, 0.17
]
}
]
}
}, },
{ {
"rpi.alsc": "rpi.alsc":
@ -468,6 +655,21 @@
}, },
{ {
"rpi.sharpen": { } "rpi.sharpen": { }
} },
{
"rpi.hdr":
{
"MultiExposure":
{
"cadence": [ 1, 2 ],
"channel_map": { "short": 1, "long": 2 }
},
"SingleExposure":
{
"cadence": [ 1 ],
"channel_map": { "short": 1 }
}
}
}
] ]
} }

View file

@ -47,95 +47,282 @@
{ {
"rpi.agc": "rpi.agc":
{ {
"metering_modes": "channels":
{ [
"centre-weighted": {
{ "metering_modes":
"weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ] {
}, "centre-weighted":
"spot": {
{ "weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]
"weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ] },
}, "spot":
"matrix": {
{ "weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
"weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ] },
} "matrix":
}, {
"exposure_modes": "weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
{ }
"normal": },
{ "exposure_modes":
"shutter": [ 100, 10000, 30000, 60000, 66666 ], {
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ] "normal":
}, {
"short": "shutter": [ 100, 10000, 30000, 60000, 66666 ],
{ "gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
"shutter": [ 100, 5000, 10000, 20000, 33333 ], },
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ] "short":
}, {
"long": "shutter": [ 100, 5000, 10000, 20000, 33333 ],
{ "gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
"shutter": [ 100, 10000, 30000, 60000, 120000 ], },
"gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ] "long":
} {
}, "shutter": [ 100, 10000, 30000, 60000, 120000 ],
"constraint_modes": "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
{ }
"normal": [ },
{ "constraint_modes":
"bound": "LOWER", {
"q_lo": 0.98, "normal": [
"q_hi": 1.0, {
"y_target": "bound": "LOWER",
[ "q_lo": 0.98,
0, 0.3, "q_hi": 1.0,
1000, 0.3 "y_target":
] [
} 0, 0.3,
], 1000, 0.3
"highlight": [ ]
{ }
"bound": "LOWER", ],
"q_lo": 0.98, "highlight": [
"q_hi": 1.0, {
"y_target": "bound": "LOWER",
[ "q_lo": 0.98,
0, 0.3, "q_hi": 1.0,
1000, 0.3 "y_target":
] [
}, 0, 0.3,
{ 1000, 0.3
"bound": "UPPER", ]
"q_lo": 0.98, },
"q_hi": 1.0, {
"y_target": "bound": "UPPER",
[ "q_lo": 0.98,
0, 0.8, "q_hi": 1.0,
1000, 0.8 "y_target":
] [
} 0, 0.8,
], 1000, 0.8
"shadows": [ ]
{ }
"bound": "LOWER", ],
"q_lo": 0.0, "shadows": [
"q_hi": 0.5, {
"y_target": "bound": "LOWER",
[ "q_lo": 0.0,
0, 0.17, "q_hi": 0.5,
1000, 0.17 "y_target":
] [
} 0, 0.17,
] 1000, 0.17
}, ]
"y_target": }
[ ]
0, 0.16, },
1000, 0.165, "y_target":
10000, 0.17 [
] 0, 0.16,
} 1000, 0.165,
10000, 0.17
]
},
{
"base_ev": 0.125,
"metering_modes":
{
"centre-weighted":
{
"weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]
},
"spot":
{
"weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
},
"matrix":
{
"weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
}
},
"exposure_modes":
{
"normal":
{
"shutter": [ 100, 10000, 30000, 60000, 66666 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
},
"short":
{
"shutter": [ 100, 5000, 10000, 20000, 33333 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
},
"long":
{
"shutter": [ 100, 10000, 30000, 60000, 120000 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
}
},
"constraint_modes":
{
"normal": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.3,
1000, 0.3
]
}
],
"highlight": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.3,
1000, 0.3
]
},
{
"bound": "UPPER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.8,
1000, 0.8
]
}
],
"shadows": [
{
"bound": "LOWER",
"q_lo": 0.0,
"q_hi": 0.5,
"y_target":
[
0, 0.17,
1000, 0.17
]
}
]
},
"y_target":
[
0, 0.16,
1000, 0.165,
10000, 0.17
]
},
{
"base_ev": 1.5,
"metering_modes":
{
"centre-weighted":
{
"weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]
},
"spot":
{
"weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
},
"matrix":
{
"weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
}
},
"exposure_modes":
{
"normal":
{
"shutter": [ 100, 10000, 30000, 60000, 66666 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
},
"short":
{
"shutter": [ 100, 5000, 10000, 20000, 33333 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
},
"long":
{
"shutter": [ 100, 10000, 30000, 60000, 120000 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
}
},
"constraint_modes":
{
"normal": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.3,
1000, 0.3
]
}
],
"highlight": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.3,
1000, 0.3
]
},
{
"bound": "UPPER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.8,
1000, 0.8
]
}
],
"shadows": [
{
"bound": "LOWER",
"q_lo": 0.0,
"q_hi": 0.5,
"y_target":
[
0, 0.17,
1000, 0.17
]
}
]
},
"y_target":
[
0, 0.16,
1000, 0.165,
10000, 0.17
]
}
]
}
}, },
{ {
"rpi.alsc": "rpi.alsc":
@ -424,6 +611,21 @@
}, },
{ {
"rpi.sharpen": { } "rpi.sharpen": { }
} },
{
"rpi.hdr":
{
"MultiExposure":
{
"cadence": [ 1, 2 ],
"channel_map": { "short": 1, "long": 2 }
},
"SingleExposure":
{
"cadence": [ 1 ],
"channel_map": { "short": 1 }
}
}
}
] ]
} }

View file

@ -139,86 +139,255 @@
{ {
"rpi.agc": "rpi.agc":
{ {
"metering_modes": "channels":
{ [
"centre-weighted": {
{ "metering_modes":
"weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ] {
}, "centre-weighted":
"spot": {
{ "weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]
"weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ] },
}, "spot":
"matrix": {
{ "weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
"weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ] },
} "matrix":
}, {
"exposure_modes": "weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
{ }
"normal": },
{ "exposure_modes":
"shutter": [ 100, 15000, 30000, 60000, 120000 ], {
"gain": [ 1.0, 1.0, 2.0, 4.0, 6.0 ] "normal":
}, {
"short": "shutter": [ 100, 15000, 30000, 60000, 120000 ],
{ "gain": [ 1.0, 1.0, 2.0, 4.0, 6.0 ]
"shutter": [ 100, 5000, 10000, 20000, 120000 ], },
"gain": [ 1.0, 2.0, 4.0, 6.0, 6.0 ] "short":
}, {
"long": "shutter": [ 100, 5000, 10000, 20000, 120000 ],
{ "gain": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]
"shutter": [ 1000, 30000, 60000, 90000, 120000 ], },
"gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ] "long":
} {
}, "shutter": [ 1000, 30000, 60000, 90000, 120000 ],
"constraint_modes": "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
{ }
"normal": [ },
{ "constraint_modes":
"bound": "LOWER", {
"q_lo": 0.98, "normal": [
"q_hi": 1.0, {
"y_target": "bound": "LOWER",
[ "q_lo": 0.98,
0, 0.2, "q_hi": 1.0,
1000, 0.2 "y_target":
] [
} 0, 0.2,
], 1000, 0.2
"highlight": [ ]
{ }
"bound": "LOWER", ],
"q_lo": 0.98, "highlight": [
"q_hi": 1.0, {
"y_target": "bound": "LOWER",
[ "q_lo": 0.98,
0, 0.2, "q_hi": 1.0,
1000, 0.2 "y_target":
] [
}, 0, 0.2,
{ 1000, 0.2
"bound": "UPPER", ]
"q_lo": 0.98, },
"q_hi": 1.0, {
"y_target": "bound": "UPPER",
[ "q_lo": 0.98,
0, 0.8, "q_hi": 1.0,
1000, 0.8 "y_target":
] [
} 0, 0.8,
] 1000, 0.8
}, ]
"y_target": }
[ ]
0, 0.16, },
1000, 0.165, "y_target":
10000, 0.17 [
], 0, 0.16,
"startup_frames": 5, 1000, 0.165,
"convergence_frames": 6, 10000, 0.17
"speed": 0.15 ],
} "startup_frames": 5,
"convergence_frames": 6,
"speed": 0.15
},
{
"base_ev": 0.125,
"metering_modes":
{
"centre-weighted":
{
"weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]
},
"spot":
{
"weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
},
"matrix":
{
"weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
}
},
"exposure_modes":
{
"normal":
{
"shutter": [ 100, 15000, 30000, 60000, 120000 ],
"gain": [ 1.0, 1.0, 2.0, 4.0, 6.0 ]
},
"short":
{
"shutter": [ 100, 5000, 10000, 20000, 120000 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]
},
"long":
{
"shutter": [ 1000, 30000, 60000, 90000, 120000 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
}
},
"constraint_modes":
{
"normal": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.2,
1000, 0.2
]
}
],
"highlight": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.2,
1000, 0.2
]
},
{
"bound": "UPPER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.8,
1000, 0.8
]
}
]
},
"y_target":
[
0, 0.16,
1000, 0.165,
10000, 0.17
],
"startup_frames": 5,
"convergence_frames": 6,
"speed": 0.15
},
{
"base_ev": 1.5,
"metering_modes":
{
"centre-weighted":
{
"weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]
},
"spot":
{
"weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
},
"matrix":
{
"weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
}
},
"exposure_modes":
{
"normal":
{
"shutter": [ 100, 15000, 30000, 60000, 120000 ],
"gain": [ 1.0, 1.0, 2.0, 4.0, 6.0 ]
},
"short":
{
"shutter": [ 100, 5000, 10000, 20000, 120000 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]
},
"long":
{
"shutter": [ 1000, 30000, 60000, 90000, 120000 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
}
},
"constraint_modes":
{
"normal": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.2,
1000, 0.2
]
}
],
"highlight": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.2,
1000, 0.2
]
},
{
"bound": "UPPER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.8,
1000, 0.8
]
}
]
},
"y_target":
[
0, 0.16,
1000, 0.165,
10000, 0.17
],
"startup_frames": 5,
"convergence_frames": 6,
"speed": 0.15
}
]
}
}, },
{ {
"rpi.alsc": "rpi.alsc":
@ -457,6 +626,21 @@
"skip_frames": 5, "skip_frames": 5,
"map": [ 0.0, 445, 15.0, 925 ] "map": [ 0.0, 445, 15.0, 925 ]
} }
} },
{
"rpi.hdr":
{
"MultiExposure":
{
"cadence": [ 1, 2 ],
"channel_map": { "short": 1, "long": 2 }
},
"SingleExposure":
{
"cadence": [ 1 ],
"channel_map": { "short": 1 }
}
}
}
] ]
} }

View file

@ -139,86 +139,255 @@
{ {
"rpi.agc": "rpi.agc":
{ {
"metering_modes": "channels":
{ [
"centre-weighted": {
{ "metering_modes":
"weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ] {
}, "centre-weighted":
"spot": {
{ "weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]
"weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ] },
}, "spot":
"matrix": {
{ "weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
"weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ] },
} "matrix":
}, {
"exposure_modes": "weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
{ }
"normal": },
{ "exposure_modes":
"shutter": [ 100, 15000, 30000, 60000, 120000 ], {
"gain": [ 1.0, 1.0, 2.0, 4.0, 6.0 ] "normal":
}, {
"short": "shutter": [ 100, 15000, 30000, 60000, 120000 ],
{ "gain": [ 1.0, 1.0, 2.0, 4.0, 6.0 ]
"shutter": [ 100, 5000, 10000, 20000, 120000 ], },
"gain": [ 1.0, 2.0, 4.0, 6.0, 6.0 ] "short":
}, {
"long": "shutter": [ 100, 5000, 10000, 20000, 120000 ],
{ "gain": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]
"shutter": [ 1000, 30000, 60000, 90000, 120000 ], },
"gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ] "long":
} {
}, "shutter": [ 1000, 30000, 60000, 90000, 120000 ],
"constraint_modes": "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
{ }
"normal": [ },
{ "constraint_modes":
"bound": "LOWER", {
"q_lo": 0.98, "normal": [
"q_hi": 1.0, {
"y_target": "bound": "LOWER",
[ "q_lo": 0.98,
0, 0.2, "q_hi": 1.0,
1000, 0.2 "y_target":
] [
} 0, 0.2,
], 1000, 0.2
"highlight": [ ]
{ }
"bound": "LOWER", ],
"q_lo": 0.98, "highlight": [
"q_hi": 1.0, {
"y_target": "bound": "LOWER",
[ "q_lo": 0.98,
0, 0.2, "q_hi": 1.0,
1000, 0.2 "y_target":
] [
}, 0, 0.2,
{ 1000, 0.2
"bound": "UPPER", ]
"q_lo": 0.98, },
"q_hi": 1.0, {
"y_target": "bound": "UPPER",
[ "q_lo": 0.98,
0, 0.8, "q_hi": 1.0,
1000, 0.8 "y_target":
] [
} 0, 0.8,
] 1000, 0.8
}, ]
"y_target": }
[ ]
0, 0.16, },
1000, 0.165, "y_target":
10000, 0.17 [
], 0, 0.16,
"startup_frames": 5, 1000, 0.165,
"convergence_frames": 6, 10000, 0.17
"speed": 0.15 ],
} "startup_frames": 5,
"convergence_frames": 6,
"speed": 0.15
},
{
"base_ev": 0.125,
"metering_modes":
{
"centre-weighted":
{
"weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]
},
"spot":
{
"weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
},
"matrix":
{
"weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
}
},
"exposure_modes":
{
"normal":
{
"shutter": [ 100, 15000, 30000, 60000, 120000 ],
"gain": [ 1.0, 1.0, 2.0, 4.0, 6.0 ]
},
"short":
{
"shutter": [ 100, 5000, 10000, 20000, 120000 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]
},
"long":
{
"shutter": [ 1000, 30000, 60000, 90000, 120000 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
}
},
"constraint_modes":
{
"normal": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.2,
1000, 0.2
]
}
],
"highlight": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.2,
1000, 0.2
]
},
{
"bound": "UPPER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.8,
1000, 0.8
]
}
]
},
"y_target":
[
0, 0.16,
1000, 0.165,
10000, 0.17
],
"startup_frames": 5,
"convergence_frames": 6,
"speed": 0.15
},
{
"base_ev": 1.5,
"metering_modes":
{
"centre-weighted":
{
"weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]
},
"spot":
{
"weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
},
"matrix":
{
"weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
}
},
"exposure_modes":
{
"normal":
{
"shutter": [ 100, 15000, 30000, 60000, 120000 ],
"gain": [ 1.0, 1.0, 2.0, 4.0, 6.0 ]
},
"short":
{
"shutter": [ 100, 5000, 10000, 20000, 120000 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]
},
"long":
{
"shutter": [ 1000, 30000, 60000, 90000, 120000 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
}
},
"constraint_modes":
{
"normal": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.2,
1000, 0.2
]
}
],
"highlight": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.2,
1000, 0.2
]
},
{
"bound": "UPPER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.8,
1000, 0.8
]
}
]
},
"y_target":
[
0, 0.16,
1000, 0.165,
10000, 0.17
],
"startup_frames": 5,
"convergence_frames": 6,
"speed": 0.15
}
]
}
}, },
{ {
"rpi.alsc": "rpi.alsc":
@ -556,6 +725,21 @@
"skip_frames": 5, "skip_frames": 5,
"map": [ 0.0, 445, 15.0, 925 ] "map": [ 0.0, 445, 15.0, 925 ]
} }
} },
{
"rpi.hdr":
{
"MultiExposure":
{
"cadence": [ 1, 2 ],
"channel_map": { "short": 1, "long": 2 }
},
"SingleExposure":
{
"cadence": [ 1 ],
"channel_map": { "short": 1 }
}
}
}
] ]
} }

View file

@ -129,86 +129,255 @@
{ {
"rpi.agc": "rpi.agc":
{ {
"metering_modes": "channels":
{ [
"centre-weighted": {
{ "metering_modes":
"weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ] {
}, "centre-weighted":
"spot": {
{ "weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]
"weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ] },
}, "spot":
"matrix": {
{ "weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
"weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ] },
} "matrix":
}, {
"exposure_modes": "weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
{ }
"normal": },
{ "exposure_modes":
"shutter": [ 100, 15000, 30000, 60000, 120000 ], {
"gain": [ 1.0, 1.0, 2.0, 4.0, 6.0 ] "normal":
}, {
"short": "shutter": [ 100, 15000, 30000, 60000, 120000 ],
{ "gain": [ 1.0, 1.0, 2.0, 4.0, 6.0 ]
"shutter": [ 100, 5000, 10000, 20000, 120000 ], },
"gain": [ 1.0, 2.0, 4.0, 6.0, 6.0 ] "short":
}, {
"long": "shutter": [ 100, 5000, 10000, 20000, 120000 ],
{ "gain": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]
"shutter": [ 1000, 30000, 60000, 90000, 120000 ], },
"gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ] "long":
} {
}, "shutter": [ 1000, 30000, 60000, 90000, 120000 ],
"constraint_modes": "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
{ }
"normal": [ },
{ "constraint_modes":
"bound": "LOWER", {
"q_lo": 0.98, "normal": [
"q_hi": 1.0, {
"y_target": "bound": "LOWER",
[ "q_lo": 0.98,
0, 0.2, "q_hi": 1.0,
1000, 0.2 "y_target":
] [
} 0, 0.2,
], 1000, 0.2
"highlight": [ ]
{ }
"bound": "LOWER", ],
"q_lo": 0.98, "highlight": [
"q_hi": 1.0, {
"y_target": "bound": "LOWER",
[ "q_lo": 0.98,
0, 0.2, "q_hi": 1.0,
1000, 0.2 "y_target":
] [
}, 0, 0.2,
{ 1000, 0.2
"bound": "UPPER", ]
"q_lo": 0.98, },
"q_hi": 1.0, {
"y_target": "bound": "UPPER",
[ "q_lo": 0.98,
0, 0.8, "q_hi": 1.0,
1000, 0.8 "y_target":
] [
} 0, 0.8,
] 1000, 0.8
}, ]
"y_target": }
[ ]
0, 0.16, },
1000, 0.165, "y_target":
10000, 0.17 [
], 0, 0.16,
"startup_frames": 5, 1000, 0.165,
"convergence_frames": 6, 10000, 0.17
"speed": 0.15 ],
} "startup_frames": 5,
"convergence_frames": 6,
"speed": 0.15
},
{
"base_ev": 0.125,
"metering_modes":
{
"centre-weighted":
{
"weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]
},
"spot":
{
"weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
},
"matrix":
{
"weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
}
},
"exposure_modes":
{
"normal":
{
"shutter": [ 100, 15000, 30000, 60000, 120000 ],
"gain": [ 1.0, 1.0, 2.0, 4.0, 6.0 ]
},
"short":
{
"shutter": [ 100, 5000, 10000, 20000, 120000 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]
},
"long":
{
"shutter": [ 1000, 30000, 60000, 90000, 120000 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
}
},
"constraint_modes":
{
"normal": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.2,
1000, 0.2
]
}
],
"highlight": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.2,
1000, 0.2
]
},
{
"bound": "UPPER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.8,
1000, 0.8
]
}
]
},
"y_target":
[
0, 0.16,
1000, 0.165,
10000, 0.17
],
"startup_frames": 5,
"convergence_frames": 6,
"speed": 0.15
},
{
"base_ev": 1.5,
"metering_modes":
{
"centre-weighted":
{
"weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]
},
"spot":
{
"weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
},
"matrix":
{
"weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
}
},
"exposure_modes":
{
"normal":
{
"shutter": [ 100, 15000, 30000, 60000, 120000 ],
"gain": [ 1.0, 1.0, 2.0, 4.0, 6.0 ]
},
"short":
{
"shutter": [ 100, 5000, 10000, 20000, 120000 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]
},
"long":
{
"shutter": [ 1000, 30000, 60000, 90000, 120000 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
}
},
"constraint_modes":
{
"normal": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.2,
1000, 0.2
]
}
],
"highlight": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.2,
1000, 0.2
]
},
{
"bound": "UPPER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.8,
1000, 0.8
]
}
]
},
"y_target":
[
0, 0.16,
1000, 0.165,
10000, 0.17
],
"startup_frames": 5,
"convergence_frames": 6,
"speed": 0.15
}
]
}
}, },
{ {
"rpi.alsc": "rpi.alsc":
@ -468,6 +637,21 @@
"skip_frames": 5, "skip_frames": 5,
"map": [ 0.0, 420, 35.0, 920 ] "map": [ 0.0, 420, 35.0, 920 ]
} }
} },
{
"rpi.hdr":
{
"MultiExposure":
{
"cadence": [ 1, 2 ],
"channel_map": { "short": 1, "long": 2 }
},
"SingleExposure":
{
"cadence": [ 1 ],
"channel_map": { "short": 1 }
}
}
}
] ]
} }

View file

@ -129,86 +129,255 @@
{ {
"rpi.agc": "rpi.agc":
{ {
"metering_modes": "channels":
{ [
"centre-weighted": {
{ "metering_modes":
"weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ] {
}, "centre-weighted":
"spot": {
{ "weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]
"weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ] },
}, "spot":
"matrix": {
{ "weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
"weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ] },
} "matrix":
}, {
"exposure_modes": "weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
{ }
"normal": },
{ "exposure_modes":
"shutter": [ 100, 15000, 30000, 60000, 120000 ], {
"gain": [ 1.0, 1.0, 2.0, 4.0, 6.0 ] "normal":
}, {
"short": "shutter": [ 100, 15000, 30000, 60000, 120000 ],
{ "gain": [ 1.0, 1.0, 2.0, 4.0, 6.0 ]
"shutter": [ 100, 5000, 10000, 20000, 120000 ], },
"gain": [ 1.0, 2.0, 4.0, 6.0, 6.0 ] "short":
}, {
"long": "shutter": [ 100, 5000, 10000, 20000, 120000 ],
{ "gain": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]
"shutter": [ 1000, 30000, 60000, 90000, 120000 ], },
"gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ] "long":
} {
}, "shutter": [ 1000, 30000, 60000, 90000, 120000 ],
"constraint_modes": "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
{ }
"normal": [ },
{ "constraint_modes":
"bound": "LOWER", {
"q_lo": 0.98, "normal": [
"q_hi": 1.0, {
"y_target": "bound": "LOWER",
[ "q_lo": 0.98,
0, 0.2, "q_hi": 1.0,
1000, 0.2 "y_target":
] [
} 0, 0.2,
], 1000, 0.2
"highlight": [ ]
{ }
"bound": "LOWER", ],
"q_lo": 0.98, "highlight": [
"q_hi": 1.0, {
"y_target": "bound": "LOWER",
[ "q_lo": 0.98,
0, 0.2, "q_hi": 1.0,
1000, 0.2 "y_target":
] [
}, 0, 0.2,
{ 1000, 0.2
"bound": "UPPER", ]
"q_lo": 0.98, },
"q_hi": 1.0, {
"y_target": "bound": "UPPER",
[ "q_lo": 0.98,
0, 0.8, "q_hi": 1.0,
1000, 0.8 "y_target":
] [
} 0, 0.8,
] 1000, 0.8
}, ]
"y_target": }
[ ]
0, 0.16, },
1000, 0.165, "y_target":
10000, 0.17 [
], 0, 0.16,
"startup_frames": 5, 1000, 0.165,
"convergence_frames": 6, 10000, 0.17
"speed": 0.15 ],
} "startup_frames": 5,
"convergence_frames": 6,
"speed": 0.15
},
{
"base_ev": 0.125,
"metering_modes":
{
"centre-weighted":
{
"weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]
},
"spot":
{
"weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
},
"matrix":
{
"weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
}
},
"exposure_modes":
{
"normal":
{
"shutter": [ 100, 15000, 30000, 60000, 120000 ],
"gain": [ 1.0, 1.0, 2.0, 4.0, 6.0 ]
},
"short":
{
"shutter": [ 100, 5000, 10000, 20000, 120000 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]
},
"long":
{
"shutter": [ 1000, 30000, 60000, 90000, 120000 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
}
},
"constraint_modes":
{
"normal": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.2,
1000, 0.2
]
}
],
"highlight": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.2,
1000, 0.2
]
},
{
"bound": "UPPER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.8,
1000, 0.8
]
}
]
},
"y_target":
[
0, 0.16,
1000, 0.165,
10000, 0.17
],
"startup_frames": 5,
"convergence_frames": 6,
"speed": 0.15
},
{
"base_ev": 1.5,
"metering_modes":
{
"centre-weighted":
{
"weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]
},
"spot":
{
"weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
},
"matrix":
{
"weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
}
},
"exposure_modes":
{
"normal":
{
"shutter": [ 100, 15000, 30000, 60000, 120000 ],
"gain": [ 1.0, 1.0, 2.0, 4.0, 6.0 ]
},
"short":
{
"shutter": [ 100, 5000, 10000, 20000, 120000 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]
},
"long":
{
"shutter": [ 1000, 30000, 60000, 90000, 120000 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
}
},
"constraint_modes":
{
"normal": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.2,
1000, 0.2
]
}
],
"highlight": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.2,
1000, 0.2
]
},
{
"bound": "UPPER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.8,
1000, 0.8
]
}
]
},
"y_target":
[
0, 0.16,
1000, 0.165,
10000, 0.17
],
"startup_frames": 5,
"convergence_frames": 6,
"speed": 0.15
}
]
}
}, },
{ {
"rpi.alsc": "rpi.alsc":
@ -459,6 +628,21 @@
"skip_frames": 5, "skip_frames": 5,
"map": [ 0.0, 420, 35.0, 920 ] "map": [ 0.0, 420, 35.0, 920 ]
} }
} },
{
"rpi.hdr":
{
"MultiExposure":
{
"cadence": [ 1, 2 ],
"channel_map": { "short": 1, "long": 2 }
},
"SingleExposure":
{
"cadence": [ 1 ],
"channel_map": { "short": 1 }
}
}
}
] ]
} }

View file

@ -131,96 +131,285 @@
{ {
"rpi.agc": "rpi.agc":
{ {
"metering_modes": "channels":
{ [
"centre-weighted": {
{ "metering_modes":
"weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ] {
}, "centre-weighted":
"spot": {
{ "weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]
"weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ] },
}, "spot":
"matrix": {
{ "weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
"weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ] },
} "matrix":
}, {
"exposure_modes": "weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
{ }
"normal": },
{ "exposure_modes":
"shutter": [ 100, 10000, 30000, 60000, 66666 ], {
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ] "normal":
}, {
"short": "shutter": [ 100, 10000, 30000, 60000, 66666 ],
{ "gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
"shutter": [ 100, 5000, 10000, 20000, 33333 ], },
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ] "short":
}, {
"long": "shutter": [ 100, 5000, 10000, 20000, 33333 ],
{ "gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
"shutter": [ 100, 10000, 30000, 60000, 120000 ], },
"gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ] "long":
} {
}, "shutter": [ 100, 10000, 30000, 60000, 120000 ],
"constraint_modes": "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
{ }
"normal": [ },
{ "constraint_modes":
"bound": "LOWER", {
"q_lo": 0.98, "normal": [
"q_hi": 1.0, {
"y_target": "bound": "LOWER",
[ "q_lo": 0.98,
0, 0.5, "q_hi": 1.0,
1000, 0.5 "y_target":
] [
} 0, 0.5,
], 1000, 0.5
"highlight": [ ]
{ }
"bound": "LOWER", ],
"q_lo": 0.98, "highlight": [
"q_hi": 1.0, {
"y_target": "bound": "LOWER",
[ "q_lo": 0.98,
0, 0.5, "q_hi": 1.0,
1000, 0.5 "y_target":
] [
}, 0, 0.5,
{ 1000, 0.5
"bound": "UPPER", ]
"q_lo": 0.98, },
"q_hi": 1.0, {
"y_target": "bound": "UPPER",
[ "q_lo": 0.98,
0, 0.8, "q_hi": 1.0,
1000, 0.8 "y_target":
] [
} 0, 0.8,
], 1000, 0.8
"shadows": [ ]
{ }
"bound": "LOWER", ],
"q_lo": 0.0, "shadows": [
"q_hi": 0.5, {
"y_target": "bound": "LOWER",
[ "q_lo": 0.0,
0, 0.17, "q_hi": 0.5,
1000, 0.17 "y_target":
] [
} 0, 0.17,
] 1000, 0.17
}, ]
"y_target": }
[ ]
0, 0.16, },
1000, 0.165, "y_target":
10000, 0.17 [
], 0, 0.16,
"base_ev": 1.25 1000, 0.165,
} 10000, 0.17
],
"base_ev": 1.25
},
{
"base_ev": 0.125,
"metering_modes":
{
"centre-weighted":
{
"weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]
},
"spot":
{
"weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
},
"matrix":
{
"weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
}
},
"exposure_modes":
{
"normal":
{
"shutter": [ 100, 10000, 30000, 60000, 66666 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
},
"short":
{
"shutter": [ 100, 5000, 10000, 20000, 33333 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
},
"long":
{
"shutter": [ 100, 10000, 30000, 60000, 120000 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
}
},
"constraint_modes":
{
"normal": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.5,
1000, 0.5
]
}
],
"highlight": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.5,
1000, 0.5
]
},
{
"bound": "UPPER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.8,
1000, 0.8
]
}
],
"shadows": [
{
"bound": "LOWER",
"q_lo": 0.0,
"q_hi": 0.5,
"y_target":
[
0, 0.17,
1000, 0.17
]
}
]
},
"y_target":
[
0, 0.16,
1000, 0.165,
10000, 0.17
],
"base_ev": 1.25
},
{
"base_ev": 1.5,
"metering_modes":
{
"centre-weighted":
{
"weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]
},
"spot":
{
"weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
},
"matrix":
{
"weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
}
},
"exposure_modes":
{
"normal":
{
"shutter": [ 100, 10000, 30000, 60000, 66666 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
},
"short":
{
"shutter": [ 100, 5000, 10000, 20000, 33333 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
},
"long":
{
"shutter": [ 100, 10000, 30000, 60000, 120000 ],
"gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
}
},
"constraint_modes":
{
"normal": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.5,
1000, 0.5
]
}
],
"highlight": [
{
"bound": "LOWER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.5,
1000, 0.5
]
},
{
"bound": "UPPER",
"q_lo": 0.98,
"q_hi": 1.0,
"y_target":
[
0, 0.8,
1000, 0.8
]
}
],
"shadows": [
{
"bound": "LOWER",
"q_lo": 0.0,
"q_hi": 0.5,
"y_target":
[
0, 0.17,
1000, 0.17
]
}
]
},
"y_target":
[
0, 0.16,
1000, 0.165,
10000, 0.17
],
"base_ev": 1.25
}
]
}
}, },
{ {
"rpi.alsc": "rpi.alsc":
@ -464,6 +653,21 @@
}, },
{ {
"rpi.sharpen": { } "rpi.sharpen": { }
} },
{
"rpi.hdr":
{
"MultiExposure":
{
"cadence": [ 1, 2 ],
"channel_map": { "short": 1, "long": 2 }
},
"SingleExposure":
{
"cadence": [ 1 ],
"channel_map": { "short": 1 }
}
}
}
] ]
} }