ipa: rpi: vc4: data: Updated color matrices for RPi Cameras

Altered the color matrices for the tuning files for various
cameras in order to make them more color accurate.

Signed-off-by: Ben Benson <ben.benson@raspberrypi.com>
Reviewed-by: David Plowman <david.plowman@raspberrypi.com>
Reviewed-by: Naushir Patuck <naush@raspberrypi.com>
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>

1 files changed, 26 insertions, 134 deletions

diff --git a/src/ipa/rpi/vc4/data/imx296.json b/src/ipa/rpi/vc4/data/imx296.json
index 9330d0a9..7621f759 100644
--- a/src/ipa/rpi/vc4/data/imx296.json
+++ b/src/ipa/rpi/vc4/data/imx296.json
@@ -357,174 +357,66 @@
             {
                 "ccms": [
                     {
-                        "ct": 2000,
+                        "ct": 2500,
                         "ccm":
                         [
-                            1.48716, -0.1877, -0.35079,
-                            -0.48577, 1.55088, -0.03387,
-                            0.24919, -1.4583, 2.12083
-                        ]
-                    },
-                    {
-                        "ct": 2200,
-                        "ccm":
-                        [
-                            1.53439, -0.28852, -0.29392,
-                            -0.44748, 1.56295, -0.08907,
-                            0.23529, -1.30488, 1.99784
-                        ]
-                    },
-                    {
-                        "ct": 2400,
-                        "ccm":
-                        [
-                            1.57619, -0.36904, -0.25181,
-                            -0.41654, 1.57046, -0.13192,
-                            0.21678, -1.18352, 1.90786
-                        ]
-                    },
-                    {
-                        "ct": 2600,
-                        "ccm":
-                        [
-                            1.61348, -0.43497, -0.2198,
-                            -0.39075, 1.5753, -0.1665,
-                            0.19789, -1.08592, 1.83942
+                            1.95054, -0.57435, -0.37619,
+                            -0.46945, 1.86661, -0.39716,
+                            0.07977, -1.14072, 2.06095
                         ]
                     },
                     {
                         "ct": 2800,
                         "ccm":
                         [
-                            1.64717, -0.49009, -0.1951,
-                            -0.36881, 1.57852, -0.1952,
-                            0.18016, -1.00609, 1.78575
-                        ]
-                    },
-                    {
-                        "ct": 3000,
-                        "ccm":
-                        [
-                            1.67798, -0.53693, -0.17591,
-                            -0.34986, 1.58074, -0.21955,
-                            0.16406, -0.9398, 1.74261
-                        ]
-                    },
-                    {
-                        "ct": 3200,
-                        "ccm":
-                        [
-                            1.70647, -0.5773, -0.161,
-                            -0.33332, 1.58235, -0.24056,
-                            0.14961, -0.88398, 1.70721
-                        ]
-                    },
-                    {
-                        "ct": 3400,
-                        "ccm":
-                        [
-                            1.73305, -0.61248, -0.14951,
-                            -0.31875, 1.58355, -0.25894,
-                            0.13671, -0.83642, 1.67769
+                            1.94104, -0.60261, -0.33844,
+                            -0.43162, 1.85422, -0.42261,
+                            0.03799, -0.95022, 1.91222
                         ]
                     },
                     {
-                        "ct": 3600,
+                        "ct": 2900,
                         "ccm":
                         [
-                            1.75802, -0.64343, -0.14077,
-                            -0.30581, 1.5845, -0.27518,
-                            0.12518, -0.79546, 1.65271
+                            1.91828, -0.59569, -0.32258,
+                            -0.51902, 2.09091, -0.57189,
+                            -0.03324, -0.73462, 1.76785
                         ]
                     },
                     {
-                        "ct": 4100,
+                        "ct": 3620,
                         "ccm":
                         [
-                            1.78116, -0.67459, -0.13048,
-                            -0.26859, 1.58692, -0.31929,
-                            0.11915, -0.77931, 1.64012
+                            1.97199, -0.66403, -0.30797,
+                            -0.46411, 2.02612, -0.56201,
+                            -0.07764, -0.61178, 1.68942
                         ]
                     },
                     {
-                        "ct": 4600,
+                        "ct": 4560,
                         "ccm":
                         [
-                            1.83867, -0.73605, -0.12044,
-                            -0.24947, 1.58699, -0.34207,
-                            0.09949, -0.71041, 1.59842
-                        ]
-                    },
-                    {
-                        "ct": 5100,
-                        "ccm":
-                        [
-                            1.88967, -0.78455, -0.11744,
-                            -0.23398, 1.58806, -0.36172,
-                            0.08362, -0.6574, 1.56728
+                            2.15256, -0.84787, -0.30469,
+                            -0.48422, 2.28962, -0.80541,
+                            -0.15113, -0.53014, 1.68127
                         ]
                     },
                     {
                         "ct": 5600,
                         "ccm":
                         [
-                            1.93485, -0.82318, -0.1191,
-                            -0.22108, 1.58973, -0.37892,
-                            0.07074, -0.61609, 1.54362
-                        ]
-                    },
-                    {
-                        "ct": 6100,
-                        "ccm":
-                        [
-                            1.97481, -0.85423, -0.12371,
-                            -0.21015, 1.59169, -0.39406,
-                            0.06021, -0.58353, 1.52536
-                        ]
-                    },
-                    {
-                        "ct": 6600,
-                        "ccm":
-                        [
-                            2.01029, -0.87946, -0.13017,
-                            -0.20074, 1.59378, -0.4075,
-                            0.05146, -0.55732, 1.51096
-                        ]
-                    },
-                    {
-                        "ct": 7100,
-                        "ccm":
-                        [
-                            2.04183, -0.9002, -0.13765,
-                            -0.19255, 1.59586, -0.41944,
-                            0.04414, -0.53603, 1.49947
-                        ]
-                    },
-                    {
-                        "ct": 7600,
-                        "ccm":
-                        [
-                            2.07001, -0.91744, -0.14566,
-                            -0.18534, 1.59788, -0.43013,
-                            0.03791, -0.51841, 1.49013
-                        ]
-                    },
-                    {
-                        "ct": 8100,
-                        "ccm":
-                        [
-                            2.09534, -0.93195, -0.15388,
-                            -0.17893, 1.59981, -0.43974,
-                            0.03256, -0.50364, 1.48243
+                            2.04576, -0.74771, -0.29805,
+                            -0.36332, 1.98993, -0.62662,
+                            -0.09328, -0.46543, 1.55871
                         ]
                     },
                     {
-                        "ct": 8600,
+                        "ct": 7400,
                         "ccm":
                         [
-                            2.11799, -0.94416, -0.16203,
-                            -0.17324, 1.60161, -0.44836,
-                            0.02795, -0.4912, 1.47604
+                            2.37532, -0.83069, -0.54462,
+                            -0.48279, 2.84309, -1.36031,
+                            -0.21178, -0.66532, 1.87709
                         ]
                     }
                 ]