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>

1 files changed, 296 insertions, 92 deletions

diff --git a/src/ipa/rpi/vc4/data/ov5647.json b/src/ipa/rpi/vc4/data/ov5647.json
index a1b42a18..4def9ffc 100644
--- a/src/ipa/rpi/vc4/data/ov5647.json
+++ b/src/ipa/rpi/vc4/data/ov5647.json
@@ -131,96 +131,285 @@
         {
             "rpi.agc":
             {
-                "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
-            }
+		"channels":
+		[
+		    {
+			"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": 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":
@@ -464,6 +653,21 @@
         },
         {
             "rpi.sharpen": { }
-        }
+        },
+	{
+	    "rpi.hdr":
+	    {
+		"MultiExposure":
+		{
+		    "cadence": [ 1, 2 ],
+		    "channel_map": { "short": 1, "long": 2 }
+		},
+		"SingleExposure":
+		{
+		    "cadence": [ 1 ],
+		    "channel_map": { "short": 1 }
+		}
+	    }
+	}
     ]
-}
\ No newline at end of file
+}