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 at raspberrypi.com>
---
src/ipa/rpi/vc4/data/imx219.json | 66 ++++-------
src/ipa/rpi/vc4/data/imx296.json | 160 +++++---------------------
src/ipa/rpi/vc4/data/imx477.json | 93 ++++-----------
src/ipa/rpi/vc4/data/imx708.json | 139 ++++------------------
src/ipa/rpi/vc4/data/imx708_wide.json | 49 ++++----
src/ipa/rpi/vc4/data/ov5647.json | 66 ++++-------
6 files changed, 147 insertions(+), 426 deletions(-)
diff --git a/src/ipa/rpi/vc4/data/imx219.json b/src/ipa/rpi/vc4/data/imx219.json
index efe7210a..e8fce164 100644
--- a/src/ipa/rpi/vc4/data/imx219.json
+++ b/src/ipa/rpi/vc4/data/imx219.json
@@ -405,75 +405,57 @@
{
"ccms": [
{
- "ct": 2498,
+ "ct": 2860,
"ccm":
[
- 1.58731, -0.18011, -0.40721,
- -0.60639, 2.03422, -0.42782,
- -0.19612, -1.69203, 2.88815
+ 2.12089, -0.52461, -0.59629,
+ -0.85342, 2.80445, -0.95103,
+ -0.26897, -1.14788, 2.41685
]
},
{
- "ct": 2811,
+ "ct": 2960,
"ccm":
[
- 1.61593, -0.33164, -0.28429,
- -0.55048, 1.97779, -0.42731,
- -0.12042, -1.42847, 2.54889
+ 2.26962, -0.54174, -0.72789,
+ -0.77008, 2.60271, -0.83262,
+ -0.26036, -1.51254, 2.77289
]
},
{
- "ct": 2911,
+ "ct": 3603,
"ccm":
[
- 1.62771, -0.41282, -0.21489,
- -0.57991, 2.04176, -0.46186,
- -0.07613, -1.13359, 2.20972
+ 2.18644, -0.66148, -0.52496,
+ -0.77828, 2.69474, -0.91645,
+ -0.25239, -0.83059, 2.08298
]
},
{
- "ct": 2919,
+ "ct": 4650,
"ccm":
[
- 1.62661, -0.37736, -0.24925,
- -0.52519, 1.95233, -0.42714,
- -0.10842, -1.34929, 2.45771
+ 2.18174, -0.70887, -0.47287,
+ -0.70196, 2.76426, -1.06231,
+ -0.25157, -0.71978, 1.97135
]
},
{
- "ct": 3627,
+ "ct": 5858,
"ccm":
[
- 1.70385, -0.57231, -0.13154,
- -0.47763, 1.85998, -0.38235,
- -0.07467, -0.82678, 1.90145
+ 2.32392, -0.88421, -0.43971,
+ -0.63821, 2.58348, -0.94527,
+ -0.28541, -0.54112, 1.82653
]
},
{
- "ct": 4600,
+ "ct": 7580,
"ccm":
[
- 1.68486, -0.61085, -0.07402,
- -0.41927, 2.04016, -0.62089,
- -0.08633, -0.67672, 1.76305
- ]
- },
- {
- "ct": 5716,
- "ccm":
- [
- 1.80439, -0.73699, -0.06739,
- -0.36073, 1.83327, -0.47255,
- -0.08378, -0.56403, 1.64781
- ]
- },
- {
- "ct": 8575,
- "ccm":
- [
- 1.89357, -0.76427, -0.12931,
- -0.27399, 2.15605, -0.88206,
- -0.12035, -0.68256, 1.80292
+ 2.21175, -0.53242, -0.67933,
+ -0.57875, 3.07922, -1.50047,
+ -0.27709, -0.73338, 2.01048
]
}
]
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
]
}
]
diff --git a/src/ipa/rpi/vc4/data/imx477.json b/src/ipa/rpi/vc4/data/imx477.json
index daffc268..0e39d419 100644
--- a/src/ipa/rpi/vc4/data/imx477.json
+++ b/src/ipa/rpi/vc4/data/imx477.json
@@ -410,102 +410,57 @@
{
"ccms": [
{
- "ct": 2360,
+ "ct": 2850,
"ccm":
[
- 1.66078, -0.23588, -0.42491,
- -0.47456, 1.82763, -0.35307,
- -0.00545, -1.44729, 2.45273
+ 1.97469, -0.71439, -0.26031,
+ -0.43521, 2.09769, -0.66248,
+ -0.04826, -0.84642, 1.89468
]
},
{
- "ct": 2870,
- "ccm":
- [
- 1.78373, -0.55344, -0.23029,
- -0.39951, 1.69701, -0.29751,
- 0.01986, -1.06525, 2.04539
- ]
- },
- {
- "ct": 2970,
- "ccm":
- [
- 1.73511, -0.56973, -0.16537,
- -0.36338, 1.69878, -0.33539,
- -0.02354, -0.76813, 1.79168
- ]
- },
- {
- "ct": 3000,
- "ccm":
- [
- 2.06374, -0.92218, -0.14156,
- -0.41721, 1.69289, -0.27568,
- -0.00554, -0.92741, 1.93295
- ]
- },
- {
- "ct": 3700,
- "ccm":
- [
- 2.13792, -1.08136, -0.05655,
- -0.34739, 1.58989, -0.24249,
- -0.00349, -0.76789, 1.77138
- ]
- },
- {
- "ct": 3870,
- "ccm":
- [
- 1.83834, -0.70528, -0.13307,
- -0.30499, 1.60523, -0.30024,
- -0.05701, -0.58313, 1.64014
- ]
- },
- {
- "ct": 4000,
+ "ct": 2960,
"ccm":
[
- 2.15741, -1.10295, -0.05447,
- -0.34631, 1.61158, -0.26528,
- -0.02723, -0.70288, 1.73011
+ 2.12952, -0.91185, -0.21768,
+ -0.38018, 1.90789, -0.52771,
+ 0.03988, -1.10079, 2.06092
]
},
{
- "ct": 4400,
+ "ct": 3580,
"ccm":
[
- 2.05729, -0.95007, -0.10723,
- -0.41712, 1.78606, -0.36894,
- -0.11899, -0.55727, 1.67626
+ 2.03422, -0.80048, -0.23374,
+ -0.39089, 1.97221, -0.58132,
+ -0.08969, -0.61439, 1.70408
]
},
{
- "ct": 4715,
+ "ct": 4559,
"ccm":
[
- 1.90255, -0.77478, -0.12777,
- -0.31338, 1.88197, -0.56858,
- -0.06001, -0.61785, 1.67786
+ 2.15423, -0.98143, -0.17279,
+ -0.38131, 2.14763, -0.76632,
+ -0.10069, -0.54383, 1.64452
]
},
{
- "ct": 5920,
+ "ct": 5881,
"ccm":
[
- 1.98691, -0.84671, -0.14019,
- -0.26581, 1.70615, -0.44035,
- -0.09532, -0.47332, 1.56864
+ 2.18464, -0.95493, -0.22971,
+ -0.36826, 2.00298, -0.63471,
+ -0.15219, -0.38055, 1.53274
]
},
{
- "ct": 9050,
+ "ct": 7600,
"ccm":
[
- 2.09255, -0.76541, -0.32714,
- -0.28973, 2.27462, -0.98489,
- -0.17299, -0.61275, 1.78574
+ 2.30687, -0.97295, -0.33392,
+ -0.30872, 2.32779, -1.01908,
+ -0.17761, -0.55891, 1.73651
]
}
]
diff --git a/src/ipa/rpi/vc4/data/imx708.json b/src/ipa/rpi/vc4/data/imx708.json
index 6b26d0a1..c40a5994 100644
--- a/src/ipa/rpi/vc4/data/imx708.json
+++ b/src/ipa/rpi/vc4/data/imx708.json
@@ -368,147 +368,48 @@
{
"ccms": [
{
- "ct": 2498,
+ "ct": 2964,
"ccm":
[
- 1.14912, 0.28638, -0.43551,
- -0.49691, 1.60391, -0.10701,
- -0.10513, -1.09534, 2.20047
+ 1.72129, -0.45961, -0.26169,
+ -0.30042, 1.56924, -0.26882,
+ 0.15133, -1.13293, 1.98161
]
},
{
- "ct": 2821,
+ "ct": 3610,
"ccm":
[
- 1.18251, 0.15501, -0.33752,
- -0.44304, 1.58495, -0.14191,
- -0.05077, -0.96422, 2.01498
+ 1.54474, -0.35082, -0.19391,
+ -0.36989, 1.67926, -0.30936,
+ -0.00524, -0.55197, 1.55722
]
},
{
- "ct": 2925,
+ "ct": 4640,
"ccm":
[
- 1.18668, 0.00195, -0.18864,
- -0.41617, 1.50514, -0.08897,
- -0.02675, -0.91143, 1.93818
+ 1.52972, -0.35168, -0.17804,
+ -0.28309, 1.67098, -0.38788,
+ 0.01695, -0.57209, 1.55515
]
},
{
- "ct": 2926,
+ "ct": 5910,
"ccm":
[
- 1.50948, -0.44421, -0.06527,
- -0.37241, 1.41726, -0.04486,
- 0.07098, -0.84694, 1.77596
+ 1.56879, -0.42159, -0.14719,
+ -0.27275, 1.59354, -0.32079,
+ -0.02862, -0.40662, 1.43525
]
},
{
- "ct": 2951,
+ "ct": 7590,
"ccm":
[
- 1.52743, -0.47333, -0.05411,
- -0.36485, 1.40764, -0.04279,
- 0.08672, -0.90479, 1.81807
- ]
- },
- {
- "ct": 2954,
- "ccm":
- [
- 1.51683, -0.46841, -0.04841,
- -0.36288, 1.39914, -0.03625,
- 0.06421, -0.82034, 1.75613
- ]
- },
- {
- "ct": 3578,
- "ccm":
- [
- 1.59888, -0.59105, -0.00784,
- -0.29366, 1.32037, -0.02671,
- 0.06627, -0.76465, 1.69838
- ]
- },
- {
- "ct": 3717,
- "ccm":
- [
- 1.59063, -0.58059, -0.01003,
- -0.29583, 1.32715, -0.03132,
- 0.03613, -0.67431, 1.63817
- ]
- },
- {
- "ct": 3784,
- "ccm":
- [
- 1.59379, -0.58861, -0.00517,
- -0.29178, 1.33292, -0.04115,
- 0.03541, -0.66162, 1.62622
- ]
- },
- {
- "ct": 4485,
- "ccm":
- [
- 1.40761, -0.34561, -0.06201,
- -0.32388, 1.57221, -0.24832,
- -0.01014, -0.63427, 1.64441
- ]
- },
- {
- "ct": 4615,
- "ccm":
- [
- 1.41537, -0.35832, -0.05705,
- -0.31429, 1.56019, -0.24591,
- -0.01761, -0.61859, 1.63621
- ]
- },
- {
- "ct": 4671,
- "ccm":
- [
- 1.42941, -0.38178, -0.04764,
- -0.31421, 1.55925, -0.24504,
- -0.01141, -0.62987, 1.64129
- ]
- },
- {
- "ct": 5753,
- "ccm":
- [
- 1.64549, -0.63329, -0.01221,
- -0.22431, 1.36423, -0.13992,
- -0.00831, -0.55373, 1.56204
- ]
- },
- {
- "ct": 5773,
- "ccm":
- [
- 1.63668, -0.63557, -0.00111,
- -0.21919, 1.36234, -0.14315,
- -0.00399, -0.57428, 1.57827
- ]
- },
- {
- "ct": 7433,
- "ccm":
- [
- 1.36007, -0.09277, -0.26729,
- -0.36886, 2.09249, -0.72363,
- -0.12573, -0.76761, 1.89334
- ]
- },
- {
- "ct": 55792,
- "ccm":
- [
- 1.65091, -0.63689, -0.01401,
- -0.22277, 1.35752, -0.13475,
- -0.00943, -0.55091, 1.56033
+ 1.41424, -0.21092, -0.20332,
+ -0.17646, 1.71734, -0.54087,
+ 0.01297, -0.63111, 1.61814
]
}
]
diff --git a/src/ipa/rpi/vc4/data/imx708_wide.json b/src/ipa/rpi/vc4/data/imx708_wide.json
index 14bc918e..65543628 100644
--- a/src/ipa/rpi/vc4/data/imx708_wide.json
+++ b/src/ipa/rpi/vc4/data/imx708_wide.json
@@ -358,48 +358,57 @@
{
"ccms": [
{
- "ct": 2750,
+ "ct": 2868,
"ccm":
[
- 1.13004, 0.36392, -0.49396,
- -0.45885, 1.68171, -0.22286,
- -0.06473, -0.86962, 1.93435
+ 1.58923, -0.36649, -0.22273,
+ -0.43591, 1.84858, -0.41268,
+ 0.02948, -0.77666, 1.74718
]
},
{
- "ct": 2940,
+ "ct": 2965,
"ccm":
[
- 1.29876, 0.09627, -0.39503,
- -0.43085, 1.60258, -0.17172,
- -0.02638, -0.92581, 1.95218
+ 1.73397, -0.42794, -0.30603,
+ -0.36504, 1.72431, -0.35926,
+ 0.12765, -1.10933, 1.98168
]
},
{
- "ct": 3650,
+ "ct": 3603,
"ccm":
[
- 1.57729, -0.29734, -0.27995,
- -0.42965, 1.66231, -0.23265,
- -0.02183, -0.62331, 1.64514
+ 1.61787, -0.42704, -0.19084,
+ -0.37819, 1.74588, -0.36769,
+ 0.00961, -0.59807, 1.58847
]
},
{
- "ct": 4625,
+ "ct": 4620,
"ccm":
[
- 1.52145, -0.22382, -0.29763,
- -0.40445, 1.82186, -0.41742,
- -0.05732, -0.56222, 1.61954
+ 1.55581, -0.35422, -0.20158,
+ -0.31805, 1.79309, -0.47505,
+ -0.01256, -0.54489, 1.55746
]
},
{
- "ct": 5715,
+ "ct": 5901,
"ccm":
[
- 1.67851, -0.39193, -0.28658,
- -0.37169, 1.72949, -0.35781,
- -0.09556, -0.41951, 1.51508
+ 1.64439, -0.48855, -0.15585,
+ -0.29149, 1.67122, -0.37972,
+ -0.03111, -0.44052, 1.47163
+ ]
+ },
+ {
+ "ct": 7610,
+ "ccm":
+ [
+ 1.48667, -0.26072, -0.22595,
+ -0.21815, 1.86724, -0.64909,
+ -0.00985, -0.64485, 1.65471
]
}
]
diff --git a/src/ipa/rpi/vc4/data/ov5647.json b/src/ipa/rpi/vc4/data/ov5647.json
index d770e44f..a1b42a18 100644
--- a/src/ipa/rpi/vc4/data/ov5647.json
+++ b/src/ipa/rpi/vc4/data/ov5647.json
@@ -406,75 +406,57 @@
{
"ccms": [
{
- "ct": 2500,
+ "ct": 2873,
"ccm":
[
- 1.70741, -0.05307, -0.65433,
- -0.62822, 1.68836, -0.06014,
- -0.04452, -1.87628, 2.92079
+ 1.88195, -0.26249, -0.61946,
+ -0.63842, 2.11535, -0.47693,
+ -0.13531, -0.99739, 2.13271
]
},
{
- "ct": 2803,
+ "ct": 2965,
"ccm":
[
- 1.74383, -0.18731, -0.55652,
- -0.56491, 1.67772, -0.11281,
- -0.01522, -1.60635, 2.62157
+ 2.15048, -0.51859, -0.63189,
+ -0.53572, 1.92585, -0.39013,
+ 0.01831, -1.48576, 2.46744
]
},
{
- "ct": 2912,
+ "ct": 3606,
"ccm":
[
- 1.75215, -0.22221, -0.52995,
- -0.54568, 1.63522, -0.08954,
- 0.02633, -1.56997, 2.54364
+ 1.97522, -0.43847, -0.53675,
+ -0.56151, 1.99765, -0.43614,
+ -0.12438, -0.77056, 1.89493
]
},
{
- "ct": 2914,
+ "ct": 4700,
"ccm":
[
- 1.72423, -0.28939, -0.43484,
- -0.55188, 1.62925, -0.07737,
- 0.01959, -1.28661, 2.26702
+ 2.00971, -0.51461, -0.49511,
+ -0.52109, 2.01003, -0.48894,
+ -0.09527, -0.67318, 1.76845
]
},
{
- "ct": 3605,
+ "ct": 5890,
"ccm":
[
- 1.80381, -0.43646, -0.36735,
- -0.46505, 1.56814, -0.10309,
- 0.00929, -1.00424, 1.99495
+ 2.13616, -0.65283, -0.48333,
+ -0.48364, 1.93115, -0.44751,
+ -0.13465, -0.54831, 1.68295
]
},
{
- "ct": 4540,
+ "ct": 7600,
"ccm":
[
- 1.85263, -0.46545, -0.38719,
- -0.44136, 1.68443, -0.24307,
- 0.04108, -0.85599, 1.81491
- ]
- },
- {
- "ct": 5699,
- "ccm":
- [
- 1.98595, -0.63542, -0.35054,
- -0.34623, 1.54146, -0.19522,
- 0.00411, -0.70936, 1.70525
- ]
- },
- {
- "ct": 8625,
- "ccm":
- [
- 2.21637, -0.56663, -0.64974,
- -0.41133, 1.96625, -0.55492,
- -0.02307, -0.83529, 1.85837
+ 2.06599, -0.39161, -0.67439,
+ -0.50883, 2.27467, -0.76583,
+ -0.13961, -0.66121, 1.80081
]
}
]
--
2.34.1