Patch Detail
Show a patch.
GET /api/1.1/patches/16826/?format=api
{ "id": 16826, "url": "https://patchwork.libcamera.org/api/1.1/patches/16826/?format=api", "web_url": "https://patchwork.libcamera.org/patch/16826/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20220727023816.30008-13-laurent.pinchart@ideasonboard.com>", "date": "2022-07-27T02:38:14", "name": "[libcamera-devel,v7,12/14] ipa: raspberrypi: Convert existing cameara tuning files to version 2.0", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "26b0440407ba42d9f7f3aa480dbd181bd800129d", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/1.1/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/16826/mbox/", "series": [ { "id": 3331, "url": "https://patchwork.libcamera.org/api/1.1/series/3331/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3331", "date": "2022-07-27T02:38:02", "name": "Replace boost JSON parser with libyaml in Raspberry Pi IPA", "version": 7, "mbox": "https://patchwork.libcamera.org/series/3331/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/16826/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/16826/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "X-Original-To": "parsemail@patchwork.libcamera.org", "Delivered-To": "parsemail@patchwork.libcamera.org", "Received": [ "from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 52602C3275\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 27 Jul 2022 02:39:33 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id F3BEA63315;\n\tWed, 27 Jul 2022 04:39:32 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4915663333\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 27 Jul 2022 04:38:33 +0200 (CEST)", "from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id CB85C56D;\n\tWed, 27 Jul 2022 04:38:31 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1658889573;\n\tbh=Fe94kkAv6ZSjp02k2XKBv3NIT+hMw+qqZD29ezizyRE=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=Lcl/fUqBUpNQaC36Ewsc23SJThqowNY0N4teU2GNdOvXR5DIyzthL7Be9m88Oze0l\n\t1NhukpwEFzC/qisV1yoVituPhMPf5f99s2jgJWh51ZkTnnVSfRO7I9Wcm7ia2G4vbr\n\tHQaRnR2pVZCykwy82v/JkH4LrrpH+ilAxQhgI7Acqu1GiEdlr8fpsRcRU6W2sN8nJT\n\t88mb5y86YPw1lBacz/I8l4K1AF7nliDNj0Pn+akrTMeFuDPbAgaaGLvP0b50BBU7/o\n\tlQyUl4QbE1FHsiydKBpqn7fiOFnwAs8vXeEIwnOs/x5UTFNKv1u9M9lqMUtirvelcZ\n\tTb6in9nbxx4bQ==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1658889513;\n\tbh=Fe94kkAv6ZSjp02k2XKBv3NIT+hMw+qqZD29ezizyRE=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=FScnsN5BbFt548Hur1JVa9ecRhyoqE6kTrPZ5750f7t2rKg+S5lrLK21OrN85VH1s\n\tnnbL6kg5TnaVtGc87msOPCUc+iyFz4KaUAfqZDTs11MXXY7eCLapfHKBO9kk8sDI4W\n\tNgIUomFacuDKvU66RgjLz+JQpQ94WuIyNvme7rGQ=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"FScnsN5B\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 27 Jul 2022 05:38:14 +0300", "Message-Id": "<20220727023816.30008-13-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.35.1", "In-Reply-To": "<20220727023816.30008-1-laurent.pinchart@ideasonboard.com>", "References": "<20220727023816.30008-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-Mailman-Approved-At": "Wed, 27 Jul 2022 04:39:31 +0200", "Subject": "[libcamera-devel] [PATCH v7 12/14] ipa: raspberrypi: Convert\n\texisting cameara tuning files to version 2.0", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "From": "Laurent Pinchart via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "From: Naushir Patuck <naush@raspberrypi.com>\n\nUse the convert_tuning.py script to convert all existing tuning files to\nversion 2.0.\n\nSigned-off-by: Naushir Patuck <naush@raspberrypi.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/ipa/raspberrypi/data/imx219.json | 824 ++++++++++---------\n src/ipa/raspberrypi/data/imx219_noir.json | 686 ++++++++--------\n src/ipa/raspberrypi/data/imx290.json | 322 ++++----\n src/ipa/raspberrypi/data/imx296.json | 369 +++++----\n src/ipa/raspberrypi/data/imx378.json | 677 +++++++++-------\n src/ipa/raspberrypi/data/imx477.json | 881 ++++++++++++---------\n src/ipa/raspberrypi/data/imx477_noir.json | 734 +++++++++--------\n src/ipa/raspberrypi/data/imx519.json | 677 +++++++++-------\n src/ipa/raspberrypi/data/ov5647.json | 824 ++++++++++---------\n src/ipa/raspberrypi/data/ov5647_noir.json | 686 ++++++++--------\n src/ipa/raspberrypi/data/ov9281.json | 195 +++--\n src/ipa/raspberrypi/data/se327m12.json | 683 +++++++++-------\n src/ipa/raspberrypi/data/uncalibrated.json | 180 +++--\n 13 files changed, 4269 insertions(+), 3469 deletions(-)", "diff": "diff --git a/src/ipa/raspberrypi/data/imx219.json b/src/ipa/raspberrypi/data/imx219.json\nindex 4e24c5d57da1..efe7210ae2c9 100644\n--- a/src/ipa/raspberrypi/data/imx219.json\n+++ b/src/ipa/raspberrypi/data/imx219.json\n@@ -1,412 +1,486 @@\n {\n- \"rpi.black_level\":\n- {\n- \"black_level\": 4096\n- },\n- \"rpi.dpc\":\n- {\n-\n- },\n- \"rpi.lux\":\n- {\n- \"reference_shutter_speed\": 27685,\n- \"reference_gain\": 1.0,\n- \"reference_aperture\": 1.0,\n- \"reference_lux\": 998,\n- \"reference_Y\": 12744\n- },\n- \"rpi.noise\":\n- {\n- \"reference_constant\": 0,\n- \"reference_slope\": 3.67\n- },\n- \"rpi.geq\":\n- {\n- \"offset\": 204,\n- \"slope\": 0.01633\n- },\n- \"rpi.sdn\":\n- {\n-\n- },\n- \"rpi.awb\":\n- {\n- \"priors\":\n- [\n- {\n- \"lux\": 0, \"prior\":\n- [\n- 2000, 1.0, 3000, 0.0, 13000, 0.0\n- ]\n- },\n- {\n- \"lux\": 800, \"prior\":\n- [\n- 2000, 0.0, 6000, 2.0, 13000, 2.0\n- ]\n- },\n+ \"version\": 2.0,\n+ \"target\": \"bcm2835\",\n+ \"algorithms\": [\n+ {\n+ \"rpi.black_level\":\n {\n- \"lux\": 1500, \"prior\":\n- [\n- 2000, 0.0, 4000, 1.0, 6000, 6.0, 6500, 7.0, 7000, 1.0, 13000, 1.0\n- ]\n+ \"black_level\": 4096\n }\n- ],\n- \"modes\":\n+ },\n {\n- \"auto\":\n- {\n- \"lo\": 2500,\n- \"hi\": 8000\n- },\n- \"incandescent\":\n- {\n- \"lo\": 2500,\n- \"hi\": 3000\n- },\n- \"tungsten\":\n- {\n- \"lo\": 3000,\n- \"hi\": 3500\n- },\n- \"fluorescent\":\n- {\n- \"lo\": 4000,\n- \"hi\": 4700\n- },\n- \"indoor\":\n- {\n- \"lo\": 3000,\n- \"hi\": 5000\n- },\n- \"daylight\":\n- {\n- \"lo\": 5500,\n- \"hi\": 6500\n- },\n- \"cloudy\":\n+ \"rpi.dpc\": { }\n+ },\n+ {\n+ \"rpi.lux\":\n {\n- \"lo\": 7000,\n- \"hi\": 8600\n+ \"reference_shutter_speed\": 27685,\n+ \"reference_gain\": 1.0,\n+ \"reference_aperture\": 1.0,\n+ \"reference_lux\": 998,\n+ \"reference_Y\": 12744\n }\n },\n- \"bayes\": 1,\n- \"ct_curve\":\n- [\n- 2498.0, 0.9309, 0.3599, 2911.0, 0.8682, 0.4283, 2919.0, 0.8358, 0.4621, 3627.0, 0.7646, 0.5327, 4600.0, 0.6079, 0.6721, 5716.0,\n- 0.5712, 0.7017, 8575.0, 0.4331, 0.8037\n- ],\n- \"sensitivity_r\": 1.05,\n- \"sensitivity_b\": 1.05,\n- \"transverse_pos\": 0.04791,\n- \"transverse_neg\": 0.04881\n- },\n- \"rpi.agc\":\n- {\n- \"metering_modes\":\n {\n- \"centre-weighted\":\n- {\n- \"weights\":\n- [\n- 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0\n- ]\n- },\n- \"spot\":\n- {\n- \"weights\":\n- [\n- 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0\n- ]\n- },\n- \"matrix\":\n+ \"rpi.noise\":\n {\n- \"weights\":\n- [\n- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1\n- ]\n+ \"reference_constant\": 0,\n+ \"reference_slope\": 3.67\n }\n },\n- \"exposure_modes\":\n {\n- \"normal\":\n+ \"rpi.geq\":\n {\n- \"shutter\":\n- [\n- 100, 10000, 30000, 60000, 66666\n- ],\n- \"gain\":\n- [\n- 1.0, 2.0, 4.0, 6.0, 8.0\n- ]\n- },\n- \"short\":\n+ \"offset\": 204,\n+ \"slope\": 0.01633\n+ }\n+ },\n+ {\n+ \"rpi.sdn\": { }\n+ },\n+ {\n+ \"rpi.awb\":\n {\n- \"shutter\":\n- [\n- 100, 5000, 10000, 20000, 33333\n+ \"priors\": [\n+ {\n+ \"lux\": 0,\n+ \"prior\":\n+ [\n+ 2000, 1.0,\n+ 3000, 0.0,\n+ 13000, 0.0\n+ ]\n+ },\n+ {\n+ \"lux\": 800,\n+ \"prior\":\n+ [\n+ 2000, 0.0,\n+ 6000, 2.0,\n+ 13000, 2.0\n+ ]\n+ },\n+ {\n+ \"lux\": 1500,\n+ \"prior\":\n+ [\n+ 2000, 0.0,\n+ 4000, 1.0,\n+ 6000, 6.0,\n+ 6500, 7.0,\n+ 7000, 1.0,\n+ 13000, 1.0\n+ ]\n+ }\n ],\n- \"gain\":\n- [\n- 1.0, 2.0, 4.0, 6.0, 8.0\n- ]\n- },\n- \"long\":\n- {\n- \"shutter\":\n+ \"modes\":\n+ {\n+ \"auto\":\n+ {\n+ \"lo\": 2500,\n+ \"hi\": 8000\n+ },\n+ \"incandescent\":\n+ {\n+ \"lo\": 2500,\n+ \"hi\": 3000\n+ },\n+ \"tungsten\":\n+ {\n+ \"lo\": 3000,\n+ \"hi\": 3500\n+ },\n+ \"fluorescent\":\n+ {\n+ \"lo\": 4000,\n+ \"hi\": 4700\n+ },\n+ \"indoor\":\n+ {\n+ \"lo\": 3000,\n+ \"hi\": 5000\n+ },\n+ \"daylight\":\n+ {\n+ \"lo\": 5500,\n+ \"hi\": 6500\n+ },\n+ \"cloudy\":\n+ {\n+ \"lo\": 7000,\n+ \"hi\": 8600\n+ }\n+ },\n+ \"bayes\": 1,\n+ \"ct_curve\":\n [\n- 100, 10000, 30000, 60000, 120000\n+ 2498.0, 0.9309, 0.3599,\n+ 2911.0, 0.8682, 0.4283,\n+ 2919.0, 0.8358, 0.4621,\n+ 3627.0, 0.7646, 0.5327,\n+ 4600.0, 0.6079, 0.6721,\n+ 5716.0, 0.5712, 0.7017,\n+ 8575.0, 0.4331, 0.8037\n ],\n- \"gain\":\n- [\n- 1.0, 2.0, 4.0, 6.0, 12.0\n- ]\n+ \"sensitivity_r\": 1.05,\n+ \"sensitivity_b\": 1.05,\n+ \"transverse_pos\": 0.04791,\n+ \"transverse_neg\": 0.04881\n }\n },\n- \"constraint_modes\":\n {\n- \"normal\":\n- [\n- {\n- \"bound\": \"LOWER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.5, 1000, 0.5\n- ]\n- }\n- ],\n- \"highlight\":\n- [\n+ \"rpi.agc\":\n+ {\n+ \"metering_modes\":\n {\n- \"bound\": \"LOWER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.5, 1000, 0.5\n- ]\n+ \"centre-weighted\":\n+ {\n+ \"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+ },\n+ \"spot\":\n+ {\n+ \"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+ },\n+ \"matrix\":\n+ {\n+ \"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+ }\n },\n+ \"exposure_modes\":\n {\n- \"bound\": \"UPPER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.8, 1000, 0.8\n- ]\n- }\n- ],\n- \"shadows\":\n- [\n+ \"normal\":\n+ {\n+ \"shutter\": [ 100, 10000, 30000, 60000, 66666 ],\n+ \"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+ },\n+ \"short\":\n+ {\n+ \"shutter\": [ 100, 5000, 10000, 20000, 33333 ],\n+ \"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+ },\n+ \"long\":\n+ {\n+ \"shutter\": [ 100, 10000, 30000, 60000, 120000 ],\n+ \"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+ }\n+ },\n+ \"constraint_modes\":\n {\n- \"bound\": \"LOWER\", \"q_lo\": 0.0, \"q_hi\": 0.5, \"y_target\":\n- [\n- 0, 0.17, 1000, 0.17\n+ \"normal\": [\n+ {\n+ \"bound\": \"LOWER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.5,\n+ 1000, 0.5\n+ ]\n+ }\n+ ],\n+ \"highlight\": [\n+ {\n+ \"bound\": \"LOWER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.5,\n+ 1000, 0.5\n+ ]\n+ },\n+ {\n+ \"bound\": \"UPPER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.8,\n+ 1000, 0.8\n+ ]\n+ }\n+ ],\n+ \"shadows\": [\n+ {\n+ \"bound\": \"LOWER\",\n+ \"q_lo\": 0.0,\n+ \"q_hi\": 0.5,\n+ \"y_target\":\n+ [\n+ 0, 0.17,\n+ 1000, 0.17\n+ ]\n+ }\n ]\n- }\n- ]\n- },\n- \"y_target\":\n- [\n- 0, 0.16, 1000, 0.165, 10000, 0.17\n- ]\n- },\n- \"rpi.alsc\":\n- {\n- \"omega\": 1.3,\n- \"n_iter\": 100,\n- \"luminance_strength\": 0.7,\n- \"calibrations_Cr\":\n- [\n- {\n- \"ct\": 3000, \"table\":\n- [\n- 1.487, 1.481, 1.481, 1.445, 1.389, 1.327, 1.307, 1.307, 1.307, 1.309, 1.341, 1.405, 1.458, 1.494, 1.494, 1.497,\n- 1.491, 1.481, 1.448, 1.397, 1.331, 1.275, 1.243, 1.229, 1.229, 1.249, 1.287, 1.349, 1.409, 1.463, 1.494, 1.497,\n- 1.491, 1.469, 1.405, 1.331, 1.275, 1.217, 1.183, 1.172, 1.172, 1.191, 1.231, 1.287, 1.349, 1.424, 1.484, 1.499,\n- 1.487, 1.444, 1.363, 1.283, 1.217, 1.183, 1.148, 1.138, 1.138, 1.159, 1.191, 1.231, 1.302, 1.385, 1.461, 1.492,\n- 1.481, 1.423, 1.334, 1.253, 1.189, 1.148, 1.135, 1.119, 1.123, 1.137, 1.159, 1.203, 1.272, 1.358, 1.442, 1.488,\n- 1.479, 1.413, 1.321, 1.236, 1.176, 1.139, 1.118, 1.114, 1.116, 1.123, 1.149, 1.192, 1.258, 1.344, 1.432, 1.487,\n- 1.479, 1.413, 1.321, 1.236, 1.176, 1.139, 1.116, 1.114, 1.115, 1.123, 1.149, 1.192, 1.258, 1.344, 1.432, 1.487,\n- 1.479, 1.425, 1.336, 1.251, 1.189, 1.149, 1.136, 1.118, 1.121, 1.138, 1.158, 1.206, 1.275, 1.358, 1.443, 1.488,\n- 1.488, 1.448, 1.368, 1.285, 1.219, 1.189, 1.149, 1.139, 1.139, 1.158, 1.195, 1.235, 1.307, 1.387, 1.462, 1.493,\n- 1.496, 1.475, 1.411, 1.337, 1.284, 1.219, 1.189, 1.176, 1.176, 1.195, 1.235, 1.296, 1.356, 1.429, 1.487, 1.501,\n- 1.495, 1.489, 1.458, 1.407, 1.337, 1.287, 1.253, 1.239, 1.239, 1.259, 1.296, 1.356, 1.419, 1.472, 1.499, 1.499,\n- 1.494, 1.489, 1.489, 1.453, 1.398, 1.336, 1.317, 1.317, 1.317, 1.321, 1.351, 1.416, 1.467, 1.501, 1.501, 1.499\n- ]\n- },\n- {\n- \"ct\": 3850, \"table\":\n- [\n- 1.694, 1.688, 1.688, 1.649, 1.588, 1.518, 1.495, 1.495, 1.495, 1.497, 1.532, 1.602, 1.659, 1.698, 1.698, 1.703,\n- 1.698, 1.688, 1.653, 1.597, 1.525, 1.464, 1.429, 1.413, 1.413, 1.437, 1.476, 1.542, 1.606, 1.665, 1.698, 1.703,\n- 1.697, 1.673, 1.605, 1.525, 1.464, 1.401, 1.369, 1.354, 1.354, 1.377, 1.417, 1.476, 1.542, 1.623, 1.687, 1.705,\n- 1.692, 1.646, 1.561, 1.472, 1.401, 1.368, 1.337, 1.323, 1.324, 1.348, 1.377, 1.417, 1.492, 1.583, 1.661, 1.697,\n- 1.686, 1.625, 1.528, 1.439, 1.372, 1.337, 1.321, 1.311, 1.316, 1.324, 1.348, 1.389, 1.461, 1.553, 1.642, 1.694,\n- 1.684, 1.613, 1.514, 1.423, 1.359, 1.328, 1.311, 1.306, 1.306, 1.316, 1.339, 1.378, 1.446, 1.541, 1.633, 1.693,\n- 1.684, 1.613, 1.514, 1.423, 1.359, 1.328, 1.311, 1.305, 1.305, 1.316, 1.339, 1.378, 1.446, 1.541, 1.633, 1.693,\n- 1.685, 1.624, 1.529, 1.438, 1.372, 1.336, 1.324, 1.309, 1.314, 1.323, 1.348, 1.392, 1.462, 1.555, 1.646, 1.694,\n- 1.692, 1.648, 1.561, 1.473, 1.403, 1.372, 1.336, 1.324, 1.324, 1.348, 1.378, 1.423, 1.495, 1.585, 1.667, 1.701,\n- 1.701, 1.677, 1.608, 1.527, 1.471, 1.403, 1.375, 1.359, 1.359, 1.378, 1.423, 1.488, 1.549, 1.631, 1.694, 1.709,\n- 1.702, 1.694, 1.656, 1.601, 1.527, 1.473, 1.441, 1.424, 1.424, 1.443, 1.488, 1.549, 1.621, 1.678, 1.706, 1.707,\n- 1.699, 1.694, 1.694, 1.654, 1.593, 1.525, 1.508, 1.508, 1.508, 1.509, 1.546, 1.614, 1.674, 1.708, 1.708, 1.707\n- ]\n- },\n- {\n- \"ct\": 6000, \"table\":\n+ },\n+ \"y_target\":\n [\n- 2.179, 2.176, 2.176, 2.125, 2.048, 1.975, 1.955, 1.954, 1.954, 1.956, 1.993, 2.071, 2.141, 2.184, 2.185, 2.188,\n- 2.189, 2.176, 2.128, 2.063, 1.973, 1.908, 1.872, 1.856, 1.856, 1.876, 1.922, 1.999, 2.081, 2.144, 2.184, 2.192,\n- 2.187, 2.152, 2.068, 1.973, 1.907, 1.831, 1.797, 1.786, 1.786, 1.804, 1.853, 1.922, 1.999, 2.089, 2.166, 2.191,\n- 2.173, 2.117, 2.013, 1.908, 1.831, 1.791, 1.755, 1.749, 1.749, 1.767, 1.804, 1.853, 1.939, 2.041, 2.135, 2.181,\n- 2.166, 2.089, 1.975, 1.869, 1.792, 1.755, 1.741, 1.731, 1.734, 1.749, 1.767, 1.818, 1.903, 2.005, 2.111, 2.173,\n- 2.165, 2.074, 1.956, 1.849, 1.777, 1.742, 1.729, 1.725, 1.729, 1.734, 1.758, 1.804, 1.884, 1.991, 2.099, 2.172,\n- 2.165, 2.074, 1.956, 1.849, 1.777, 1.742, 1.727, 1.724, 1.725, 1.734, 1.758, 1.804, 1.884, 1.991, 2.099, 2.172,\n- 2.166, 2.085, 1.975, 1.869, 1.791, 1.755, 1.741, 1.729, 1.733, 1.749, 1.769, 1.819, 1.904, 2.009, 2.114, 2.174,\n- 2.174, 2.118, 2.015, 1.913, 1.831, 1.791, 1.755, 1.749, 1.749, 1.769, 1.811, 1.855, 1.943, 2.047, 2.139, 2.183,\n- 2.187, 2.151, 2.072, 1.979, 1.911, 1.831, 1.801, 1.791, 1.791, 1.811, 1.855, 1.933, 2.006, 2.101, 2.173, 2.197,\n- 2.189, 2.178, 2.132, 2.069, 1.979, 1.913, 1.879, 1.867, 1.867, 1.891, 1.933, 2.006, 2.091, 2.156, 2.195, 2.197,\n- 2.181, 2.179, 2.178, 2.131, 2.057, 1.981, 1.965, 1.965, 1.965, 1.969, 1.999, 2.083, 2.153, 2.197, 2.197, 2.196\n+ 0, 0.16,\n+ 1000, 0.165,\n+ 10000, 0.17\n ]\n }\n- ],\n- \"calibrations_Cb\":\n- [\n- {\n- \"ct\": 3000, \"table\":\n- [\n- 1.967, 1.961, 1.955, 1.953, 1.954, 1.957, 1.961, 1.963, 1.963, 1.961, 1.959, 1.957, 1.954, 1.951, 1.951, 1.955,\n- 1.961, 1.959, 1.957, 1.956, 1.962, 1.967, 1.975, 1.979, 1.979, 1.975, 1.971, 1.967, 1.957, 1.952, 1.951, 1.951,\n- 1.959, 1.959, 1.959, 1.966, 1.976, 1.989, 1.999, 2.004, 2.003, 1.997, 1.991, 1.981, 1.967, 1.956, 1.951, 1.951,\n- 1.959, 1.962, 1.967, 1.978, 1.993, 2.009, 2.021, 2.028, 2.026, 2.021, 2.011, 1.995, 1.981, 1.964, 1.953, 1.951,\n- 1.961, 1.965, 1.977, 1.993, 2.009, 2.023, 2.041, 2.047, 2.047, 2.037, 2.024, 2.011, 1.995, 1.975, 1.958, 1.953,\n- 1.963, 1.968, 1.981, 2.001, 2.019, 2.039, 2.046, 2.052, 2.052, 2.051, 2.035, 2.021, 2.001, 1.978, 1.959, 1.955,\n- 1.961, 1.966, 1.981, 2.001, 2.019, 2.038, 2.043, 2.051, 2.052, 2.042, 2.034, 2.019, 2.001, 1.978, 1.959, 1.954,\n- 1.957, 1.961, 1.972, 1.989, 2.003, 2.021, 2.038, 2.039, 2.039, 2.034, 2.019, 2.004, 1.988, 1.971, 1.954, 1.949,\n- 1.952, 1.953, 1.959, 1.972, 1.989, 2.003, 2.016, 2.019, 2.019, 2.014, 2.003, 1.988, 1.971, 1.955, 1.948, 1.947,\n- 1.949, 1.948, 1.949, 1.957, 1.971, 1.978, 1.991, 1.994, 1.994, 1.989, 1.979, 1.967, 1.954, 1.946, 1.947, 1.947,\n- 1.949, 1.946, 1.944, 1.946, 1.949, 1.954, 1.962, 1.967, 1.967, 1.963, 1.956, 1.948, 1.943, 1.943, 1.946, 1.949,\n- 1.951, 1.946, 1.944, 1.942, 1.943, 1.943, 1.947, 1.948, 1.949, 1.947, 1.945, 1.941, 1.938, 1.939, 1.948, 1.952\n- ]\n- },\n- {\n- \"ct\": 3850, \"table\":\n- [\n- 1.726, 1.724, 1.722, 1.723, 1.731, 1.735, 1.743, 1.746, 1.746, 1.741, 1.735, 1.729, 1.725, 1.721, 1.721, 1.721,\n- 1.724, 1.723, 1.723, 1.727, 1.735, 1.744, 1.749, 1.756, 1.756, 1.749, 1.744, 1.735, 1.727, 1.719, 1.719, 1.719,\n- 1.723, 1.723, 1.724, 1.735, 1.746, 1.759, 1.767, 1.775, 1.775, 1.766, 1.758, 1.746, 1.735, 1.723, 1.718, 1.716,\n- 1.723, 1.725, 1.732, 1.746, 1.759, 1.775, 1.782, 1.792, 1.792, 1.782, 1.772, 1.759, 1.745, 1.729, 1.718, 1.716,\n- 1.725, 1.729, 1.738, 1.756, 1.775, 1.785, 1.796, 1.803, 1.804, 1.794, 1.783, 1.772, 1.757, 1.736, 1.722, 1.718,\n- 1.728, 1.731, 1.741, 1.759, 1.781, 1.795, 1.803, 1.806, 1.808, 1.805, 1.791, 1.779, 1.762, 1.739, 1.722, 1.721,\n- 1.727, 1.731, 1.741, 1.759, 1.781, 1.791, 1.799, 1.804, 1.806, 1.801, 1.791, 1.779, 1.762, 1.739, 1.722, 1.717,\n- 1.722, 1.724, 1.733, 1.751, 1.768, 1.781, 1.791, 1.796, 1.799, 1.791, 1.781, 1.766, 1.754, 1.731, 1.717, 1.714,\n- 1.718, 1.718, 1.724, 1.737, 1.752, 1.768, 1.776, 1.782, 1.784, 1.781, 1.766, 1.754, 1.737, 1.724, 1.713, 1.709,\n- 1.716, 1.715, 1.716, 1.725, 1.737, 1.749, 1.756, 1.763, 1.764, 1.762, 1.749, 1.737, 1.724, 1.717, 1.709, 1.708,\n- 1.715, 1.714, 1.712, 1.715, 1.722, 1.729, 1.736, 1.741, 1.742, 1.739, 1.731, 1.723, 1.717, 1.712, 1.711, 1.709,\n- 1.716, 1.714, 1.711, 1.712, 1.715, 1.719, 1.723, 1.728, 1.731, 1.729, 1.723, 1.718, 1.711, 1.711, 1.713, 1.713\n- ]\n- },\n+ },\n+ {\n+ \"rpi.alsc\":\n {\n- \"ct\": 6000, \"table\":\n+ \"omega\": 1.3,\n+ \"n_iter\": 100,\n+ \"luminance_strength\": 0.7,\n+ \"calibrations_Cr\": [\n+ {\n+ \"ct\": 3000,\n+ \"table\":\n+ [\n+ 1.487, 1.481, 1.481, 1.445, 1.389, 1.327, 1.307, 1.307, 1.307, 1.309, 1.341, 1.405, 1.458, 1.494, 1.494, 1.497,\n+ 1.491, 1.481, 1.448, 1.397, 1.331, 1.275, 1.243, 1.229, 1.229, 1.249, 1.287, 1.349, 1.409, 1.463, 1.494, 1.497,\n+ 1.491, 1.469, 1.405, 1.331, 1.275, 1.217, 1.183, 1.172, 1.172, 1.191, 1.231, 1.287, 1.349, 1.424, 1.484, 1.499,\n+ 1.487, 1.444, 1.363, 1.283, 1.217, 1.183, 1.148, 1.138, 1.138, 1.159, 1.191, 1.231, 1.302, 1.385, 1.461, 1.492,\n+ 1.481, 1.423, 1.334, 1.253, 1.189, 1.148, 1.135, 1.119, 1.123, 1.137, 1.159, 1.203, 1.272, 1.358, 1.442, 1.488,\n+ 1.479, 1.413, 1.321, 1.236, 1.176, 1.139, 1.118, 1.114, 1.116, 1.123, 1.149, 1.192, 1.258, 1.344, 1.432, 1.487,\n+ 1.479, 1.413, 1.321, 1.236, 1.176, 1.139, 1.116, 1.114, 1.115, 1.123, 1.149, 1.192, 1.258, 1.344, 1.432, 1.487,\n+ 1.479, 1.425, 1.336, 1.251, 1.189, 1.149, 1.136, 1.118, 1.121, 1.138, 1.158, 1.206, 1.275, 1.358, 1.443, 1.488,\n+ 1.488, 1.448, 1.368, 1.285, 1.219, 1.189, 1.149, 1.139, 1.139, 1.158, 1.195, 1.235, 1.307, 1.387, 1.462, 1.493,\n+ 1.496, 1.475, 1.411, 1.337, 1.284, 1.219, 1.189, 1.176, 1.176, 1.195, 1.235, 1.296, 1.356, 1.429, 1.487, 1.501,\n+ 1.495, 1.489, 1.458, 1.407, 1.337, 1.287, 1.253, 1.239, 1.239, 1.259, 1.296, 1.356, 1.419, 1.472, 1.499, 1.499,\n+ 1.494, 1.489, 1.489, 1.453, 1.398, 1.336, 1.317, 1.317, 1.317, 1.321, 1.351, 1.416, 1.467, 1.501, 1.501, 1.499\n+ ]\n+ },\n+ {\n+ \"ct\": 3850,\n+ \"table\":\n+ [\n+ 1.694, 1.688, 1.688, 1.649, 1.588, 1.518, 1.495, 1.495, 1.495, 1.497, 1.532, 1.602, 1.659, 1.698, 1.698, 1.703,\n+ 1.698, 1.688, 1.653, 1.597, 1.525, 1.464, 1.429, 1.413, 1.413, 1.437, 1.476, 1.542, 1.606, 1.665, 1.698, 1.703,\n+ 1.697, 1.673, 1.605, 1.525, 1.464, 1.401, 1.369, 1.354, 1.354, 1.377, 1.417, 1.476, 1.542, 1.623, 1.687, 1.705,\n+ 1.692, 1.646, 1.561, 1.472, 1.401, 1.368, 1.337, 1.323, 1.324, 1.348, 1.377, 1.417, 1.492, 1.583, 1.661, 1.697,\n+ 1.686, 1.625, 1.528, 1.439, 1.372, 1.337, 1.321, 1.311, 1.316, 1.324, 1.348, 1.389, 1.461, 1.553, 1.642, 1.694,\n+ 1.684, 1.613, 1.514, 1.423, 1.359, 1.328, 1.311, 1.306, 1.306, 1.316, 1.339, 1.378, 1.446, 1.541, 1.633, 1.693,\n+ 1.684, 1.613, 1.514, 1.423, 1.359, 1.328, 1.311, 1.305, 1.305, 1.316, 1.339, 1.378, 1.446, 1.541, 1.633, 1.693,\n+ 1.685, 1.624, 1.529, 1.438, 1.372, 1.336, 1.324, 1.309, 1.314, 1.323, 1.348, 1.392, 1.462, 1.555, 1.646, 1.694,\n+ 1.692, 1.648, 1.561, 1.473, 1.403, 1.372, 1.336, 1.324, 1.324, 1.348, 1.378, 1.423, 1.495, 1.585, 1.667, 1.701,\n+ 1.701, 1.677, 1.608, 1.527, 1.471, 1.403, 1.375, 1.359, 1.359, 1.378, 1.423, 1.488, 1.549, 1.631, 1.694, 1.709,\n+ 1.702, 1.694, 1.656, 1.601, 1.527, 1.473, 1.441, 1.424, 1.424, 1.443, 1.488, 1.549, 1.621, 1.678, 1.706, 1.707,\n+ 1.699, 1.694, 1.694, 1.654, 1.593, 1.525, 1.508, 1.508, 1.508, 1.509, 1.546, 1.614, 1.674, 1.708, 1.708, 1.707\n+ ]\n+ },\n+ {\n+ \"ct\": 6000,\n+ \"table\":\n+ [\n+ 2.179, 2.176, 2.176, 2.125, 2.048, 1.975, 1.955, 1.954, 1.954, 1.956, 1.993, 2.071, 2.141, 2.184, 2.185, 2.188,\n+ 2.189, 2.176, 2.128, 2.063, 1.973, 1.908, 1.872, 1.856, 1.856, 1.876, 1.922, 1.999, 2.081, 2.144, 2.184, 2.192,\n+ 2.187, 2.152, 2.068, 1.973, 1.907, 1.831, 1.797, 1.786, 1.786, 1.804, 1.853, 1.922, 1.999, 2.089, 2.166, 2.191,\n+ 2.173, 2.117, 2.013, 1.908, 1.831, 1.791, 1.755, 1.749, 1.749, 1.767, 1.804, 1.853, 1.939, 2.041, 2.135, 2.181,\n+ 2.166, 2.089, 1.975, 1.869, 1.792, 1.755, 1.741, 1.731, 1.734, 1.749, 1.767, 1.818, 1.903, 2.005, 2.111, 2.173,\n+ 2.165, 2.074, 1.956, 1.849, 1.777, 1.742, 1.729, 1.725, 1.729, 1.734, 1.758, 1.804, 1.884, 1.991, 2.099, 2.172,\n+ 2.165, 2.074, 1.956, 1.849, 1.777, 1.742, 1.727, 1.724, 1.725, 1.734, 1.758, 1.804, 1.884, 1.991, 2.099, 2.172,\n+ 2.166, 2.085, 1.975, 1.869, 1.791, 1.755, 1.741, 1.729, 1.733, 1.749, 1.769, 1.819, 1.904, 2.009, 2.114, 2.174,\n+ 2.174, 2.118, 2.015, 1.913, 1.831, 1.791, 1.755, 1.749, 1.749, 1.769, 1.811, 1.855, 1.943, 2.047, 2.139, 2.183,\n+ 2.187, 2.151, 2.072, 1.979, 1.911, 1.831, 1.801, 1.791, 1.791, 1.811, 1.855, 1.933, 2.006, 2.101, 2.173, 2.197,\n+ 2.189, 2.178, 2.132, 2.069, 1.979, 1.913, 1.879, 1.867, 1.867, 1.891, 1.933, 2.006, 2.091, 2.156, 2.195, 2.197,\n+ 2.181, 2.179, 2.178, 2.131, 2.057, 1.981, 1.965, 1.965, 1.965, 1.969, 1.999, 2.083, 2.153, 2.197, 2.197, 2.196\n+ ]\n+ }\n+ ],\n+ \"calibrations_Cb\": [\n+ {\n+ \"ct\": 3000,\n+ \"table\":\n+ [\n+ 1.967, 1.961, 1.955, 1.953, 1.954, 1.957, 1.961, 1.963, 1.963, 1.961, 1.959, 1.957, 1.954, 1.951, 1.951, 1.955,\n+ 1.961, 1.959, 1.957, 1.956, 1.962, 1.967, 1.975, 1.979, 1.979, 1.975, 1.971, 1.967, 1.957, 1.952, 1.951, 1.951,\n+ 1.959, 1.959, 1.959, 1.966, 1.976, 1.989, 1.999, 2.004, 2.003, 1.997, 1.991, 1.981, 1.967, 1.956, 1.951, 1.951,\n+ 1.959, 1.962, 1.967, 1.978, 1.993, 2.009, 2.021, 2.028, 2.026, 2.021, 2.011, 1.995, 1.981, 1.964, 1.953, 1.951,\n+ 1.961, 1.965, 1.977, 1.993, 2.009, 2.023, 2.041, 2.047, 2.047, 2.037, 2.024, 2.011, 1.995, 1.975, 1.958, 1.953,\n+ 1.963, 1.968, 1.981, 2.001, 2.019, 2.039, 2.046, 2.052, 2.052, 2.051, 2.035, 2.021, 2.001, 1.978, 1.959, 1.955,\n+ 1.961, 1.966, 1.981, 2.001, 2.019, 2.038, 2.043, 2.051, 2.052, 2.042, 2.034, 2.019, 2.001, 1.978, 1.959, 1.954,\n+ 1.957, 1.961, 1.972, 1.989, 2.003, 2.021, 2.038, 2.039, 2.039, 2.034, 2.019, 2.004, 1.988, 1.971, 1.954, 1.949,\n+ 1.952, 1.953, 1.959, 1.972, 1.989, 2.003, 2.016, 2.019, 2.019, 2.014, 2.003, 1.988, 1.971, 1.955, 1.948, 1.947,\n+ 1.949, 1.948, 1.949, 1.957, 1.971, 1.978, 1.991, 1.994, 1.994, 1.989, 1.979, 1.967, 1.954, 1.946, 1.947, 1.947,\n+ 1.949, 1.946, 1.944, 1.946, 1.949, 1.954, 1.962, 1.967, 1.967, 1.963, 1.956, 1.948, 1.943, 1.943, 1.946, 1.949,\n+ 1.951, 1.946, 1.944, 1.942, 1.943, 1.943, 1.947, 1.948, 1.949, 1.947, 1.945, 1.941, 1.938, 1.939, 1.948, 1.952\n+ ]\n+ },\n+ {\n+ \"ct\": 3850,\n+ \"table\":\n+ [\n+ 1.726, 1.724, 1.722, 1.723, 1.731, 1.735, 1.743, 1.746, 1.746, 1.741, 1.735, 1.729, 1.725, 1.721, 1.721, 1.721,\n+ 1.724, 1.723, 1.723, 1.727, 1.735, 1.744, 1.749, 1.756, 1.756, 1.749, 1.744, 1.735, 1.727, 1.719, 1.719, 1.719,\n+ 1.723, 1.723, 1.724, 1.735, 1.746, 1.759, 1.767, 1.775, 1.775, 1.766, 1.758, 1.746, 1.735, 1.723, 1.718, 1.716,\n+ 1.723, 1.725, 1.732, 1.746, 1.759, 1.775, 1.782, 1.792, 1.792, 1.782, 1.772, 1.759, 1.745, 1.729, 1.718, 1.716,\n+ 1.725, 1.729, 1.738, 1.756, 1.775, 1.785, 1.796, 1.803, 1.804, 1.794, 1.783, 1.772, 1.757, 1.736, 1.722, 1.718,\n+ 1.728, 1.731, 1.741, 1.759, 1.781, 1.795, 1.803, 1.806, 1.808, 1.805, 1.791, 1.779, 1.762, 1.739, 1.722, 1.721,\n+ 1.727, 1.731, 1.741, 1.759, 1.781, 1.791, 1.799, 1.804, 1.806, 1.801, 1.791, 1.779, 1.762, 1.739, 1.722, 1.717,\n+ 1.722, 1.724, 1.733, 1.751, 1.768, 1.781, 1.791, 1.796, 1.799, 1.791, 1.781, 1.766, 1.754, 1.731, 1.717, 1.714,\n+ 1.718, 1.718, 1.724, 1.737, 1.752, 1.768, 1.776, 1.782, 1.784, 1.781, 1.766, 1.754, 1.737, 1.724, 1.713, 1.709,\n+ 1.716, 1.715, 1.716, 1.725, 1.737, 1.749, 1.756, 1.763, 1.764, 1.762, 1.749, 1.737, 1.724, 1.717, 1.709, 1.708,\n+ 1.715, 1.714, 1.712, 1.715, 1.722, 1.729, 1.736, 1.741, 1.742, 1.739, 1.731, 1.723, 1.717, 1.712, 1.711, 1.709,\n+ 1.716, 1.714, 1.711, 1.712, 1.715, 1.719, 1.723, 1.728, 1.731, 1.729, 1.723, 1.718, 1.711, 1.711, 1.713, 1.713\n+ ]\n+ },\n+ {\n+ \"ct\": 6000,\n+ \"table\":\n+ [\n+ 1.374, 1.372, 1.373, 1.374, 1.375, 1.378, 1.378, 1.381, 1.382, 1.382, 1.378, 1.373, 1.372, 1.369, 1.365, 1.365,\n+ 1.371, 1.371, 1.372, 1.374, 1.378, 1.381, 1.384, 1.386, 1.388, 1.387, 1.384, 1.377, 1.372, 1.368, 1.364, 1.362,\n+ 1.369, 1.371, 1.372, 1.377, 1.383, 1.391, 1.394, 1.396, 1.397, 1.395, 1.391, 1.382, 1.374, 1.369, 1.362, 1.361,\n+ 1.369, 1.371, 1.375, 1.383, 1.391, 1.399, 1.402, 1.404, 1.405, 1.403, 1.398, 1.391, 1.379, 1.371, 1.363, 1.361,\n+ 1.371, 1.373, 1.378, 1.388, 1.399, 1.407, 1.411, 1.413, 1.413, 1.411, 1.405, 1.397, 1.385, 1.374, 1.366, 1.362,\n+ 1.371, 1.374, 1.379, 1.389, 1.405, 1.411, 1.414, 1.414, 1.415, 1.415, 1.411, 1.401, 1.388, 1.376, 1.367, 1.363,\n+ 1.371, 1.373, 1.379, 1.389, 1.405, 1.408, 1.413, 1.414, 1.414, 1.413, 1.409, 1.401, 1.388, 1.376, 1.367, 1.362,\n+ 1.366, 1.369, 1.374, 1.384, 1.396, 1.404, 1.407, 1.408, 1.408, 1.408, 1.401, 1.395, 1.382, 1.371, 1.363, 1.359,\n+ 1.364, 1.365, 1.368, 1.375, 1.386, 1.396, 1.399, 1.401, 1.399, 1.399, 1.395, 1.385, 1.374, 1.365, 1.359, 1.357,\n+ 1.361, 1.363, 1.365, 1.368, 1.377, 1.384, 1.388, 1.391, 1.391, 1.388, 1.385, 1.375, 1.366, 1.361, 1.358, 1.356,\n+ 1.361, 1.362, 1.362, 1.364, 1.367, 1.373, 1.376, 1.377, 1.377, 1.375, 1.373, 1.366, 1.362, 1.358, 1.358, 1.358,\n+ 1.361, 1.362, 1.362, 1.362, 1.363, 1.367, 1.369, 1.368, 1.367, 1.367, 1.367, 1.364, 1.358, 1.357, 1.358, 1.359\n+ ]\n+ }\n+ ],\n+ \"luminance_lut\":\n [\n- 1.374, 1.372, 1.373, 1.374, 1.375, 1.378, 1.378, 1.381, 1.382, 1.382, 1.378, 1.373, 1.372, 1.369, 1.365, 1.365,\n- 1.371, 1.371, 1.372, 1.374, 1.378, 1.381, 1.384, 1.386, 1.388, 1.387, 1.384, 1.377, 1.372, 1.368, 1.364, 1.362,\n- 1.369, 1.371, 1.372, 1.377, 1.383, 1.391, 1.394, 1.396, 1.397, 1.395, 1.391, 1.382, 1.374, 1.369, 1.362, 1.361,\n- 1.369, 1.371, 1.375, 1.383, 1.391, 1.399, 1.402, 1.404, 1.405, 1.403, 1.398, 1.391, 1.379, 1.371, 1.363, 1.361,\n- 1.371, 1.373, 1.378, 1.388, 1.399, 1.407, 1.411, 1.413, 1.413, 1.411, 1.405, 1.397, 1.385, 1.374, 1.366, 1.362,\n- 1.371, 1.374, 1.379, 1.389, 1.405, 1.411, 1.414, 1.414, 1.415, 1.415, 1.411, 1.401, 1.388, 1.376, 1.367, 1.363,\n- 1.371, 1.373, 1.379, 1.389, 1.405, 1.408, 1.413, 1.414, 1.414, 1.413, 1.409, 1.401, 1.388, 1.376, 1.367, 1.362,\n- 1.366, 1.369, 1.374, 1.384, 1.396, 1.404, 1.407, 1.408, 1.408, 1.408, 1.401, 1.395, 1.382, 1.371, 1.363, 1.359,\n- 1.364, 1.365, 1.368, 1.375, 1.386, 1.396, 1.399, 1.401, 1.399, 1.399, 1.395, 1.385, 1.374, 1.365, 1.359, 1.357,\n- 1.361, 1.363, 1.365, 1.368, 1.377, 1.384, 1.388, 1.391, 1.391, 1.388, 1.385, 1.375, 1.366, 1.361, 1.358, 1.356,\n- 1.361, 1.362, 1.362, 1.364, 1.367, 1.373, 1.376, 1.377, 1.377, 1.375, 1.373, 1.366, 1.362, 1.358, 1.358, 1.358,\n- 1.361, 1.362, 1.362, 1.362, 1.363, 1.367, 1.369, 1.368, 1.367, 1.367, 1.367, 1.364, 1.358, 1.357, 1.358, 1.359\n- ]\n+ 2.716, 2.568, 2.299, 2.065, 1.845, 1.693, 1.605, 1.597, 1.596, 1.634, 1.738, 1.914, 2.145, 2.394, 2.719, 2.901,\n+ 2.593, 2.357, 2.093, 1.876, 1.672, 1.528, 1.438, 1.393, 1.394, 1.459, 1.569, 1.731, 1.948, 2.169, 2.481, 2.756,\n+ 2.439, 2.197, 1.922, 1.691, 1.521, 1.365, 1.266, 1.222, 1.224, 1.286, 1.395, 1.573, 1.747, 1.988, 2.299, 2.563,\n+ 2.363, 2.081, 1.797, 1.563, 1.376, 1.244, 1.152, 1.099, 1.101, 1.158, 1.276, 1.421, 1.607, 1.851, 2.163, 2.455,\n+ 2.342, 2.003, 1.715, 1.477, 1.282, 1.152, 1.074, 1.033, 1.035, 1.083, 1.163, 1.319, 1.516, 1.759, 2.064, 2.398,\n+ 2.342, 1.985, 1.691, 1.446, 1.249, 1.111, 1.034, 1.004, 1.004, 1.028, 1.114, 1.274, 1.472, 1.716, 2.019, 2.389,\n+ 2.342, 1.991, 1.691, 1.446, 1.249, 1.112, 1.034, 1.011, 1.005, 1.035, 1.114, 1.274, 1.472, 1.716, 2.019, 2.389,\n+ 2.365, 2.052, 1.751, 1.499, 1.299, 1.171, 1.089, 1.039, 1.042, 1.084, 1.162, 1.312, 1.516, 1.761, 2.059, 2.393,\n+ 2.434, 2.159, 1.856, 1.601, 1.403, 1.278, 1.166, 1.114, 1.114, 1.162, 1.266, 1.402, 1.608, 1.847, 2.146, 2.435,\n+ 2.554, 2.306, 2.002, 1.748, 1.563, 1.396, 1.299, 1.247, 1.243, 1.279, 1.386, 1.551, 1.746, 1.977, 2.272, 2.518,\n+ 2.756, 2.493, 2.195, 1.947, 1.739, 1.574, 1.481, 1.429, 1.421, 1.457, 1.559, 1.704, 1.929, 2.159, 2.442, 2.681,\n+ 2.935, 2.739, 2.411, 2.151, 1.922, 1.749, 1.663, 1.628, 1.625, 1.635, 1.716, 1.872, 2.113, 2.368, 2.663, 2.824\n+ ],\n+ \"sigma\": 0.00381,\n+ \"sigma_Cb\": 0.00216\n }\n- ],\n- \"luminance_lut\":\n- [\n- 2.716, 2.568, 2.299, 2.065, 1.845, 1.693, 1.605, 1.597, 1.596, 1.634, 1.738, 1.914, 2.145, 2.394, 2.719, 2.901,\n- 2.593, 2.357, 2.093, 1.876, 1.672, 1.528, 1.438, 1.393, 1.394, 1.459, 1.569, 1.731, 1.948, 2.169, 2.481, 2.756,\n- 2.439, 2.197, 1.922, 1.691, 1.521, 1.365, 1.266, 1.222, 1.224, 1.286, 1.395, 1.573, 1.747, 1.988, 2.299, 2.563,\n- 2.363, 2.081, 1.797, 1.563, 1.376, 1.244, 1.152, 1.099, 1.101, 1.158, 1.276, 1.421, 1.607, 1.851, 2.163, 2.455,\n- 2.342, 2.003, 1.715, 1.477, 1.282, 1.152, 1.074, 1.033, 1.035, 1.083, 1.163, 1.319, 1.516, 1.759, 2.064, 2.398,\n- 2.342, 1.985, 1.691, 1.446, 1.249, 1.111, 1.034, 1.004, 1.004, 1.028, 1.114, 1.274, 1.472, 1.716, 2.019, 2.389,\n- 2.342, 1.991, 1.691, 1.446, 1.249, 1.112, 1.034, 1.011, 1.005, 1.035, 1.114, 1.274, 1.472, 1.716, 2.019, 2.389,\n- 2.365, 2.052, 1.751, 1.499, 1.299, 1.171, 1.089, 1.039, 1.042, 1.084, 1.162, 1.312, 1.516, 1.761, 2.059, 2.393,\n- 2.434, 2.159, 1.856, 1.601, 1.403, 1.278, 1.166, 1.114, 1.114, 1.162, 1.266, 1.402, 1.608, 1.847, 2.146, 2.435,\n- 2.554, 2.306, 2.002, 1.748, 1.563, 1.396, 1.299, 1.247, 1.243, 1.279, 1.386, 1.551, 1.746, 1.977, 2.272, 2.518,\n- 2.756, 2.493, 2.195, 1.947, 1.739, 1.574, 1.481, 1.429, 1.421, 1.457, 1.559, 1.704, 1.929, 2.159, 2.442, 2.681,\n- 2.935, 2.739, 2.411, 2.151, 1.922, 1.749, 1.663, 1.628, 1.625, 1.635, 1.716, 1.872, 2.113, 2.368, 2.663, 2.824\n- ],\n- \"sigma\": 0.00381,\n- \"sigma_Cb\": 0.00216\n- },\n- \"rpi.contrast\":\n- {\n- \"ce_enable\": 1,\n- \"gamma_curve\":\n- [\n- 0, 0, 1024, 5040, 2048, 9338, 3072, 12356, 4096, 15312, 5120, 18051, 6144, 20790, 7168, 23193,\n- 8192, 25744, 9216, 27942, 10240, 30035, 11264, 32005, 12288, 33975, 13312, 35815, 14336, 37600, 15360, 39168,\n- 16384, 40642, 18432, 43379, 20480, 45749, 22528, 47753, 24576, 49621, 26624, 51253, 28672, 52698, 30720, 53796,\n- 32768, 54876, 36864, 57012, 40960, 58656, 45056, 59954, 49152, 61183, 53248, 62355, 57344, 63419, 61440, 64476,\n- 65535, 65535\n- ]\n- },\n- \"rpi.ccm\":\n- {\n- \"ccms\":\n- [\n- {\n- \"ct\": 2498, \"ccm\":\n- [\n- 1.58731, -0.18011, -0.40721, -0.60639, 2.03422, -0.42782, -0.19612, -1.69203, 2.88815\n- ]\n- },\n- {\n- \"ct\": 2811, \"ccm\":\n- [\n- 1.61593, -0.33164, -0.28429, -0.55048, 1.97779, -0.42731, -0.12042, -1.42847, 2.54889\n- ]\n- },\n- {\n- \"ct\": 2911, \"ccm\":\n- [\n- 1.62771, -0.41282, -0.21489, -0.57991, 2.04176, -0.46186, -0.07613, -1.13359, 2.20972\n- ]\n- },\n- {\n- \"ct\": 2919, \"ccm\":\n- [\n- 1.62661, -0.37736, -0.24925, -0.52519, 1.95233, -0.42714, -0.10842, -1.34929, 2.45771\n- ]\n- },\n- {\n- \"ct\": 3627, \"ccm\":\n- [\n- 1.70385, -0.57231, -0.13154, -0.47763, 1.85998, -0.38235, -0.07467, -0.82678, 1.90145\n- ]\n- },\n- {\n- \"ct\": 4600, \"ccm\":\n- [\n- 1.68486, -0.61085, -0.07402, -0.41927, 2.04016, -0.62089, -0.08633, -0.67672, 1.76305\n- ]\n- },\n+ },\n+ {\n+ \"rpi.contrast\":\n {\n- \"ct\": 5716, \"ccm\":\n+ \"ce_enable\": 1,\n+ \"gamma_curve\":\n [\n- 1.80439, -0.73699, -0.06739, -0.36073, 1.83327, -0.47255, -0.08378, -0.56403, 1.64781\n+ 0, 0,\n+ 1024, 5040,\n+ 2048, 9338,\n+ 3072, 12356,\n+ 4096, 15312,\n+ 5120, 18051,\n+ 6144, 20790,\n+ 7168, 23193,\n+ 8192, 25744,\n+ 9216, 27942,\n+ 10240, 30035,\n+ 11264, 32005,\n+ 12288, 33975,\n+ 13312, 35815,\n+ 14336, 37600,\n+ 15360, 39168,\n+ 16384, 40642,\n+ 18432, 43379,\n+ 20480, 45749,\n+ 22528, 47753,\n+ 24576, 49621,\n+ 26624, 51253,\n+ 28672, 52698,\n+ 30720, 53796,\n+ 32768, 54876,\n+ 36864, 57012,\n+ 40960, 58656,\n+ 45056, 59954,\n+ 49152, 61183,\n+ 53248, 62355,\n+ 57344, 63419,\n+ 61440, 64476,\n+ 65535, 65535\n ]\n- },\n+ }\n+ },\n+ {\n+ \"rpi.ccm\":\n {\n- \"ct\": 8575, \"ccm\":\n- [\n- 1.89357, -0.76427, -0.12931, -0.27399, 2.15605, -0.88206, -0.12035, -0.68256, 1.80292\n+ \"ccms\": [\n+ {\n+ \"ct\": 2498,\n+ \"ccm\":\n+ [\n+ 1.58731, -0.18011, -0.40721,\n+ -0.60639, 2.03422, -0.42782,\n+ -0.19612, -1.69203, 2.88815\n+ ]\n+ },\n+ {\n+ \"ct\": 2811,\n+ \"ccm\":\n+ [\n+ 1.61593, -0.33164, -0.28429,\n+ -0.55048, 1.97779, -0.42731,\n+ -0.12042, -1.42847, 2.54889\n+ ]\n+ },\n+ {\n+ \"ct\": 2911,\n+ \"ccm\":\n+ [\n+ 1.62771, -0.41282, -0.21489,\n+ -0.57991, 2.04176, -0.46186,\n+ -0.07613, -1.13359, 2.20972\n+ ]\n+ },\n+ {\n+ \"ct\": 2919,\n+ \"ccm\":\n+ [\n+ 1.62661, -0.37736, -0.24925,\n+ -0.52519, 1.95233, -0.42714,\n+ -0.10842, -1.34929, 2.45771\n+ ]\n+ },\n+ {\n+ \"ct\": 3627,\n+ \"ccm\":\n+ [\n+ 1.70385, -0.57231, -0.13154,\n+ -0.47763, 1.85998, -0.38235,\n+ -0.07467, -0.82678, 1.90145\n+ ]\n+ },\n+ {\n+ \"ct\": 4600,\n+ \"ccm\":\n+ [\n+ 1.68486, -0.61085, -0.07402,\n+ -0.41927, 2.04016, -0.62089,\n+ -0.08633, -0.67672, 1.76305\n+ ]\n+ },\n+ {\n+ \"ct\": 5716,\n+ \"ccm\":\n+ [\n+ 1.80439, -0.73699, -0.06739,\n+ -0.36073, 1.83327, -0.47255,\n+ -0.08378, -0.56403, 1.64781\n+ ]\n+ },\n+ {\n+ \"ct\": 8575,\n+ \"ccm\":\n+ [\n+ 1.89357, -0.76427, -0.12931,\n+ -0.27399, 2.15605, -0.88206,\n+ -0.12035, -0.68256, 1.80292\n+ ]\n+ }\n ]\n }\n- ]\n- },\n- \"rpi.sharpen\":\n- {\n-\n- },\n- \"rpi.dpc\":\n- {\n-\n- }\n-}\n+ },\n+ {\n+ \"rpi.sharpen\": { }\n+ }\n+ ]\n+}\n\\ No newline at end of file\ndiff --git a/src/ipa/raspberrypi/data/imx219_noir.json b/src/ipa/raspberrypi/data/imx219_noir.json\nindex 1835ec3df63b..cfedb9431ebd 100644\n--- a/src/ipa/raspberrypi/data/imx219_noir.json\n+++ b/src/ipa/raspberrypi/data/imx219_noir.json\n@@ -1,344 +1,402 @@\n {\n- \"rpi.black_level\":\n- {\n- \"black_level\": 4096\n- },\n- \"rpi.dpc\":\n- {\n-\n- },\n- \"rpi.lux\":\n- {\n- \"reference_shutter_speed\": 27685,\n- \"reference_gain\": 1.0,\n- \"reference_aperture\": 1.0,\n- \"reference_lux\": 998,\n- \"reference_Y\": 12744\n- },\n- \"rpi.noise\":\n- {\n- \"reference_constant\": 0,\n- \"reference_slope\": 3.67\n- },\n- \"rpi.geq\":\n- {\n- \"offset\": 204,\n- \"slope\": 0.01633\n- },\n- \"rpi.sdn\":\n- {\n-\n- },\n- \"rpi.awb\":\n- {\n- \"bayes\": 0\n- },\n- \"rpi.agc\":\n- {\n- \"metering_modes\":\n+ \"version\": 2.0,\n+ \"target\": \"bcm2835\",\n+ \"algorithms\": [\n {\n- \"centre-weighted\":\n+ \"rpi.black_level\":\n {\n- \"weights\":\n- [\n- 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0\n- ]\n- },\n- \"spot\":\n- {\n- \"weights\":\n- [\n- 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0\n- ]\n- },\n- \"matrix\":\n+ \"black_level\": 4096\n+ }\n+ },\n+ {\n+ \"rpi.dpc\": { }\n+ },\n+ {\n+ \"rpi.lux\":\n {\n- \"weights\":\n- [\n- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1\n- ]\n+ \"reference_shutter_speed\": 27685,\n+ \"reference_gain\": 1.0,\n+ \"reference_aperture\": 1.0,\n+ \"reference_lux\": 998,\n+ \"reference_Y\": 12744\n }\n },\n- \"exposure_modes\":\n {\n- \"normal\":\n+ \"rpi.noise\":\n {\n- \"shutter\":\n- [\n- 100, 10000, 30000, 60000, 66666\n- ],\n- \"gain\":\n- [\n- 1.0, 2.0, 4.0, 6.0, 8.0\n- ]\n- },\n- \"short\":\n+ \"reference_constant\": 0,\n+ \"reference_slope\": 3.67\n+ }\n+ },\n+ {\n+ \"rpi.geq\":\n {\n- \"shutter\":\n- [\n- 100, 5000, 10000, 20000, 33333\n- ],\n- \"gain\":\n- [\n- 1.0, 2.0, 4.0, 6.0, 8.0\n- ]\n- },\n- \"long\":\n+ \"offset\": 204,\n+ \"slope\": 0.01633\n+ }\n+ },\n+ {\n+ \"rpi.sdn\": { }\n+ },\n+ {\n+ \"rpi.awb\":\n {\n- \"shutter\":\n- [\n- 100, 10000, 30000, 60000, 120000\n- ],\n- \"gain\":\n- [\n- 1.0, 2.0, 4.0, 6.0, 12.0\n- ]\n+ \"bayes\": 0\n }\n },\n- \"constraint_modes\":\n {\n- \"normal\":\n- [\n- {\n- \"bound\": \"LOWER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.5, 1000, 0.5\n- ]\n- }\n- ],\n- \"highlight\":\n- [\n+ \"rpi.agc\":\n+ {\n+ \"metering_modes\":\n {\n- \"bound\": \"LOWER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.5, 1000, 0.5\n- ]\n+ \"centre-weighted\":\n+ {\n+ \"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+ },\n+ \"spot\":\n+ {\n+ \"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+ },\n+ \"matrix\":\n+ {\n+ \"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+ }\n },\n+ \"exposure_modes\":\n {\n- \"bound\": \"UPPER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.8, 1000, 0.8\n- ]\n- }\n- ],\n- \"shadows\":\n- [\n+ \"normal\":\n+ {\n+ \"shutter\": [ 100, 10000, 30000, 60000, 66666 ],\n+ \"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+ },\n+ \"short\":\n+ {\n+ \"shutter\": [ 100, 5000, 10000, 20000, 33333 ],\n+ \"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+ },\n+ \"long\":\n+ {\n+ \"shutter\": [ 100, 10000, 30000, 60000, 120000 ],\n+ \"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+ }\n+ },\n+ \"constraint_modes\":\n {\n- \"bound\": \"LOWER\", \"q_lo\": 0.0, \"q_hi\": 0.5, \"y_target\":\n- [\n- 0, 0.17, 1000, 0.17\n+ \"normal\": [\n+ {\n+ \"bound\": \"LOWER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.5,\n+ 1000, 0.5\n+ ]\n+ }\n+ ],\n+ \"highlight\": [\n+ {\n+ \"bound\": \"LOWER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.5,\n+ 1000, 0.5\n+ ]\n+ },\n+ {\n+ \"bound\": \"UPPER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.8,\n+ 1000, 0.8\n+ ]\n+ }\n+ ],\n+ \"shadows\": [\n+ {\n+ \"bound\": \"LOWER\",\n+ \"q_lo\": 0.0,\n+ \"q_hi\": 0.5,\n+ \"y_target\":\n+ [\n+ 0, 0.17,\n+ 1000, 0.17\n+ ]\n+ }\n ]\n- }\n- ]\n- },\n- \"y_target\":\n- [\n- 0, 0.16, 1000, 0.165, 10000, 0.17\n- ]\n- },\n- \"rpi.alsc\":\n- {\n- \"omega\": 1.3,\n- \"n_iter\": 100,\n- \"luminance_strength\": 0.7,\n- \"calibrations_Cr\":\n- [\n- {\n- \"ct\": 3000, \"table\":\n- [\n- 1.487, 1.481, 1.481, 1.445, 1.389, 1.327, 1.307, 1.307, 1.307, 1.309, 1.341, 1.405, 1.458, 1.494, 1.494, 1.497,\n- 1.491, 1.481, 1.448, 1.397, 1.331, 1.275, 1.243, 1.229, 1.229, 1.249, 1.287, 1.349, 1.409, 1.463, 1.494, 1.497,\n- 1.491, 1.469, 1.405, 1.331, 1.275, 1.217, 1.183, 1.172, 1.172, 1.191, 1.231, 1.287, 1.349, 1.424, 1.484, 1.499,\n- 1.487, 1.444, 1.363, 1.283, 1.217, 1.183, 1.148, 1.138, 1.138, 1.159, 1.191, 1.231, 1.302, 1.385, 1.461, 1.492,\n- 1.481, 1.423, 1.334, 1.253, 1.189, 1.148, 1.135, 1.119, 1.123, 1.137, 1.159, 1.203, 1.272, 1.358, 1.442, 1.488,\n- 1.479, 1.413, 1.321, 1.236, 1.176, 1.139, 1.118, 1.114, 1.116, 1.123, 1.149, 1.192, 1.258, 1.344, 1.432, 1.487,\n- 1.479, 1.413, 1.321, 1.236, 1.176, 1.139, 1.116, 1.114, 1.115, 1.123, 1.149, 1.192, 1.258, 1.344, 1.432, 1.487,\n- 1.479, 1.425, 1.336, 1.251, 1.189, 1.149, 1.136, 1.118, 1.121, 1.138, 1.158, 1.206, 1.275, 1.358, 1.443, 1.488,\n- 1.488, 1.448, 1.368, 1.285, 1.219, 1.189, 1.149, 1.139, 1.139, 1.158, 1.195, 1.235, 1.307, 1.387, 1.462, 1.493,\n- 1.496, 1.475, 1.411, 1.337, 1.284, 1.219, 1.189, 1.176, 1.176, 1.195, 1.235, 1.296, 1.356, 1.429, 1.487, 1.501,\n- 1.495, 1.489, 1.458, 1.407, 1.337, 1.287, 1.253, 1.239, 1.239, 1.259, 1.296, 1.356, 1.419, 1.472, 1.499, 1.499,\n- 1.494, 1.489, 1.489, 1.453, 1.398, 1.336, 1.317, 1.317, 1.317, 1.321, 1.351, 1.416, 1.467, 1.501, 1.501, 1.499\n- ]\n- },\n- {\n- \"ct\": 3850, \"table\":\n- [\n- 1.694, 1.688, 1.688, 1.649, 1.588, 1.518, 1.495, 1.495, 1.495, 1.497, 1.532, 1.602, 1.659, 1.698, 1.698, 1.703,\n- 1.698, 1.688, 1.653, 1.597, 1.525, 1.464, 1.429, 1.413, 1.413, 1.437, 1.476, 1.542, 1.606, 1.665, 1.698, 1.703,\n- 1.697, 1.673, 1.605, 1.525, 1.464, 1.401, 1.369, 1.354, 1.354, 1.377, 1.417, 1.476, 1.542, 1.623, 1.687, 1.705,\n- 1.692, 1.646, 1.561, 1.472, 1.401, 1.368, 1.337, 1.323, 1.324, 1.348, 1.377, 1.417, 1.492, 1.583, 1.661, 1.697,\n- 1.686, 1.625, 1.528, 1.439, 1.372, 1.337, 1.321, 1.311, 1.316, 1.324, 1.348, 1.389, 1.461, 1.553, 1.642, 1.694,\n- 1.684, 1.613, 1.514, 1.423, 1.359, 1.328, 1.311, 1.306, 1.306, 1.316, 1.339, 1.378, 1.446, 1.541, 1.633, 1.693,\n- 1.684, 1.613, 1.514, 1.423, 1.359, 1.328, 1.311, 1.305, 1.305, 1.316, 1.339, 1.378, 1.446, 1.541, 1.633, 1.693,\n- 1.685, 1.624, 1.529, 1.438, 1.372, 1.336, 1.324, 1.309, 1.314, 1.323, 1.348, 1.392, 1.462, 1.555, 1.646, 1.694,\n- 1.692, 1.648, 1.561, 1.473, 1.403, 1.372, 1.336, 1.324, 1.324, 1.348, 1.378, 1.423, 1.495, 1.585, 1.667, 1.701,\n- 1.701, 1.677, 1.608, 1.527, 1.471, 1.403, 1.375, 1.359, 1.359, 1.378, 1.423, 1.488, 1.549, 1.631, 1.694, 1.709,\n- 1.702, 1.694, 1.656, 1.601, 1.527, 1.473, 1.441, 1.424, 1.424, 1.443, 1.488, 1.549, 1.621, 1.678, 1.706, 1.707,\n- 1.699, 1.694, 1.694, 1.654, 1.593, 1.525, 1.508, 1.508, 1.508, 1.509, 1.546, 1.614, 1.674, 1.708, 1.708, 1.707\n- ]\n- },\n- {\n- \"ct\": 6000, \"table\":\n+ },\n+ \"y_target\":\n [\n- 2.179, 2.176, 2.176, 2.125, 2.048, 1.975, 1.955, 1.954, 1.954, 1.956, 1.993, 2.071, 2.141, 2.184, 2.185, 2.188,\n- 2.189, 2.176, 2.128, 2.063, 1.973, 1.908, 1.872, 1.856, 1.856, 1.876, 1.922, 1.999, 2.081, 2.144, 2.184, 2.192,\n- 2.187, 2.152, 2.068, 1.973, 1.907, 1.831, 1.797, 1.786, 1.786, 1.804, 1.853, 1.922, 1.999, 2.089, 2.166, 2.191,\n- 2.173, 2.117, 2.013, 1.908, 1.831, 1.791, 1.755, 1.749, 1.749, 1.767, 1.804, 1.853, 1.939, 2.041, 2.135, 2.181,\n- 2.166, 2.089, 1.975, 1.869, 1.792, 1.755, 1.741, 1.731, 1.734, 1.749, 1.767, 1.818, 1.903, 2.005, 2.111, 2.173,\n- 2.165, 2.074, 1.956, 1.849, 1.777, 1.742, 1.729, 1.725, 1.729, 1.734, 1.758, 1.804, 1.884, 1.991, 2.099, 2.172,\n- 2.165, 2.074, 1.956, 1.849, 1.777, 1.742, 1.727, 1.724, 1.725, 1.734, 1.758, 1.804, 1.884, 1.991, 2.099, 2.172,\n- 2.166, 2.085, 1.975, 1.869, 1.791, 1.755, 1.741, 1.729, 1.733, 1.749, 1.769, 1.819, 1.904, 2.009, 2.114, 2.174,\n- 2.174, 2.118, 2.015, 1.913, 1.831, 1.791, 1.755, 1.749, 1.749, 1.769, 1.811, 1.855, 1.943, 2.047, 2.139, 2.183,\n- 2.187, 2.151, 2.072, 1.979, 1.911, 1.831, 1.801, 1.791, 1.791, 1.811, 1.855, 1.933, 2.006, 2.101, 2.173, 2.197,\n- 2.189, 2.178, 2.132, 2.069, 1.979, 1.913, 1.879, 1.867, 1.867, 1.891, 1.933, 2.006, 2.091, 2.156, 2.195, 2.197,\n- 2.181, 2.179, 2.178, 2.131, 2.057, 1.981, 1.965, 1.965, 1.965, 1.969, 1.999, 2.083, 2.153, 2.197, 2.197, 2.196\n+ 0, 0.16,\n+ 1000, 0.165,\n+ 10000, 0.17\n ]\n }\n- ],\n- \"calibrations_Cb\":\n- [\n- {\n- \"ct\": 3000, \"table\":\n- [\n- 1.967, 1.961, 1.955, 1.953, 1.954, 1.957, 1.961, 1.963, 1.963, 1.961, 1.959, 1.957, 1.954, 1.951, 1.951, 1.955,\n- 1.961, 1.959, 1.957, 1.956, 1.962, 1.967, 1.975, 1.979, 1.979, 1.975, 1.971, 1.967, 1.957, 1.952, 1.951, 1.951,\n- 1.959, 1.959, 1.959, 1.966, 1.976, 1.989, 1.999, 2.004, 2.003, 1.997, 1.991, 1.981, 1.967, 1.956, 1.951, 1.951,\n- 1.959, 1.962, 1.967, 1.978, 1.993, 2.009, 2.021, 2.028, 2.026, 2.021, 2.011, 1.995, 1.981, 1.964, 1.953, 1.951,\n- 1.961, 1.965, 1.977, 1.993, 2.009, 2.023, 2.041, 2.047, 2.047, 2.037, 2.024, 2.011, 1.995, 1.975, 1.958, 1.953,\n- 1.963, 1.968, 1.981, 2.001, 2.019, 2.039, 2.046, 2.052, 2.052, 2.051, 2.035, 2.021, 2.001, 1.978, 1.959, 1.955,\n- 1.961, 1.966, 1.981, 2.001, 2.019, 2.038, 2.043, 2.051, 2.052, 2.042, 2.034, 2.019, 2.001, 1.978, 1.959, 1.954,\n- 1.957, 1.961, 1.972, 1.989, 2.003, 2.021, 2.038, 2.039, 2.039, 2.034, 2.019, 2.004, 1.988, 1.971, 1.954, 1.949,\n- 1.952, 1.953, 1.959, 1.972, 1.989, 2.003, 2.016, 2.019, 2.019, 2.014, 2.003, 1.988, 1.971, 1.955, 1.948, 1.947,\n- 1.949, 1.948, 1.949, 1.957, 1.971, 1.978, 1.991, 1.994, 1.994, 1.989, 1.979, 1.967, 1.954, 1.946, 1.947, 1.947,\n- 1.949, 1.946, 1.944, 1.946, 1.949, 1.954, 1.962, 1.967, 1.967, 1.963, 1.956, 1.948, 1.943, 1.943, 1.946, 1.949,\n- 1.951, 1.946, 1.944, 1.942, 1.943, 1.943, 1.947, 1.948, 1.949, 1.947, 1.945, 1.941, 1.938, 1.939, 1.948, 1.952\n- ]\n- },\n- {\n- \"ct\": 3850, \"table\":\n- [\n- 1.726, 1.724, 1.722, 1.723, 1.731, 1.735, 1.743, 1.746, 1.746, 1.741, 1.735, 1.729, 1.725, 1.721, 1.721, 1.721,\n- 1.724, 1.723, 1.723, 1.727, 1.735, 1.744, 1.749, 1.756, 1.756, 1.749, 1.744, 1.735, 1.727, 1.719, 1.719, 1.719,\n- 1.723, 1.723, 1.724, 1.735, 1.746, 1.759, 1.767, 1.775, 1.775, 1.766, 1.758, 1.746, 1.735, 1.723, 1.718, 1.716,\n- 1.723, 1.725, 1.732, 1.746, 1.759, 1.775, 1.782, 1.792, 1.792, 1.782, 1.772, 1.759, 1.745, 1.729, 1.718, 1.716,\n- 1.725, 1.729, 1.738, 1.756, 1.775, 1.785, 1.796, 1.803, 1.804, 1.794, 1.783, 1.772, 1.757, 1.736, 1.722, 1.718,\n- 1.728, 1.731, 1.741, 1.759, 1.781, 1.795, 1.803, 1.806, 1.808, 1.805, 1.791, 1.779, 1.762, 1.739, 1.722, 1.721,\n- 1.727, 1.731, 1.741, 1.759, 1.781, 1.791, 1.799, 1.804, 1.806, 1.801, 1.791, 1.779, 1.762, 1.739, 1.722, 1.717,\n- 1.722, 1.724, 1.733, 1.751, 1.768, 1.781, 1.791, 1.796, 1.799, 1.791, 1.781, 1.766, 1.754, 1.731, 1.717, 1.714,\n- 1.718, 1.718, 1.724, 1.737, 1.752, 1.768, 1.776, 1.782, 1.784, 1.781, 1.766, 1.754, 1.737, 1.724, 1.713, 1.709,\n- 1.716, 1.715, 1.716, 1.725, 1.737, 1.749, 1.756, 1.763, 1.764, 1.762, 1.749, 1.737, 1.724, 1.717, 1.709, 1.708,\n- 1.715, 1.714, 1.712, 1.715, 1.722, 1.729, 1.736, 1.741, 1.742, 1.739, 1.731, 1.723, 1.717, 1.712, 1.711, 1.709,\n- 1.716, 1.714, 1.711, 1.712, 1.715, 1.719, 1.723, 1.728, 1.731, 1.729, 1.723, 1.718, 1.711, 1.711, 1.713, 1.713\n- ]\n- },\n+ },\n+ {\n+ \"rpi.alsc\":\n {\n- \"ct\": 6000, \"table\":\n+ \"omega\": 1.3,\n+ \"n_iter\": 100,\n+ \"luminance_strength\": 0.7,\n+ \"calibrations_Cr\": [\n+ {\n+ \"ct\": 3000,\n+ \"table\":\n+ [\n+ 1.487, 1.481, 1.481, 1.445, 1.389, 1.327, 1.307, 1.307, 1.307, 1.309, 1.341, 1.405, 1.458, 1.494, 1.494, 1.497,\n+ 1.491, 1.481, 1.448, 1.397, 1.331, 1.275, 1.243, 1.229, 1.229, 1.249, 1.287, 1.349, 1.409, 1.463, 1.494, 1.497,\n+ 1.491, 1.469, 1.405, 1.331, 1.275, 1.217, 1.183, 1.172, 1.172, 1.191, 1.231, 1.287, 1.349, 1.424, 1.484, 1.499,\n+ 1.487, 1.444, 1.363, 1.283, 1.217, 1.183, 1.148, 1.138, 1.138, 1.159, 1.191, 1.231, 1.302, 1.385, 1.461, 1.492,\n+ 1.481, 1.423, 1.334, 1.253, 1.189, 1.148, 1.135, 1.119, 1.123, 1.137, 1.159, 1.203, 1.272, 1.358, 1.442, 1.488,\n+ 1.479, 1.413, 1.321, 1.236, 1.176, 1.139, 1.118, 1.114, 1.116, 1.123, 1.149, 1.192, 1.258, 1.344, 1.432, 1.487,\n+ 1.479, 1.413, 1.321, 1.236, 1.176, 1.139, 1.116, 1.114, 1.115, 1.123, 1.149, 1.192, 1.258, 1.344, 1.432, 1.487,\n+ 1.479, 1.425, 1.336, 1.251, 1.189, 1.149, 1.136, 1.118, 1.121, 1.138, 1.158, 1.206, 1.275, 1.358, 1.443, 1.488,\n+ 1.488, 1.448, 1.368, 1.285, 1.219, 1.189, 1.149, 1.139, 1.139, 1.158, 1.195, 1.235, 1.307, 1.387, 1.462, 1.493,\n+ 1.496, 1.475, 1.411, 1.337, 1.284, 1.219, 1.189, 1.176, 1.176, 1.195, 1.235, 1.296, 1.356, 1.429, 1.487, 1.501,\n+ 1.495, 1.489, 1.458, 1.407, 1.337, 1.287, 1.253, 1.239, 1.239, 1.259, 1.296, 1.356, 1.419, 1.472, 1.499, 1.499,\n+ 1.494, 1.489, 1.489, 1.453, 1.398, 1.336, 1.317, 1.317, 1.317, 1.321, 1.351, 1.416, 1.467, 1.501, 1.501, 1.499\n+ ]\n+ },\n+ {\n+ \"ct\": 3850,\n+ \"table\":\n+ [\n+ 1.694, 1.688, 1.688, 1.649, 1.588, 1.518, 1.495, 1.495, 1.495, 1.497, 1.532, 1.602, 1.659, 1.698, 1.698, 1.703,\n+ 1.698, 1.688, 1.653, 1.597, 1.525, 1.464, 1.429, 1.413, 1.413, 1.437, 1.476, 1.542, 1.606, 1.665, 1.698, 1.703,\n+ 1.697, 1.673, 1.605, 1.525, 1.464, 1.401, 1.369, 1.354, 1.354, 1.377, 1.417, 1.476, 1.542, 1.623, 1.687, 1.705,\n+ 1.692, 1.646, 1.561, 1.472, 1.401, 1.368, 1.337, 1.323, 1.324, 1.348, 1.377, 1.417, 1.492, 1.583, 1.661, 1.697,\n+ 1.686, 1.625, 1.528, 1.439, 1.372, 1.337, 1.321, 1.311, 1.316, 1.324, 1.348, 1.389, 1.461, 1.553, 1.642, 1.694,\n+ 1.684, 1.613, 1.514, 1.423, 1.359, 1.328, 1.311, 1.306, 1.306, 1.316, 1.339, 1.378, 1.446, 1.541, 1.633, 1.693,\n+ 1.684, 1.613, 1.514, 1.423, 1.359, 1.328, 1.311, 1.305, 1.305, 1.316, 1.339, 1.378, 1.446, 1.541, 1.633, 1.693,\n+ 1.685, 1.624, 1.529, 1.438, 1.372, 1.336, 1.324, 1.309, 1.314, 1.323, 1.348, 1.392, 1.462, 1.555, 1.646, 1.694,\n+ 1.692, 1.648, 1.561, 1.473, 1.403, 1.372, 1.336, 1.324, 1.324, 1.348, 1.378, 1.423, 1.495, 1.585, 1.667, 1.701,\n+ 1.701, 1.677, 1.608, 1.527, 1.471, 1.403, 1.375, 1.359, 1.359, 1.378, 1.423, 1.488, 1.549, 1.631, 1.694, 1.709,\n+ 1.702, 1.694, 1.656, 1.601, 1.527, 1.473, 1.441, 1.424, 1.424, 1.443, 1.488, 1.549, 1.621, 1.678, 1.706, 1.707,\n+ 1.699, 1.694, 1.694, 1.654, 1.593, 1.525, 1.508, 1.508, 1.508, 1.509, 1.546, 1.614, 1.674, 1.708, 1.708, 1.707\n+ ]\n+ },\n+ {\n+ \"ct\": 6000,\n+ \"table\":\n+ [\n+ 2.179, 2.176, 2.176, 2.125, 2.048, 1.975, 1.955, 1.954, 1.954, 1.956, 1.993, 2.071, 2.141, 2.184, 2.185, 2.188,\n+ 2.189, 2.176, 2.128, 2.063, 1.973, 1.908, 1.872, 1.856, 1.856, 1.876, 1.922, 1.999, 2.081, 2.144, 2.184, 2.192,\n+ 2.187, 2.152, 2.068, 1.973, 1.907, 1.831, 1.797, 1.786, 1.786, 1.804, 1.853, 1.922, 1.999, 2.089, 2.166, 2.191,\n+ 2.173, 2.117, 2.013, 1.908, 1.831, 1.791, 1.755, 1.749, 1.749, 1.767, 1.804, 1.853, 1.939, 2.041, 2.135, 2.181,\n+ 2.166, 2.089, 1.975, 1.869, 1.792, 1.755, 1.741, 1.731, 1.734, 1.749, 1.767, 1.818, 1.903, 2.005, 2.111, 2.173,\n+ 2.165, 2.074, 1.956, 1.849, 1.777, 1.742, 1.729, 1.725, 1.729, 1.734, 1.758, 1.804, 1.884, 1.991, 2.099, 2.172,\n+ 2.165, 2.074, 1.956, 1.849, 1.777, 1.742, 1.727, 1.724, 1.725, 1.734, 1.758, 1.804, 1.884, 1.991, 2.099, 2.172,\n+ 2.166, 2.085, 1.975, 1.869, 1.791, 1.755, 1.741, 1.729, 1.733, 1.749, 1.769, 1.819, 1.904, 2.009, 2.114, 2.174,\n+ 2.174, 2.118, 2.015, 1.913, 1.831, 1.791, 1.755, 1.749, 1.749, 1.769, 1.811, 1.855, 1.943, 2.047, 2.139, 2.183,\n+ 2.187, 2.151, 2.072, 1.979, 1.911, 1.831, 1.801, 1.791, 1.791, 1.811, 1.855, 1.933, 2.006, 2.101, 2.173, 2.197,\n+ 2.189, 2.178, 2.132, 2.069, 1.979, 1.913, 1.879, 1.867, 1.867, 1.891, 1.933, 2.006, 2.091, 2.156, 2.195, 2.197,\n+ 2.181, 2.179, 2.178, 2.131, 2.057, 1.981, 1.965, 1.965, 1.965, 1.969, 1.999, 2.083, 2.153, 2.197, 2.197, 2.196\n+ ]\n+ }\n+ ],\n+ \"calibrations_Cb\": [\n+ {\n+ \"ct\": 3000,\n+ \"table\":\n+ [\n+ 1.967, 1.961, 1.955, 1.953, 1.954, 1.957, 1.961, 1.963, 1.963, 1.961, 1.959, 1.957, 1.954, 1.951, 1.951, 1.955,\n+ 1.961, 1.959, 1.957, 1.956, 1.962, 1.967, 1.975, 1.979, 1.979, 1.975, 1.971, 1.967, 1.957, 1.952, 1.951, 1.951,\n+ 1.959, 1.959, 1.959, 1.966, 1.976, 1.989, 1.999, 2.004, 2.003, 1.997, 1.991, 1.981, 1.967, 1.956, 1.951, 1.951,\n+ 1.959, 1.962, 1.967, 1.978, 1.993, 2.009, 2.021, 2.028, 2.026, 2.021, 2.011, 1.995, 1.981, 1.964, 1.953, 1.951,\n+ 1.961, 1.965, 1.977, 1.993, 2.009, 2.023, 2.041, 2.047, 2.047, 2.037, 2.024, 2.011, 1.995, 1.975, 1.958, 1.953,\n+ 1.963, 1.968, 1.981, 2.001, 2.019, 2.039, 2.046, 2.052, 2.052, 2.051, 2.035, 2.021, 2.001, 1.978, 1.959, 1.955,\n+ 1.961, 1.966, 1.981, 2.001, 2.019, 2.038, 2.043, 2.051, 2.052, 2.042, 2.034, 2.019, 2.001, 1.978, 1.959, 1.954,\n+ 1.957, 1.961, 1.972, 1.989, 2.003, 2.021, 2.038, 2.039, 2.039, 2.034, 2.019, 2.004, 1.988, 1.971, 1.954, 1.949,\n+ 1.952, 1.953, 1.959, 1.972, 1.989, 2.003, 2.016, 2.019, 2.019, 2.014, 2.003, 1.988, 1.971, 1.955, 1.948, 1.947,\n+ 1.949, 1.948, 1.949, 1.957, 1.971, 1.978, 1.991, 1.994, 1.994, 1.989, 1.979, 1.967, 1.954, 1.946, 1.947, 1.947,\n+ 1.949, 1.946, 1.944, 1.946, 1.949, 1.954, 1.962, 1.967, 1.967, 1.963, 1.956, 1.948, 1.943, 1.943, 1.946, 1.949,\n+ 1.951, 1.946, 1.944, 1.942, 1.943, 1.943, 1.947, 1.948, 1.949, 1.947, 1.945, 1.941, 1.938, 1.939, 1.948, 1.952\n+ ]\n+ },\n+ {\n+ \"ct\": 3850,\n+ \"table\":\n+ [\n+ 1.726, 1.724, 1.722, 1.723, 1.731, 1.735, 1.743, 1.746, 1.746, 1.741, 1.735, 1.729, 1.725, 1.721, 1.721, 1.721,\n+ 1.724, 1.723, 1.723, 1.727, 1.735, 1.744, 1.749, 1.756, 1.756, 1.749, 1.744, 1.735, 1.727, 1.719, 1.719, 1.719,\n+ 1.723, 1.723, 1.724, 1.735, 1.746, 1.759, 1.767, 1.775, 1.775, 1.766, 1.758, 1.746, 1.735, 1.723, 1.718, 1.716,\n+ 1.723, 1.725, 1.732, 1.746, 1.759, 1.775, 1.782, 1.792, 1.792, 1.782, 1.772, 1.759, 1.745, 1.729, 1.718, 1.716,\n+ 1.725, 1.729, 1.738, 1.756, 1.775, 1.785, 1.796, 1.803, 1.804, 1.794, 1.783, 1.772, 1.757, 1.736, 1.722, 1.718,\n+ 1.728, 1.731, 1.741, 1.759, 1.781, 1.795, 1.803, 1.806, 1.808, 1.805, 1.791, 1.779, 1.762, 1.739, 1.722, 1.721,\n+ 1.727, 1.731, 1.741, 1.759, 1.781, 1.791, 1.799, 1.804, 1.806, 1.801, 1.791, 1.779, 1.762, 1.739, 1.722, 1.717,\n+ 1.722, 1.724, 1.733, 1.751, 1.768, 1.781, 1.791, 1.796, 1.799, 1.791, 1.781, 1.766, 1.754, 1.731, 1.717, 1.714,\n+ 1.718, 1.718, 1.724, 1.737, 1.752, 1.768, 1.776, 1.782, 1.784, 1.781, 1.766, 1.754, 1.737, 1.724, 1.713, 1.709,\n+ 1.716, 1.715, 1.716, 1.725, 1.737, 1.749, 1.756, 1.763, 1.764, 1.762, 1.749, 1.737, 1.724, 1.717, 1.709, 1.708,\n+ 1.715, 1.714, 1.712, 1.715, 1.722, 1.729, 1.736, 1.741, 1.742, 1.739, 1.731, 1.723, 1.717, 1.712, 1.711, 1.709,\n+ 1.716, 1.714, 1.711, 1.712, 1.715, 1.719, 1.723, 1.728, 1.731, 1.729, 1.723, 1.718, 1.711, 1.711, 1.713, 1.713\n+ ]\n+ },\n+ {\n+ \"ct\": 6000,\n+ \"table\":\n+ [\n+ 1.374, 1.372, 1.373, 1.374, 1.375, 1.378, 1.378, 1.381, 1.382, 1.382, 1.378, 1.373, 1.372, 1.369, 1.365, 1.365,\n+ 1.371, 1.371, 1.372, 1.374, 1.378, 1.381, 1.384, 1.386, 1.388, 1.387, 1.384, 1.377, 1.372, 1.368, 1.364, 1.362,\n+ 1.369, 1.371, 1.372, 1.377, 1.383, 1.391, 1.394, 1.396, 1.397, 1.395, 1.391, 1.382, 1.374, 1.369, 1.362, 1.361,\n+ 1.369, 1.371, 1.375, 1.383, 1.391, 1.399, 1.402, 1.404, 1.405, 1.403, 1.398, 1.391, 1.379, 1.371, 1.363, 1.361,\n+ 1.371, 1.373, 1.378, 1.388, 1.399, 1.407, 1.411, 1.413, 1.413, 1.411, 1.405, 1.397, 1.385, 1.374, 1.366, 1.362,\n+ 1.371, 1.374, 1.379, 1.389, 1.405, 1.411, 1.414, 1.414, 1.415, 1.415, 1.411, 1.401, 1.388, 1.376, 1.367, 1.363,\n+ 1.371, 1.373, 1.379, 1.389, 1.405, 1.408, 1.413, 1.414, 1.414, 1.413, 1.409, 1.401, 1.388, 1.376, 1.367, 1.362,\n+ 1.366, 1.369, 1.374, 1.384, 1.396, 1.404, 1.407, 1.408, 1.408, 1.408, 1.401, 1.395, 1.382, 1.371, 1.363, 1.359,\n+ 1.364, 1.365, 1.368, 1.375, 1.386, 1.396, 1.399, 1.401, 1.399, 1.399, 1.395, 1.385, 1.374, 1.365, 1.359, 1.357,\n+ 1.361, 1.363, 1.365, 1.368, 1.377, 1.384, 1.388, 1.391, 1.391, 1.388, 1.385, 1.375, 1.366, 1.361, 1.358, 1.356,\n+ 1.361, 1.362, 1.362, 1.364, 1.367, 1.373, 1.376, 1.377, 1.377, 1.375, 1.373, 1.366, 1.362, 1.358, 1.358, 1.358,\n+ 1.361, 1.362, 1.362, 1.362, 1.363, 1.367, 1.369, 1.368, 1.367, 1.367, 1.367, 1.364, 1.358, 1.357, 1.358, 1.359\n+ ]\n+ }\n+ ],\n+ \"luminance_lut\":\n [\n- 1.374, 1.372, 1.373, 1.374, 1.375, 1.378, 1.378, 1.381, 1.382, 1.382, 1.378, 1.373, 1.372, 1.369, 1.365, 1.365,\n- 1.371, 1.371, 1.372, 1.374, 1.378, 1.381, 1.384, 1.386, 1.388, 1.387, 1.384, 1.377, 1.372, 1.368, 1.364, 1.362,\n- 1.369, 1.371, 1.372, 1.377, 1.383, 1.391, 1.394, 1.396, 1.397, 1.395, 1.391, 1.382, 1.374, 1.369, 1.362, 1.361,\n- 1.369, 1.371, 1.375, 1.383, 1.391, 1.399, 1.402, 1.404, 1.405, 1.403, 1.398, 1.391, 1.379, 1.371, 1.363, 1.361,\n- 1.371, 1.373, 1.378, 1.388, 1.399, 1.407, 1.411, 1.413, 1.413, 1.411, 1.405, 1.397, 1.385, 1.374, 1.366, 1.362,\n- 1.371, 1.374, 1.379, 1.389, 1.405, 1.411, 1.414, 1.414, 1.415, 1.415, 1.411, 1.401, 1.388, 1.376, 1.367, 1.363,\n- 1.371, 1.373, 1.379, 1.389, 1.405, 1.408, 1.413, 1.414, 1.414, 1.413, 1.409, 1.401, 1.388, 1.376, 1.367, 1.362,\n- 1.366, 1.369, 1.374, 1.384, 1.396, 1.404, 1.407, 1.408, 1.408, 1.408, 1.401, 1.395, 1.382, 1.371, 1.363, 1.359,\n- 1.364, 1.365, 1.368, 1.375, 1.386, 1.396, 1.399, 1.401, 1.399, 1.399, 1.395, 1.385, 1.374, 1.365, 1.359, 1.357,\n- 1.361, 1.363, 1.365, 1.368, 1.377, 1.384, 1.388, 1.391, 1.391, 1.388, 1.385, 1.375, 1.366, 1.361, 1.358, 1.356,\n- 1.361, 1.362, 1.362, 1.364, 1.367, 1.373, 1.376, 1.377, 1.377, 1.375, 1.373, 1.366, 1.362, 1.358, 1.358, 1.358,\n- 1.361, 1.362, 1.362, 1.362, 1.363, 1.367, 1.369, 1.368, 1.367, 1.367, 1.367, 1.364, 1.358, 1.357, 1.358, 1.359\n- ]\n+ 2.716, 2.568, 2.299, 2.065, 1.845, 1.693, 1.605, 1.597, 1.596, 1.634, 1.738, 1.914, 2.145, 2.394, 2.719, 2.901,\n+ 2.593, 2.357, 2.093, 1.876, 1.672, 1.528, 1.438, 1.393, 1.394, 1.459, 1.569, 1.731, 1.948, 2.169, 2.481, 2.756,\n+ 2.439, 2.197, 1.922, 1.691, 1.521, 1.365, 1.266, 1.222, 1.224, 1.286, 1.395, 1.573, 1.747, 1.988, 2.299, 2.563,\n+ 2.363, 2.081, 1.797, 1.563, 1.376, 1.244, 1.152, 1.099, 1.101, 1.158, 1.276, 1.421, 1.607, 1.851, 2.163, 2.455,\n+ 2.342, 2.003, 1.715, 1.477, 1.282, 1.152, 1.074, 1.033, 1.035, 1.083, 1.163, 1.319, 1.516, 1.759, 2.064, 2.398,\n+ 2.342, 1.985, 1.691, 1.446, 1.249, 1.111, 1.034, 1.004, 1.004, 1.028, 1.114, 1.274, 1.472, 1.716, 2.019, 2.389,\n+ 2.342, 1.991, 1.691, 1.446, 1.249, 1.112, 1.034, 1.011, 1.005, 1.035, 1.114, 1.274, 1.472, 1.716, 2.019, 2.389,\n+ 2.365, 2.052, 1.751, 1.499, 1.299, 1.171, 1.089, 1.039, 1.042, 1.084, 1.162, 1.312, 1.516, 1.761, 2.059, 2.393,\n+ 2.434, 2.159, 1.856, 1.601, 1.403, 1.278, 1.166, 1.114, 1.114, 1.162, 1.266, 1.402, 1.608, 1.847, 2.146, 2.435,\n+ 2.554, 2.306, 2.002, 1.748, 1.563, 1.396, 1.299, 1.247, 1.243, 1.279, 1.386, 1.551, 1.746, 1.977, 2.272, 2.518,\n+ 2.756, 2.493, 2.195, 1.947, 1.739, 1.574, 1.481, 1.429, 1.421, 1.457, 1.559, 1.704, 1.929, 2.159, 2.442, 2.681,\n+ 2.935, 2.739, 2.411, 2.151, 1.922, 1.749, 1.663, 1.628, 1.625, 1.635, 1.716, 1.872, 2.113, 2.368, 2.663, 2.824\n+ ],\n+ \"sigma\": 0.00381,\n+ \"sigma_Cb\": 0.00216\n }\n- ],\n- \"luminance_lut\":\n- [\n- 2.716, 2.568, 2.299, 2.065, 1.845, 1.693, 1.605, 1.597, 1.596, 1.634, 1.738, 1.914, 2.145, 2.394, 2.719, 2.901,\n- 2.593, 2.357, 2.093, 1.876, 1.672, 1.528, 1.438, 1.393, 1.394, 1.459, 1.569, 1.731, 1.948, 2.169, 2.481, 2.756,\n- 2.439, 2.197, 1.922, 1.691, 1.521, 1.365, 1.266, 1.222, 1.224, 1.286, 1.395, 1.573, 1.747, 1.988, 2.299, 2.563,\n- 2.363, 2.081, 1.797, 1.563, 1.376, 1.244, 1.152, 1.099, 1.101, 1.158, 1.276, 1.421, 1.607, 1.851, 2.163, 2.455,\n- 2.342, 2.003, 1.715, 1.477, 1.282, 1.152, 1.074, 1.033, 1.035, 1.083, 1.163, 1.319, 1.516, 1.759, 2.064, 2.398,\n- 2.342, 1.985, 1.691, 1.446, 1.249, 1.111, 1.034, 1.004, 1.004, 1.028, 1.114, 1.274, 1.472, 1.716, 2.019, 2.389,\n- 2.342, 1.991, 1.691, 1.446, 1.249, 1.112, 1.034, 1.011, 1.005, 1.035, 1.114, 1.274, 1.472, 1.716, 2.019, 2.389,\n- 2.365, 2.052, 1.751, 1.499, 1.299, 1.171, 1.089, 1.039, 1.042, 1.084, 1.162, 1.312, 1.516, 1.761, 2.059, 2.393,\n- 2.434, 2.159, 1.856, 1.601, 1.403, 1.278, 1.166, 1.114, 1.114, 1.162, 1.266, 1.402, 1.608, 1.847, 2.146, 2.435,\n- 2.554, 2.306, 2.002, 1.748, 1.563, 1.396, 1.299, 1.247, 1.243, 1.279, 1.386, 1.551, 1.746, 1.977, 2.272, 2.518,\n- 2.756, 2.493, 2.195, 1.947, 1.739, 1.574, 1.481, 1.429, 1.421, 1.457, 1.559, 1.704, 1.929, 2.159, 2.442, 2.681,\n- 2.935, 2.739, 2.411, 2.151, 1.922, 1.749, 1.663, 1.628, 1.625, 1.635, 1.716, 1.872, 2.113, 2.368, 2.663, 2.824\n- ],\n- \"sigma\": 0.00381,\n- \"sigma_Cb\": 0.00216\n- },\n- \"rpi.contrast\":\n- {\n- \"ce_enable\": 1,\n- \"gamma_curve\":\n- [\n- 0, 0, 1024, 5040, 2048, 9338, 3072, 12356, 4096, 15312, 5120, 18051, 6144, 20790, 7168, 23193,\n- 8192, 25744, 9216, 27942, 10240, 30035, 11264, 32005, 12288, 33975, 13312, 35815, 14336, 37600, 15360, 39168,\n- 16384, 40642, 18432, 43379, 20480, 45749, 22528, 47753, 24576, 49621, 26624, 51253, 28672, 52698, 30720, 53796,\n- 32768, 54876, 36864, 57012, 40960, 58656, 45056, 59954, 49152, 61183, 53248, 62355, 57344, 63419, 61440, 64476,\n- 65535, 65535\n- ]\n- },\n- \"rpi.ccm\":\n- {\n- \"ccms\":\n- [\n- {\n- \"ct\": 2498, \"ccm\":\n- [\n- 1.58731, -0.18011, -0.40721, -0.60639, 2.03422, -0.42782, -0.19612, -1.69203, 2.88815\n- ]\n- },\n- {\n- \"ct\": 2811, \"ccm\":\n- [\n- 1.61593, -0.33164, -0.28429, -0.55048, 1.97779, -0.42731, -0.12042, -1.42847, 2.54889\n- ]\n- },\n- {\n- \"ct\": 2911, \"ccm\":\n- [\n- 1.62771, -0.41282, -0.21489, -0.57991, 2.04176, -0.46186, -0.07613, -1.13359, 2.20972\n- ]\n- },\n- {\n- \"ct\": 2919, \"ccm\":\n- [\n- 1.62661, -0.37736, -0.24925, -0.52519, 1.95233, -0.42714, -0.10842, -1.34929, 2.45771\n- ]\n- },\n- {\n- \"ct\": 3627, \"ccm\":\n- [\n- 1.70385, -0.57231, -0.13154, -0.47763, 1.85998, -0.38235, -0.07467, -0.82678, 1.90145\n- ]\n- },\n- {\n- \"ct\": 4600, \"ccm\":\n- [\n- 1.68486, -0.61085, -0.07402, -0.41927, 2.04016, -0.62089, -0.08633, -0.67672, 1.76305\n- ]\n- },\n+ },\n+ {\n+ \"rpi.contrast\":\n {\n- \"ct\": 5716, \"ccm\":\n+ \"ce_enable\": 1,\n+ \"gamma_curve\":\n [\n- 1.80439, -0.73699, -0.06739, -0.36073, 1.83327, -0.47255, -0.08378, -0.56403, 1.64781\n+ 0, 0,\n+ 1024, 5040,\n+ 2048, 9338,\n+ 3072, 12356,\n+ 4096, 15312,\n+ 5120, 18051,\n+ 6144, 20790,\n+ 7168, 23193,\n+ 8192, 25744,\n+ 9216, 27942,\n+ 10240, 30035,\n+ 11264, 32005,\n+ 12288, 33975,\n+ 13312, 35815,\n+ 14336, 37600,\n+ 15360, 39168,\n+ 16384, 40642,\n+ 18432, 43379,\n+ 20480, 45749,\n+ 22528, 47753,\n+ 24576, 49621,\n+ 26624, 51253,\n+ 28672, 52698,\n+ 30720, 53796,\n+ 32768, 54876,\n+ 36864, 57012,\n+ 40960, 58656,\n+ 45056, 59954,\n+ 49152, 61183,\n+ 53248, 62355,\n+ 57344, 63419,\n+ 61440, 64476,\n+ 65535, 65535\n ]\n- },\n+ }\n+ },\n+ {\n+ \"rpi.ccm\":\n {\n- \"ct\": 8575, \"ccm\":\n- [\n- 1.89357, -0.76427, -0.12931, -0.27399, 2.15605, -0.88206, -0.12035, -0.68256, 1.80292\n+ \"ccms\": [\n+ {\n+ \"ct\": 2498,\n+ \"ccm\":\n+ [\n+ 1.58731, -0.18011, -0.40721,\n+ -0.60639, 2.03422, -0.42782,\n+ -0.19612, -1.69203, 2.88815\n+ ]\n+ },\n+ {\n+ \"ct\": 2811,\n+ \"ccm\":\n+ [\n+ 1.61593, -0.33164, -0.28429,\n+ -0.55048, 1.97779, -0.42731,\n+ -0.12042, -1.42847, 2.54889\n+ ]\n+ },\n+ {\n+ \"ct\": 2911,\n+ \"ccm\":\n+ [\n+ 1.62771, -0.41282, -0.21489,\n+ -0.57991, 2.04176, -0.46186,\n+ -0.07613, -1.13359, 2.20972\n+ ]\n+ },\n+ {\n+ \"ct\": 2919,\n+ \"ccm\":\n+ [\n+ 1.62661, -0.37736, -0.24925,\n+ -0.52519, 1.95233, -0.42714,\n+ -0.10842, -1.34929, 2.45771\n+ ]\n+ },\n+ {\n+ \"ct\": 3627,\n+ \"ccm\":\n+ [\n+ 1.70385, -0.57231, -0.13154,\n+ -0.47763, 1.85998, -0.38235,\n+ -0.07467, -0.82678, 1.90145\n+ ]\n+ },\n+ {\n+ \"ct\": 4600,\n+ \"ccm\":\n+ [\n+ 1.68486, -0.61085, -0.07402,\n+ -0.41927, 2.04016, -0.62089,\n+ -0.08633, -0.67672, 1.76305\n+ ]\n+ },\n+ {\n+ \"ct\": 5716,\n+ \"ccm\":\n+ [\n+ 1.80439, -0.73699, -0.06739,\n+ -0.36073, 1.83327, -0.47255,\n+ -0.08378, -0.56403, 1.64781\n+ ]\n+ },\n+ {\n+ \"ct\": 8575,\n+ \"ccm\":\n+ [\n+ 1.89357, -0.76427, -0.12931,\n+ -0.27399, 2.15605, -0.88206,\n+ -0.12035, -0.68256, 1.80292\n+ ]\n+ }\n ]\n }\n- ]\n- },\n- \"rpi.sharpen\":\n- {\n-\n- },\n- \"rpi.dpc\":\n- {\n-\n- }\n-}\n+ },\n+ {\n+ \"rpi.sharpen\": { }\n+ }\n+ ]\n+}\n\\ No newline at end of file\ndiff --git a/src/ipa/raspberrypi/data/imx290.json b/src/ipa/raspberrypi/data/imx290.json\nindex 1363bab71340..bfb9c6093d26 100644\n--- a/src/ipa/raspberrypi/data/imx290.json\n+++ b/src/ipa/raspberrypi/data/imx290.json\n@@ -1,165 +1,203 @@\n {\n- \"rpi.black_level\":\n- {\n- \"black_level\": 3840\n- },\n- \"rpi.dpc\":\n- {\n- },\n- \"rpi.lux\":\n- {\n- \"reference_shutter_speed\": 6813,\n- \"reference_gain\": 1.0,\n- \"reference_aperture\": 1.0,\n- \"reference_lux\": 890,\n- \"reference_Y\": 12900\n- },\n- \"rpi.noise\":\n- {\n- \"reference_constant\": 0,\n- \"reference_slope\": 2.67\n- },\n- \"rpi.geq\":\n- {\n- \"offset\": 187,\n- \"slope\": 0.00842\n- },\n- \"rpi.sdn\":\n- {\n- },\n- \"rpi.awb\":\n- {\n- \"bayes\": 0\n- },\n- \"rpi.agc\":\n- {\n- \"speed\": 0.2,\n- \"metering_modes\":\n+ \"version\": 2.0,\n+ \"target\": \"bcm2835\",\n+ \"algorithms\": [\n {\n- \"matrix\":\n+ \"rpi.black_level\":\n {\n- \"weights\":\n- [\n- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1\n- ]\n- },\n- \"centre-weighted\":\n+ \"black_level\": 3840\n+ }\n+ },\n+ {\n+ \"rpi.dpc\": { }\n+ },\n+ {\n+ \"rpi.lux\":\n {\n- \"weights\":\n- [\n- 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0\n- ]\n- },\n- \"spot\":\n+ \"reference_shutter_speed\": 6813,\n+ \"reference_gain\": 1.0,\n+ \"reference_aperture\": 1.0,\n+ \"reference_lux\": 890,\n+ \"reference_Y\": 12900\n+ }\n+ },\n+ {\n+ \"rpi.noise\":\n {\n- \"weights\":\n- [\n- 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0\n- ]\n+ \"reference_constant\": 0,\n+ \"reference_slope\": 2.67\n }\n },\n- \"exposure_modes\":\n {\n- \"normal\":\n+ \"rpi.geq\":\n {\n- \"shutter\":\n- [\n- 10, 30000, 60000\n- ],\n- \"gain\":\n+ \"offset\": 187,\n+ \"slope\": 0.00842\n+ }\n+ },\n+ {\n+ \"rpi.sdn\": { }\n+ },\n+ {\n+ \"rpi.awb\":\n+ {\n+ \"bayes\": 0\n+ }\n+ },\n+ {\n+ \"rpi.agc\":\n+ {\n+ \"speed\": 0.2,\n+ \"metering_modes\":\n+ {\n+ \"matrix\":\n+ {\n+ \"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+ },\n+ \"centre-weighted\":\n+ {\n+ \"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+ },\n+ \"spot\":\n+ {\n+ \"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+ }\n+ },\n+ \"exposure_modes\":\n+ {\n+ \"normal\":\n+ {\n+ \"shutter\": [ 10, 30000, 60000 ],\n+ \"gain\": [ 1.0, 2.0, 8.0 ]\n+ },\n+ \"sport\":\n+ {\n+ \"shutter\": [ 10, 5000, 10000, 20000, 120000 ],\n+ \"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+ }\n+ },\n+ \"constraint_modes\":\n+ {\n+ \"normal\": [ ],\n+ \"highlight\": [\n+ {\n+ \"bound\": \"LOWER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.5,\n+ 1000, 0.5\n+ ]\n+ },\n+ {\n+ \"bound\": \"UPPER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.8,\n+ 1000, 0.8\n+ ]\n+ }\n+ ]\n+ },\n+ \"y_target\":\n [\n- 1.0, 2.0, 8.0\n+ 0, 0.16,\n+ 1000, 0.16,\n+ 10000, 0.16\n ]\n- },\n- \"sport\":\n+ }\n+ },\n+ {\n+ \"rpi.alsc\":\n {\n- \"shutter\":\n+ \"omega\": 1.3,\n+ \"n_iter\": 100,\n+ \"luminance_strength\": 0.7,\n+ \"luminance_lut\":\n [\n- 10, 5000, 10000, 20000, 120000\n+ 2.844, 2.349, 2.018, 1.775, 1.599, 1.466, 1.371, 1.321, 1.306, 1.316, 1.357, 1.439, 1.552, 1.705, 1.915, 2.221,\n+ 2.576, 2.151, 1.851, 1.639, 1.478, 1.358, 1.272, 1.231, 1.218, 1.226, 1.262, 1.335, 1.438, 1.571, 1.766, 2.067,\n+ 2.381, 2.005, 1.739, 1.545, 1.389, 1.278, 1.204, 1.166, 1.153, 1.161, 1.194, 1.263, 1.356, 1.489, 1.671, 1.943,\n+ 2.242, 1.899, 1.658, 1.481, 1.329, 1.225, 1.156, 1.113, 1.096, 1.107, 1.143, 1.201, 1.289, 1.423, 1.607, 1.861,\n+ 2.152, 1.831, 1.602, 1.436, 1.291, 1.193, 1.121, 1.069, 1.047, 1.062, 1.107, 1.166, 1.249, 1.384, 1.562, 1.801,\n+ 2.104, 1.795, 1.572, 1.407, 1.269, 1.174, 1.099, 1.041, 1.008, 1.029, 1.083, 1.146, 1.232, 1.364, 1.547, 1.766,\n+ 2.104, 1.796, 1.572, 1.403, 1.264, 1.171, 1.097, 1.036, 1.001, 1.025, 1.077, 1.142, 1.231, 1.363, 1.549, 1.766,\n+ 2.148, 1.827, 1.594, 1.413, 1.276, 1.184, 1.114, 1.062, 1.033, 1.049, 1.092, 1.153, 1.242, 1.383, 1.577, 1.795,\n+ 2.211, 1.881, 1.636, 1.455, 1.309, 1.214, 1.149, 1.104, 1.081, 1.089, 1.125, 1.184, 1.273, 1.423, 1.622, 1.846,\n+ 2.319, 1.958, 1.698, 1.516, 1.362, 1.262, 1.203, 1.156, 1.137, 1.142, 1.171, 1.229, 1.331, 1.484, 1.682, 1.933,\n+ 2.459, 2.072, 1.789, 1.594, 1.441, 1.331, 1.261, 1.219, 1.199, 1.205, 1.232, 1.301, 1.414, 1.571, 1.773, 2.052,\n+ 2.645, 2.206, 1.928, 1.728, 1.559, 1.451, 1.352, 1.301, 1.282, 1.289, 1.319, 1.395, 1.519, 1.685, 1.904, 2.227\n ],\n- \"gain\":\n+ \"sigma\": 0.005,\n+ \"sigma_Cb\": 0.005\n+ }\n+ },\n+ {\n+ \"rpi.contrast\":\n+ {\n+ \"ce_enable\": 1,\n+ \"gamma_curve\":\n [\n- 1.0, 2.0, 4.0, 6.0, 8.0\n+ 0, 0,\n+ 1024, 5040,\n+ 2048, 9338,\n+ 3072, 12356,\n+ 4096, 15312,\n+ 5120, 18051,\n+ 6144, 20790,\n+ 7168, 23193,\n+ 8192, 25744,\n+ 9216, 27942,\n+ 10240, 30035,\n+ 11264, 32005,\n+ 12288, 33975,\n+ 13312, 35815,\n+ 14336, 37600,\n+ 15360, 39168,\n+ 16384, 40642,\n+ 18432, 43379,\n+ 20480, 45749,\n+ 22528, 47753,\n+ 24576, 49621,\n+ 26624, 51253,\n+ 28672, 52698,\n+ 30720, 53796,\n+ 32768, 54876,\n+ 36864, 57012,\n+ 40960, 58656,\n+ 45056, 59954,\n+ 49152, 61183,\n+ 53248, 62355,\n+ 57344, 63419,\n+ 61440, 64476,\n+ 65535, 65535\n ]\n }\n },\n- \"constraint_modes\":\n {\n- \"normal\":\n- [\n- ],\n- \"highlight\":\n- [\n- {\n- \"bound\": \"LOWER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.5, 1000, 0.5\n- ]\n- },\n- {\n- \"bound\": \"UPPER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.8, 1000, 0.8\n- ]\n- }\n- ]\n+ \"rpi.sharpen\": { }\n },\n- \"y_target\":\n- [\n- 0, 0.16, 1000, 0.16, 10000, 0.16\n- ]\n- },\n- \"rpi.alsc\":\n- {\n- \"omega\": 1.3,\n- \"n_iter\": 100,\n- \"luminance_strength\": 0.7,\n- \"luminance_lut\":\n- [\n- 2.844, 2.349, 2.018, 1.775, 1.599, 1.466, 1.371, 1.321, 1.306, 1.316, 1.357, 1.439, 1.552, 1.705, 1.915, 2.221,\n- 2.576, 2.151, 1.851, 1.639, 1.478, 1.358, 1.272, 1.231, 1.218, 1.226, 1.262, 1.335, 1.438, 1.571, 1.766, 2.067,\n- 2.381, 2.005, 1.739, 1.545, 1.389, 1.278, 1.204, 1.166, 1.153, 1.161, 1.194, 1.263, 1.356, 1.489, 1.671, 1.943,\n- 2.242, 1.899, 1.658, 1.481, 1.329, 1.225, 1.156, 1.113, 1.096, 1.107, 1.143, 1.201, 1.289, 1.423, 1.607, 1.861,\n- 2.152, 1.831, 1.602, 1.436, 1.291, 1.193, 1.121, 1.069, 1.047, 1.062, 1.107, 1.166, 1.249, 1.384, 1.562, 1.801,\n- 2.104, 1.795, 1.572, 1.407, 1.269, 1.174, 1.099, 1.041, 1.008, 1.029, 1.083, 1.146, 1.232, 1.364, 1.547, 1.766,\n- 2.104, 1.796, 1.572, 1.403, 1.264, 1.171, 1.097, 1.036, 1.001, 1.025, 1.077, 1.142, 1.231, 1.363, 1.549, 1.766,\n- 2.148, 1.827, 1.594, 1.413, 1.276, 1.184, 1.114, 1.062, 1.033, 1.049, 1.092, 1.153, 1.242, 1.383, 1.577, 1.795,\n- 2.211, 1.881, 1.636, 1.455, 1.309, 1.214, 1.149, 1.104, 1.081, 1.089, 1.125, 1.184, 1.273, 1.423, 1.622, 1.846,\n- 2.319, 1.958, 1.698, 1.516, 1.362, 1.262, 1.203, 1.156, 1.137, 1.142, 1.171, 1.229, 1.331, 1.484, 1.682, 1.933,\n- 2.459, 2.072, 1.789, 1.594, 1.441, 1.331, 1.261, 1.219, 1.199, 1.205, 1.232, 1.301, 1.414, 1.571, 1.773, 2.052,\n- 2.645, 2.206, 1.928, 1.728, 1.559, 1.451, 1.352, 1.301, 1.282, 1.289, 1.319, 1.395, 1.519, 1.685, 1.904, 2.227\n- ],\n- \"sigma\": 0.005,\n- \"sigma_Cb\": 0.005\n- },\n- \"rpi.contrast\":\n- {\n- \"ce_enable\": 1,\n- \"gamma_curve\":\n- [\n- 0, 0, 1024, 5040, 2048, 9338, 3072, 12356, 4096, 15312, 5120, 18051, 6144, 20790, 7168, 23193,\n- 8192, 25744, 9216, 27942, 10240, 30035, 11264, 32005, 12288, 33975, 13312, 35815, 14336, 37600, 15360, 39168,\n- 16384, 40642, 18432, 43379, 20480, 45749, 22528, 47753, 24576, 49621, 26624, 51253, 28672, 52698, 30720, 53796,\n- 32768, 54876, 36864, 57012, 40960, 58656, 45056, 59954, 49152, 61183, 53248, 62355, 57344, 63419, 61440, 64476,\n- 65535, 65535\n- ]\n- },\n- \"rpi.sharpen\":\n- {\n- },\n- \"rpi.ccm\":\n- {\n- \"ccms\":\n- [\n+ {\n+ \"rpi.ccm\":\n {\n- \"ct\": 3900, \"ccm\":\n- [\n- 1.54659, -0.17707, -0.36953, -0.51471, 1.72733, -0.21262, 0.06667, -0.92279, 1.85612\n+ \"ccms\": [\n+ {\n+ \"ct\": 3900,\n+ \"ccm\":\n+ [\n+ 1.54659, -0.17707, -0.36953,\n+ -0.51471, 1.72733, -0.21262,\n+ 0.06667, -0.92279, 1.85612\n+ ]\n+ }\n ]\n }\n- ]\n- },\n- \"rpi.focus\":\n- {\n- }\n-}\n+ },\n+ {\n+ \"rpi.focus\": { }\n+ }\n+ ]\n+}\n\\ No newline at end of file\ndiff --git a/src/ipa/raspberrypi/data/imx296.json b/src/ipa/raspberrypi/data/imx296.json\nindex 837feff5efc8..490c0fda0cca 100644\n--- a/src/ipa/raspberrypi/data/imx296.json\n+++ b/src/ipa/raspberrypi/data/imx296.json\n@@ -1,191 +1,228 @@\n {\n- \"rpi.black_level\":\n- {\n- \"black_level\": 4096\n- },\n- \"rpi.dpc\":\n- {\n- },\n- \"rpi.lux\":\n- {\n- \"reference_shutter_speed\": 19184,\n- \"reference_gain\": 1.0,\n- \"reference_aperture\": 1.0,\n- \"reference_lux\": 432,\n- \"reference_Y\": 13773\n- },\n- \"rpi.noise\":\n- {\n- \"reference_constant\": 0,\n- \"reference_slope\": 2.957\n- },\n- \"rpi.geq\":\n- {\n- \"offset\": 185,\n- \"slope\": 0.0105\n- },\n- \"rpi.sdn\":\n- {\n- },\n- \"rpi.agc\":\n- {\n- \"metering_modes\":\n+ \"version\": 2.0,\n+ \"target\": \"bcm2835\",\n+ \"algorithms\": [\n {\n- \"centre-weighted\":\n+ \"rpi.black_level\":\n {\n- \"weights\":\n- [\n- 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0\n- ]\n- },\n- \"spot\":\n- {\n- \"weights\":\n- [\n- 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0\n- ]\n- },\n- \"matrix\":\n+ \"black_level\": 4096\n+ }\n+ },\n+ {\n+ \"rpi.dpc\": { }\n+ },\n+ {\n+ \"rpi.lux\":\n {\n- \"weights\":\n- [\n- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1\n- ]\n+ \"reference_shutter_speed\": 19184,\n+ \"reference_gain\": 1.0,\n+ \"reference_aperture\": 1.0,\n+ \"reference_lux\": 432,\n+ \"reference_Y\": 13773\n }\n },\n- \"exposure_modes\":\n {\n- \"normal\":\n+ \"rpi.noise\":\n {\n- \"shutter\":\n- [\n- 100, 10000, 30000, 60000, 120000\n- ],\n- \"gain\":\n- [\n- 1.0, 2.0, 4.0, 6.0, 6.0\n- ]\n- },\n- \"short\":\n+ \"reference_constant\": 0,\n+ \"reference_slope\": 2.957\n+ }\n+ },\n+ {\n+ \"rpi.geq\":\n {\n- \"shutter\":\n- [\n- 100, 5000, 10000, 20000, 120000\n- ],\n- \"gain\":\n- [\n- 1.0, 2.0, 4.0, 6.0, 6.0\n- ]\n+ \"offset\": 185,\n+ \"slope\": 0.0105\n }\n },\n- \"constraint_modes\":\n {\n- \"normal\":\n- [\n+ \"rpi.sdn\": { }\n+ },\n+ {\n+ \"rpi.agc\":\n+ {\n+ \"metering_modes\":\n {\n- \"bound\": \"LOWER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.5, 1000, 0.5\n- ]\n- }\n- ],\n- \"highlight\":\n- [\n+ \"centre-weighted\":\n+ {\n+ \"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+ },\n+ \"spot\":\n+ {\n+ \"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+ },\n+ \"matrix\":\n+ {\n+ \"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+ }\n+ },\n+ \"exposure_modes\":\n {\n- \"bound\": \"LOWER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.5, 1000, 0.5\n- ]\n+ \"normal\":\n+ {\n+ \"shutter\": [ 100, 10000, 30000, 60000, 120000 ],\n+ \"gain\": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]\n+ },\n+ \"short\":\n+ {\n+ \"shutter\": [ 100, 5000, 10000, 20000, 120000 ],\n+ \"gain\": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]\n+ }\n },\n+ \"constraint_modes\":\n {\n- \"bound\": \"UPPER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.8, 1000, 0.8\n+ \"normal\": [\n+ {\n+ \"bound\": \"LOWER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.5,\n+ 1000, 0.5\n+ ]\n+ }\n+ ],\n+ \"highlight\": [\n+ {\n+ \"bound\": \"LOWER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.5,\n+ 1000, 0.5\n+ ]\n+ },\n+ {\n+ \"bound\": \"UPPER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.8,\n+ 1000, 0.8\n+ ]\n+ }\n ]\n- }\n- ]\n+ },\n+ \"y_target\":\n+ [\n+ 0, 0.16,\n+ 1000, 0.165,\n+ 10000, 0.17\n+ ]\n+ }\n },\n- \"y_target\":\n- [\n- 0, 0.16, 1000, 0.165, 10000, 0.17\n- ]\n- },\n- \"rpi.alsc\":\n- {\n- \"omega\": 1.3,\n- \"n_iter\": 0,\n- \"luminance_strength\": 0.5,\n- \"calibrations_Cr\":\n- [\n+ {\n+ \"rpi.alsc\":\n {\n- \"ct\": 4000, \"table\":\n+ \"omega\": 1.3,\n+ \"n_iter\": 0,\n+ \"luminance_strength\": 0.5,\n+ \"calibrations_Cr\": [\n+ {\n+ \"ct\": 4000,\n+ \"table\":\n+ [\n+ 2.554, 2.554, 2.541, 2.534, 2.495, 2.506, 2.516, 2.517, 2.518, 2.515, 2.513, 2.495, 2.481, 2.533, 2.533, 2.521,\n+ 2.522, 2.534, 2.539, 2.531, 2.531, 2.506, 2.506, 2.513, 2.513, 2.509, 2.498, 2.496, 2.508, 2.517, 2.521, 2.521,\n+ 2.509, 2.517, 2.534, 2.529, 2.531, 2.521, 2.517, 2.517, 2.515, 2.514, 2.506, 2.499, 2.508, 2.508, 2.521, 2.537,\n+ 2.507, 2.508, 2.517, 2.516, 2.495, 2.487, 2.519, 2.534, 2.535, 2.531, 2.499, 2.494, 2.501, 2.511, 2.526, 2.526,\n+ 2.509, 2.517, 2.507, 2.501, 2.494, 2.519, 2.539, 2.539, 2.537, 2.537, 2.533, 2.499, 2.503, 2.511, 2.529, 2.525,\n+ 2.521, 2.522, 2.476, 2.501, 2.501, 2.539, 2.546, 2.538, 2.531, 2.538, 2.541, 2.531, 2.529, 2.526, 2.529, 2.525,\n+ 2.516, 2.519, 2.469, 2.499, 2.499, 2.543, 2.543, 2.531, 2.528, 2.534, 2.541, 2.535, 2.531, 2.526, 2.531, 2.528,\n+ 2.509, 2.515, 2.465, 2.487, 2.487, 2.539, 2.543, 2.539, 2.533, 2.549, 2.542, 2.531, 2.529, 2.524, 2.532, 2.533,\n+ 2.499, 2.499, 2.475, 2.482, 2.471, 2.509, 2.539, 2.544, 2.543, 2.545, 2.533, 2.498, 2.521, 2.521, 2.537, 2.536,\n+ 2.499, 2.488, 2.488, 2.488, 2.471, 2.462, 2.509, 2.539, 2.539, 2.532, 2.498, 2.498, 2.518, 2.518, 2.539, 2.539,\n+ 2.483, 2.484, 2.488, 2.488, 2.502, 2.496, 2.508, 2.514, 2.518, 2.517, 2.521, 2.518, 2.518, 2.518, 2.525, 2.539,\n+ 2.483, 2.487, 2.478, 2.478, 2.507, 2.509, 2.514, 2.513, 2.514, 2.517, 2.536, 2.559, 2.501, 2.501, 2.503, 2.525\n+ ]\n+ }\n+ ],\n+ \"calibrations_Cb\": [\n+ {\n+ \"ct\": 4000,\n+ \"table\":\n+ [\n+ 2.619, 2.603, 2.599, 2.597, 2.595, 2.594, 2.589, 2.587, 2.586, 2.589, 2.592, 2.597, 2.601, 2.608, 2.621, 2.621,\n+ 2.619, 2.615, 2.603, 2.601, 2.596, 2.595, 2.591, 2.589, 2.589, 2.592, 2.599, 2.593, 2.601, 2.613, 2.622, 2.631,\n+ 2.617, 2.617, 2.612, 2.611, 2.604, 2.598, 2.593, 2.591, 2.592, 2.591, 2.593, 2.595, 2.599, 2.614, 2.623, 2.631,\n+ 2.624, 2.619, 2.615, 2.612, 2.605, 2.602, 2.597, 2.596, 2.592, 2.592, 2.595, 2.599, 2.602, 2.606, 2.619, 2.624,\n+ 2.629, 2.627, 2.627, 2.617, 2.609, 2.598, 2.612, 2.623, 2.615, 2.604, 2.589, 2.595, 2.599, 2.608, 2.611, 2.614,\n+ 2.629, 2.632, 2.637, 2.627, 2.612, 2.612, 2.629, 2.631, 2.628, 2.621, 2.604, 2.597, 2.598, 2.604, 2.609, 2.609,\n+ 2.635, 2.636, 2.642, 2.628, 2.623, 2.623, 2.636, 2.636, 2.634, 2.628, 2.616, 2.599, 2.597, 2.601, 2.603, 2.601,\n+ 2.641, 2.639, 2.646, 2.632, 2.627, 2.625, 2.632, 2.635, 2.634, 2.627, 2.614, 2.596, 2.595, 2.599, 2.599, 2.598,\n+ 2.643, 2.644, 2.651, 2.649, 2.629, 2.617, 2.624, 2.629, 2.625, 2.614, 2.586, 2.599, 2.595, 2.597, 2.592, 2.595,\n+ 2.645, 2.646, 2.649, 2.649, 2.638, 2.624, 2.616, 2.617, 2.609, 2.604, 2.603, 2.603, 2.595, 2.589, 2.587, 2.592,\n+ 2.641, 2.643, 2.649, 2.647, 2.638, 2.618, 2.615, 2.608, 2.602, 2.595, 2.596, 2.595, 2.593, 2.584, 2.581, 2.583,\n+ 2.638, 2.637, 2.647, 2.634, 2.634, 2.618, 2.621, 2.621, 2.611, 2.602, 2.596, 2.583, 2.581, 2.581, 2.576, 2.574\n+ ]\n+ }\n+ ],\n+ \"luminance_lut\":\n [\n- 2.554, 2.554, 2.541, 2.534, 2.495, 2.506, 2.516, 2.517, 2.518, 2.515, 2.513, 2.495, 2.481, 2.533, 2.533, 2.521,\n- 2.522, 2.534, 2.539, 2.531, 2.531, 2.506, 2.506, 2.513, 2.513, 2.509, 2.498, 2.496, 2.508, 2.517, 2.521, 2.521,\n- 2.509, 2.517, 2.534, 2.529, 2.531, 2.521, 2.517, 2.517, 2.515, 2.514, 2.506, 2.499, 2.508, 2.508, 2.521, 2.537,\n- 2.507, 2.508, 2.517, 2.516, 2.495, 2.487, 2.519, 2.534, 2.535, 2.531, 2.499, 2.494, 2.501, 2.511, 2.526, 2.526,\n- 2.509, 2.517, 2.507, 2.501, 2.494, 2.519, 2.539, 2.539, 2.537, 2.537, 2.533, 2.499, 2.503, 2.511, 2.529, 2.525,\n- 2.521, 2.522, 2.476, 2.501, 2.501, 2.539, 2.546, 2.538, 2.531, 2.538, 2.541, 2.531, 2.529, 2.526, 2.529, 2.525,\n- 2.516, 2.519, 2.469, 2.499, 2.499, 2.543, 2.543, 2.531, 2.528, 2.534, 2.541, 2.535, 2.531, 2.526, 2.531, 2.528,\n- 2.509, 2.515, 2.465, 2.487, 2.487, 2.539, 2.543, 2.539, 2.533, 2.549, 2.542, 2.531, 2.529, 2.524, 2.532, 2.533,\n- 2.499, 2.499, 2.475, 2.482, 2.471, 2.509, 2.539, 2.544, 2.543, 2.545, 2.533, 2.498, 2.521, 2.521, 2.537, 2.536,\n- 2.499, 2.488, 2.488, 2.488, 2.471, 2.462, 2.509, 2.539, 2.539, 2.532, 2.498, 2.498, 2.518, 2.518, 2.539, 2.539,\n- 2.483, 2.484, 2.488, 2.488, 2.502, 2.496, 2.508, 2.514, 2.518, 2.517, 2.521, 2.518, 2.518, 2.518, 2.525, 2.539,\n- 2.483, 2.487, 2.478, 2.478, 2.507, 2.509, 2.514, 2.513, 2.514, 2.517, 2.536, 2.559, 2.501, 2.501, 2.503, 2.525\n- ]\n+ 1.308, 1.293, 1.228, 1.175, 1.139, 1.108, 1.092, 1.082, 1.082, 1.086, 1.097, 1.114, 1.149, 1.199, 1.279, 1.303,\n+ 1.293, 1.249, 1.199, 1.162, 1.136, 1.109, 1.087, 1.077, 1.072, 1.081, 1.095, 1.103, 1.133, 1.172, 1.225, 1.282,\n+ 1.251, 1.212, 1.186, 1.159, 1.129, 1.114, 1.102, 1.088, 1.088, 1.088, 1.095, 1.117, 1.123, 1.158, 1.198, 1.249,\n+ 1.223, 1.192, 1.177, 1.163, 1.147, 1.139, 1.132, 1.112, 1.111, 1.107, 1.113, 1.118, 1.139, 1.155, 1.186, 1.232,\n+ 1.207, 1.186, 1.171, 1.162, 1.168, 1.163, 1.153, 1.138, 1.129, 1.128, 1.132, 1.136, 1.149, 1.167, 1.189, 1.216,\n+ 1.198, 1.186, 1.176, 1.176, 1.177, 1.185, 1.171, 1.157, 1.146, 1.144, 1.146, 1.149, 1.161, 1.181, 1.201, 1.221,\n+ 1.203, 1.181, 1.176, 1.178, 1.191, 1.189, 1.188, 1.174, 1.159, 1.153, 1.158, 1.161, 1.169, 1.185, 1.211, 1.227,\n+ 1.211, 1.179, 1.177, 1.187, 1.194, 1.196, 1.194, 1.187, 1.176, 1.169, 1.171, 1.171, 1.175, 1.189, 1.214, 1.226,\n+ 1.219, 1.182, 1.184, 1.191, 1.195, 1.199, 1.197, 1.194, 1.188, 1.185, 1.179, 1.179, 1.182, 1.194, 1.212, 1.227,\n+ 1.237, 1.192, 1.194, 1.194, 1.198, 1.199, 1.198, 1.197, 1.196, 1.193, 1.189, 1.189, 1.192, 1.203, 1.214, 1.231,\n+ 1.282, 1.199, 1.199, 1.197, 1.199, 1.199, 1.192, 1.193, 1.193, 1.194, 1.196, 1.197, 1.206, 1.216, 1.228, 1.244,\n+ 1.309, 1.236, 1.204, 1.203, 1.202, 1.194, 1.194, 1.188, 1.192, 1.192, 1.199, 1.201, 1.212, 1.221, 1.235, 1.247\n+ ],\n+ \"sigma\": 0.005,\n+ \"sigma_Cb\": 0.005\n }\n- ],\n- \"calibrations_Cb\":\n- [\n+ },\n+ {\n+ \"rpi.contrast\":\n {\n- \"ct\": 4000, \"table\":\n+ \"ce_enable\": 1,\n+ \"gamma_curve\":\n [\n- 2.619, 2.603, 2.599, 2.597, 2.595, 2.594, 2.589, 2.587, 2.586, 2.589, 2.592, 2.597, 2.601, 2.608, 2.621, 2.621,\n- 2.619, 2.615, 2.603, 2.601, 2.596, 2.595, 2.591, 2.589, 2.589, 2.592, 2.599, 2.593, 2.601, 2.613, 2.622, 2.631,\n- 2.617, 2.617, 2.612, 2.611, 2.604, 2.598, 2.593, 2.591, 2.592, 2.591, 2.593, 2.595, 2.599, 2.614, 2.623, 2.631,\n- 2.624, 2.619, 2.615, 2.612, 2.605, 2.602, 2.597, 2.596, 2.592, 2.592, 2.595, 2.599, 2.602, 2.606, 2.619, 2.624,\n- 2.629, 2.627, 2.627, 2.617, 2.609, 2.598, 2.612, 2.623, 2.615, 2.604, 2.589, 2.595, 2.599, 2.608, 2.611, 2.614,\n- 2.629, 2.632, 2.637, 2.627, 2.612, 2.612, 2.629, 2.631, 2.628, 2.621, 2.604, 2.597, 2.598, 2.604, 2.609, 2.609,\n- 2.635, 2.636, 2.642, 2.628, 2.623, 2.623, 2.636, 2.636, 2.634, 2.628, 2.616, 2.599, 2.597, 2.601, 2.603, 2.601,\n- 2.641, 2.639, 2.646, 2.632, 2.627, 2.625, 2.632, 2.635, 2.634, 2.627, 2.614, 2.596, 2.595, 2.599, 2.599, 2.598,\n- 2.643, 2.644, 2.651, 2.649, 2.629, 2.617, 2.624, 2.629, 2.625, 2.614, 2.586, 2.599, 2.595, 2.597, 2.592, 2.595,\n- 2.645, 2.646, 2.649, 2.649, 2.638, 2.624, 2.616, 2.617, 2.609, 2.604, 2.603, 2.603, 2.595, 2.589, 2.587, 2.592,\n- 2.641, 2.643, 2.649, 2.647, 2.638, 2.618, 2.615, 2.608, 2.602, 2.595, 2.596, 2.595, 2.593, 2.584, 2.581, 2.583,\n- 2.638, 2.637, 2.647, 2.634, 2.634, 2.618, 2.621, 2.621, 2.611, 2.602, 2.596, 2.583, 2.581, 2.581, 2.576, 2.574\n+ 0, 0,\n+ 1024, 5040,\n+ 2048, 9338,\n+ 3072, 12356,\n+ 4096, 15312,\n+ 5120, 18051,\n+ 6144, 20790,\n+ 7168, 23193,\n+ 8192, 25744,\n+ 9216, 27942,\n+ 10240, 30035,\n+ 11264, 32005,\n+ 12288, 33975,\n+ 13312, 35815,\n+ 14336, 37600,\n+ 15360, 39168,\n+ 16384, 40642,\n+ 18432, 43379,\n+ 20480, 45749,\n+ 22528, 47753,\n+ 24576, 49621,\n+ 26624, 51253,\n+ 28672, 52698,\n+ 30720, 53796,\n+ 32768, 54876,\n+ 36864, 57012,\n+ 40960, 58656,\n+ 45056, 59954,\n+ 49152, 61183,\n+ 53248, 62355,\n+ 57344, 63419,\n+ 61440, 64476,\n+ 65535, 65535\n ]\n }\n- ],\n- \"luminance_lut\":\n- [\n- 1.308, 1.293, 1.228, 1.175, 1.139, 1.108, 1.092, 1.082, 1.082, 1.086, 1.097, 1.114, 1.149, 1.199, 1.279, 1.303,\n- 1.293, 1.249, 1.199, 1.162, 1.136, 1.109, 1.087, 1.077, 1.072, 1.081, 1.095, 1.103, 1.133, 1.172, 1.225, 1.282,\n- 1.251, 1.212, 1.186, 1.159, 1.129, 1.114, 1.102, 1.088, 1.088, 1.088, 1.095, 1.117, 1.123, 1.158, 1.198, 1.249,\n- 1.223, 1.192, 1.177, 1.163, 1.147, 1.139, 1.132, 1.112, 1.111, 1.107, 1.113, 1.118, 1.139, 1.155, 1.186, 1.232,\n- 1.207, 1.186, 1.171, 1.162, 1.168, 1.163, 1.153, 1.138, 1.129, 1.128, 1.132, 1.136, 1.149, 1.167, 1.189, 1.216,\n- 1.198, 1.186, 1.176, 1.176, 1.177, 1.185, 1.171, 1.157, 1.146, 1.144, 1.146, 1.149, 1.161, 1.181, 1.201, 1.221,\n- 1.203, 1.181, 1.176, 1.178, 1.191, 1.189, 1.188, 1.174, 1.159, 1.153, 1.158, 1.161, 1.169, 1.185, 1.211, 1.227,\n- 1.211, 1.179, 1.177, 1.187, 1.194, 1.196, 1.194, 1.187, 1.176, 1.169, 1.171, 1.171, 1.175, 1.189, 1.214, 1.226,\n- 1.219, 1.182, 1.184, 1.191, 1.195, 1.199, 1.197, 1.194, 1.188, 1.185, 1.179, 1.179, 1.182, 1.194, 1.212, 1.227,\n- 1.237, 1.192, 1.194, 1.194, 1.198, 1.199, 1.198, 1.197, 1.196, 1.193, 1.189, 1.189, 1.192, 1.203, 1.214, 1.231,\n- 1.282, 1.199, 1.199, 1.197, 1.199, 1.199, 1.192, 1.193, 1.193, 1.194, 1.196, 1.197, 1.206, 1.216, 1.228, 1.244,\n- 1.309, 1.236, 1.204, 1.203, 1.202, 1.194, 1.194, 1.188, 1.192, 1.192, 1.199, 1.201, 1.212, 1.221, 1.235, 1.247\n- ],\n- \"sigma\": 0.005,\n- \"sigma_Cb\": 0.005\n- },\n- \"rpi.contrast\":\n- {\n- \"ce_enable\": 1,\n- \"gamma_curve\":\n- [\n- 0, 0, 1024, 5040, 2048, 9338, 3072, 12356, 4096, 15312, 5120, 18051, 6144, 20790, 7168, 23193,\n- 8192, 25744, 9216, 27942, 10240, 30035, 11264, 32005, 12288, 33975, 13312, 35815, 14336, 37600, 15360, 39168,\n- 16384, 40642, 18432, 43379, 20480, 45749, 22528, 47753, 24576, 49621, 26624, 51253, 28672, 52698, 30720, 53796,\n- 32768, 54876, 36864, 57012, 40960, 58656, 45056, 59954, 49152, 61183, 53248, 62355, 57344, 63419, 61440, 64476,\n- 65535, 65535\n- ]\n- },\n- \"rpi.sharpen\":\n- {\n- }\n-}\n+ },\n+ {\n+ \"rpi.sharpen\": { }\n+ }\n+ ]\n+}\n\\ No newline at end of file\ndiff --git a/src/ipa/raspberrypi/data/imx378.json b/src/ipa/raspberrypi/data/imx378.json\nindex 6620034513f0..8b4ed22504b5 100644\n--- a/src/ipa/raspberrypi/data/imx378.json\n+++ b/src/ipa/raspberrypi/data/imx378.json\n@@ -1,338 +1,413 @@\n {\n- \"rpi.black_level\":\n- {\n- \"black_level\": 4096\n- },\n- \"rpi.dpc\":\n- {\n- },\n- \"rpi.lux\":\n- {\n- \"reference_shutter_speed\": 9999,\n- \"reference_gain\": 1.95,\n- \"reference_aperture\": 1.0,\n- \"reference_lux\": 1000,\n- \"reference_Y\": 12996\n- },\n- \"rpi.noise\":\n- {\n- \"reference_constant\": 0,\n- \"reference_slope\": 2.641\n- },\n- \"rpi.geq\":\n- {\n- \"offset\": 235,\n- \"slope\": 0.00902\n- },\n- \"rpi.sdn\":\n- {\n- },\n- \"rpi.awb\":\n- {\n- \"priors\":\n- [\n- {\n- \"lux\": 0, \"prior\":\n- [\n- 2000, 1.0, 3000, 0.0, 13000, 0.0\n- ]\n- },\n- {\n- \"lux\": 800, \"prior\":\n- [\n- 2000, 0.0, 6000, 2.0, 13000, 2.0\n- ]\n- },\n+ \"version\": 2.0,\n+ \"target\": \"bcm2835\",\n+ \"algorithms\": [\n+ {\n+ \"rpi.black_level\":\n {\n- \"lux\": 1500, \"prior\":\n- [\n- 2000, 0.0, 4000, 1.0, 6000, 6.0, 6500, 7.0, 7000, 1.0, 13000, 1.0\n- ]\n+ \"black_level\": 4096\n }\n- ],\n- \"modes\":\n+ },\n {\n- \"auto\":\n- {\n- \"lo\": 2500,\n- \"hi\": 8000\n- },\n- \"incandescent\":\n- {\n- \"lo\": 2500,\n- \"hi\": 3000\n- },\n- \"tungsten\":\n- {\n- \"lo\": 3000,\n- \"hi\": 3500\n- },\n- \"fluorescent\":\n- {\n- \"lo\": 4000,\n- \"hi\": 4700\n- },\n- \"indoor\":\n- {\n- \"lo\": 3000,\n- \"hi\": 5000\n- },\n- \"daylight\":\n- {\n- \"lo\": 5500,\n- \"hi\": 6500\n- },\n- \"cloudy\":\n+ \"rpi.dpc\": { }\n+ },\n+ {\n+ \"rpi.lux\":\n {\n- \"lo\": 7000,\n- \"hi\": 8100\n+ \"reference_shutter_speed\": 9999,\n+ \"reference_gain\": 1.95,\n+ \"reference_aperture\": 1.0,\n+ \"reference_lux\": 1000,\n+ \"reference_Y\": 12996\n }\n },\n- \"bayes\": 1,\n- \"ct_curve\":\n- [\n- 2850.0, 0.6361, 0.3911, 3550.0, 0.5386, 0.5077, 4500.0, 0.4472, 0.6171, 5600.0, 0.3906, 0.6848, 8000.0, 0.3412, 0.7441\n- ],\n- \"sensitivity_r\": 1.0,\n- \"sensitivity_b\": 1.0,\n- \"transverse_pos\": 0.01667,\n- \"transverse_neg\": 0.01195\n- },\n- \"rpi.agc\":\n- {\n- \"metering_modes\":\n {\n- \"centre-weighted\":\n+ \"rpi.noise\":\n {\n- \"weights\":\n- [\n- 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0\n- ]\n- },\n- \"spot\":\n- {\n- \"weights\":\n- [\n- 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0\n- ]\n- },\n- \"matrix\":\n+ \"reference_constant\": 0,\n+ \"reference_slope\": 2.641\n+ }\n+ },\n+ {\n+ \"rpi.geq\":\n {\n- \"weights\":\n- [\n- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1\n- ]\n+ \"offset\": 235,\n+ \"slope\": 0.00902\n }\n },\n- \"exposure_modes\":\n {\n- \"normal\":\n+ \"rpi.sdn\": { }\n+ },\n+ {\n+ \"rpi.awb\":\n {\n- \"shutter\":\n- [\n- 100, 10000, 30000, 60000, 120000\n+ \"priors\": [\n+ {\n+ \"lux\": 0,\n+ \"prior\":\n+ [\n+ 2000, 1.0,\n+ 3000, 0.0,\n+ 13000, 0.0\n+ ]\n+ },\n+ {\n+ \"lux\": 800,\n+ \"prior\":\n+ [\n+ 2000, 0.0,\n+ 6000, 2.0,\n+ 13000, 2.0\n+ ]\n+ },\n+ {\n+ \"lux\": 1500,\n+ \"prior\":\n+ [\n+ 2000, 0.0,\n+ 4000, 1.0,\n+ 6000, 6.0,\n+ 6500, 7.0,\n+ 7000, 1.0,\n+ 13000, 1.0\n+ ]\n+ }\n ],\n- \"gain\":\n- [\n- 1.0, 2.0, 4.0, 6.0, 8.0\n- ]\n- },\n- \"short\":\n- {\n- \"shutter\":\n+ \"modes\":\n+ {\n+ \"auto\":\n+ {\n+ \"lo\": 2500,\n+ \"hi\": 8000\n+ },\n+ \"incandescent\":\n+ {\n+ \"lo\": 2500,\n+ \"hi\": 3000\n+ },\n+ \"tungsten\":\n+ {\n+ \"lo\": 3000,\n+ \"hi\": 3500\n+ },\n+ \"fluorescent\":\n+ {\n+ \"lo\": 4000,\n+ \"hi\": 4700\n+ },\n+ \"indoor\":\n+ {\n+ \"lo\": 3000,\n+ \"hi\": 5000\n+ },\n+ \"daylight\":\n+ {\n+ \"lo\": 5500,\n+ \"hi\": 6500\n+ },\n+ \"cloudy\":\n+ {\n+ \"lo\": 7000,\n+ \"hi\": 8100\n+ }\n+ },\n+ \"bayes\": 1,\n+ \"ct_curve\":\n [\n- 100, 5000, 10000, 20000, 120000\n+ 2850.0, 0.6361, 0.3911,\n+ 3550.0, 0.5386, 0.5077,\n+ 4500.0, 0.4472, 0.6171,\n+ 5600.0, 0.3906, 0.6848,\n+ 8000.0, 0.3412, 0.7441\n ],\n- \"gain\":\n- [\n- 1.0, 2.0, 4.0, 6.0, 8.0\n- ]\n+ \"sensitivity_r\": 1.0,\n+ \"sensitivity_b\": 1.0,\n+ \"transverse_pos\": 0.01667,\n+ \"transverse_neg\": 0.01195\n }\n },\n- \"constraint_modes\":\n {\n- \"normal\":\n- [\n+ \"rpi.agc\":\n+ {\n+ \"metering_modes\":\n {\n- \"bound\": \"LOWER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.5, 1000, 0.5\n- ]\n- }\n- ],\n- \"highlight\":\n- [\n+ \"centre-weighted\":\n+ {\n+ \"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+ },\n+ \"spot\":\n+ {\n+ \"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+ },\n+ \"matrix\":\n+ {\n+ \"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+ }\n+ },\n+ \"exposure_modes\":\n {\n- \"bound\": \"LOWER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.5, 1000, 0.5\n- ]\n+ \"normal\":\n+ {\n+ \"shutter\": [ 100, 10000, 30000, 60000, 120000 ],\n+ \"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+ },\n+ \"short\":\n+ {\n+ \"shutter\": [ 100, 5000, 10000, 20000, 120000 ],\n+ \"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+ }\n },\n+ \"constraint_modes\":\n {\n- \"bound\": \"UPPER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.8, 1000, 0.8\n+ \"normal\": [\n+ {\n+ \"bound\": \"LOWER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.5,\n+ 1000, 0.5\n+ ]\n+ }\n+ ],\n+ \"highlight\": [\n+ {\n+ \"bound\": \"LOWER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.5,\n+ 1000, 0.5\n+ ]\n+ },\n+ {\n+ \"bound\": \"UPPER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.8,\n+ 1000, 0.8\n+ ]\n+ }\n ]\n- }\n- ]\n- },\n- \"y_target\":\n- [\n- 0, 0.16, 1000, 0.165, 10000, 0.17\n- ]\n- },\n- \"rpi.alsc\":\n- {\n- \"omega\": 1.3,\n- \"n_iter\": 100,\n- \"luminance_strength\": 0.5,\n- \"calibrations_Cr\":\n- [\n- {\n- \"ct\": 2800, \"table\":\n- [\n- 1.604, 1.601, 1.593, 1.581, 1.568, 1.561, 1.561, 1.561, 1.561, 1.567, 1.582, 1.596, 1.609, 1.622, 1.632, 1.636,\n- 1.601, 1.594, 1.586, 1.571, 1.555, 1.546, 1.543, 1.543, 1.547, 1.555, 1.572, 1.584, 1.599, 1.614, 1.625, 1.632,\n- 1.599, 1.586, 1.571, 1.555, 1.542, 1.528, 1.518, 1.518, 1.523, 1.537, 1.555, 1.572, 1.589, 1.607, 1.622, 1.629,\n- 1.597, 1.579, 1.561, 1.542, 1.528, 1.512, 1.493, 1.493, 1.499, 1.523, 1.537, 1.563, 1.582, 1.601, 1.619, 1.629,\n- 1.597, 1.577, 1.557, 1.535, 1.512, 1.493, 1.481, 1.479, 1.492, 1.499, 1.524, 1.555, 1.578, 1.599, 1.619, 1.629,\n- 1.597, 1.577, 1.557, 1.534, 1.508, 1.483, 1.476, 1.476, 1.481, 1.496, 1.522, 1.554, 1.578, 1.599, 1.619, 1.629,\n- 1.597, 1.578, 1.557, 1.534, 1.508, 1.483, 1.481, 1.479, 1.481, 1.496, 1.522, 1.554, 1.579, 1.601, 1.619, 1.631,\n- 1.597, 1.581, 1.562, 1.539, 1.517, 1.504, 1.483, 1.481, 1.496, 1.511, 1.531, 1.561, 1.585, 1.607, 1.623, 1.632,\n- 1.601, 1.589, 1.569, 1.554, 1.539, 1.517, 1.504, 1.504, 1.511, 1.531, 1.553, 1.573, 1.596, 1.614, 1.629, 1.636,\n- 1.609, 1.601, 1.586, 1.569, 1.554, 1.542, 1.535, 1.535, 1.541, 1.553, 1.573, 1.592, 1.608, 1.625, 1.637, 1.645,\n- 1.617, 1.611, 1.601, 1.586, 1.574, 1.565, 1.564, 1.564, 1.571, 1.579, 1.592, 1.608, 1.622, 1.637, 1.646, 1.654,\n- 1.619, 1.617, 1.611, 1.601, 1.588, 1.585, 1.585, 1.585, 1.588, 1.592, 1.607, 1.622, 1.637, 1.645, 1.654, 1.655\n- ]\n- },\n- {\n- \"ct\": 5500, \"table\":\n+ },\n+ \"y_target\":\n [\n- 2.664, 2.658, 2.645, 2.629, 2.602, 2.602, 2.602, 2.606, 2.617, 2.628, 2.649, 2.677, 2.699, 2.722, 2.736, 2.747,\n- 2.658, 2.653, 2.629, 2.605, 2.576, 2.575, 2.577, 2.592, 2.606, 2.618, 2.629, 2.651, 2.678, 2.707, 2.727, 2.741,\n- 2.649, 2.631, 2.605, 2.576, 2.563, 2.552, 2.552, 2.557, 2.577, 2.604, 2.619, 2.641, 2.669, 2.698, 2.721, 2.741,\n- 2.643, 2.613, 2.583, 2.563, 2.552, 2.531, 2.527, 2.527, 2.551, 2.577, 2.604, 2.638, 2.665, 2.694, 2.721, 2.741,\n- 2.643, 2.606, 2.575, 2.558, 2.531, 2.516, 2.504, 2.516, 2.527, 2.551, 2.596, 2.635, 2.665, 2.694, 2.721, 2.741,\n- 2.643, 2.606, 2.575, 2.558, 2.531, 2.503, 2.501, 2.502, 2.522, 2.551, 2.592, 2.635, 2.669, 2.696, 2.727, 2.744,\n- 2.648, 2.611, 2.579, 2.558, 2.532, 2.511, 2.502, 2.511, 2.522, 2.552, 2.592, 2.642, 2.673, 2.702, 2.731, 2.752,\n- 2.648, 2.619, 2.589, 2.571, 2.556, 2.532, 2.519, 2.522, 2.552, 2.568, 2.605, 2.648, 2.683, 2.715, 2.743, 2.758,\n- 2.659, 2.637, 2.613, 2.589, 2.571, 2.556, 2.555, 2.555, 2.568, 2.605, 2.641, 2.671, 2.699, 2.729, 2.758, 2.776,\n- 2.679, 2.665, 2.637, 2.613, 2.602, 2.599, 2.599, 2.606, 2.619, 2.641, 2.671, 2.698, 2.723, 2.754, 2.776, 2.787,\n- 2.695, 2.684, 2.671, 2.646, 2.636, 2.636, 2.641, 2.648, 2.661, 2.681, 2.698, 2.723, 2.751, 2.776, 2.788, 2.803,\n- 2.702, 2.699, 2.684, 2.671, 2.664, 2.664, 2.664, 2.668, 2.681, 2.698, 2.723, 2.751, 2.773, 2.788, 2.803, 2.805\n+ 0, 0.16,\n+ 1000, 0.165,\n+ 10000, 0.17\n ]\n }\n- ],\n- \"calibrations_Cb\":\n- [\n- {\n- \"ct\": 2800, \"table\":\n- [\n- 2.876, 2.868, 2.863, 2.851, 2.846, 2.846, 2.847, 2.851, 2.851, 2.857, 2.867, 2.875, 2.889, 2.899, 2.913, 2.926,\n- 2.863, 2.861, 2.856, 2.846, 2.846, 2.847, 2.848, 2.851, 2.857, 2.859, 2.875, 2.882, 2.886, 2.896, 2.909, 2.917,\n- 2.861, 2.856, 2.846, 2.841, 2.841, 2.855, 2.867, 2.875, 2.888, 2.888, 2.885, 2.883, 2.886, 2.889, 2.901, 2.913,\n- 2.858, 2.851, 2.846, 2.846, 2.855, 2.867, 2.884, 2.895, 2.902, 2.902, 2.901, 2.891, 2.891, 2.894, 2.901, 2.909,\n- 2.858, 2.851, 2.846, 2.846, 2.867, 2.884, 2.895, 2.902, 2.909, 2.915, 2.911, 2.901, 2.895, 2.898, 2.904, 2.909,\n- 2.858, 2.851, 2.849, 2.853, 2.874, 2.888, 2.901, 2.909, 2.917, 2.922, 2.917, 2.911, 2.901, 2.899, 2.905, 2.908,\n- 2.861, 2.855, 2.853, 2.855, 2.874, 2.888, 2.901, 2.913, 2.918, 2.922, 2.921, 2.911, 2.901, 2.901, 2.907, 2.908,\n- 2.862, 2.859, 2.855, 2.856, 2.872, 2.885, 2.899, 2.906, 2.915, 2.917, 2.911, 2.907, 2.907, 2.907, 2.908, 2.909,\n- 2.863, 2.863, 2.859, 2.864, 2.871, 2.881, 2.885, 2.899, 2.905, 2.905, 2.904, 2.904, 2.907, 2.909, 2.913, 2.913,\n- 2.866, 2.865, 2.865, 2.867, 2.868, 2.872, 2.881, 2.885, 2.889, 2.894, 2.895, 2.902, 2.906, 2.913, 2.914, 2.917,\n- 2.875, 2.875, 2.871, 2.871, 2.871, 2.871, 2.869, 2.869, 2.878, 2.889, 2.894, 2.895, 2.906, 2.914, 2.917, 2.921,\n- 2.882, 2.879, 2.876, 2.874, 2.871, 2.871, 2.869, 2.869, 2.869, 2.878, 2.891, 2.894, 2.905, 2.914, 2.919, 2.921\n- ]\n- },\n+ },\n+ {\n+ \"rpi.alsc\":\n {\n- \"ct\": 5500, \"table\":\n+ \"omega\": 1.3,\n+ \"n_iter\": 100,\n+ \"luminance_strength\": 0.5,\n+ \"calibrations_Cr\": [\n+ {\n+ \"ct\": 2800,\n+ \"table\":\n+ [\n+ 1.604, 1.601, 1.593, 1.581, 1.568, 1.561, 1.561, 1.561, 1.561, 1.567, 1.582, 1.596, 1.609, 1.622, 1.632, 1.636,\n+ 1.601, 1.594, 1.586, 1.571, 1.555, 1.546, 1.543, 1.543, 1.547, 1.555, 1.572, 1.584, 1.599, 1.614, 1.625, 1.632,\n+ 1.599, 1.586, 1.571, 1.555, 1.542, 1.528, 1.518, 1.518, 1.523, 1.537, 1.555, 1.572, 1.589, 1.607, 1.622, 1.629,\n+ 1.597, 1.579, 1.561, 1.542, 1.528, 1.512, 1.493, 1.493, 1.499, 1.523, 1.537, 1.563, 1.582, 1.601, 1.619, 1.629,\n+ 1.597, 1.577, 1.557, 1.535, 1.512, 1.493, 1.481, 1.479, 1.492, 1.499, 1.524, 1.555, 1.578, 1.599, 1.619, 1.629,\n+ 1.597, 1.577, 1.557, 1.534, 1.508, 1.483, 1.476, 1.476, 1.481, 1.496, 1.522, 1.554, 1.578, 1.599, 1.619, 1.629,\n+ 1.597, 1.578, 1.557, 1.534, 1.508, 1.483, 1.481, 1.479, 1.481, 1.496, 1.522, 1.554, 1.579, 1.601, 1.619, 1.631,\n+ 1.597, 1.581, 1.562, 1.539, 1.517, 1.504, 1.483, 1.481, 1.496, 1.511, 1.531, 1.561, 1.585, 1.607, 1.623, 1.632,\n+ 1.601, 1.589, 1.569, 1.554, 1.539, 1.517, 1.504, 1.504, 1.511, 1.531, 1.553, 1.573, 1.596, 1.614, 1.629, 1.636,\n+ 1.609, 1.601, 1.586, 1.569, 1.554, 1.542, 1.535, 1.535, 1.541, 1.553, 1.573, 1.592, 1.608, 1.625, 1.637, 1.645,\n+ 1.617, 1.611, 1.601, 1.586, 1.574, 1.565, 1.564, 1.564, 1.571, 1.579, 1.592, 1.608, 1.622, 1.637, 1.646, 1.654,\n+ 1.619, 1.617, 1.611, 1.601, 1.588, 1.585, 1.585, 1.585, 1.588, 1.592, 1.607, 1.622, 1.637, 1.645, 1.654, 1.655\n+ ]\n+ },\n+ {\n+ \"ct\": 5500,\n+ \"table\":\n+ [\n+ 2.664, 2.658, 2.645, 2.629, 2.602, 2.602, 2.602, 2.606, 2.617, 2.628, 2.649, 2.677, 2.699, 2.722, 2.736, 2.747,\n+ 2.658, 2.653, 2.629, 2.605, 2.576, 2.575, 2.577, 2.592, 2.606, 2.618, 2.629, 2.651, 2.678, 2.707, 2.727, 2.741,\n+ 2.649, 2.631, 2.605, 2.576, 2.563, 2.552, 2.552, 2.557, 2.577, 2.604, 2.619, 2.641, 2.669, 2.698, 2.721, 2.741,\n+ 2.643, 2.613, 2.583, 2.563, 2.552, 2.531, 2.527, 2.527, 2.551, 2.577, 2.604, 2.638, 2.665, 2.694, 2.721, 2.741,\n+ 2.643, 2.606, 2.575, 2.558, 2.531, 2.516, 2.504, 2.516, 2.527, 2.551, 2.596, 2.635, 2.665, 2.694, 2.721, 2.741,\n+ 2.643, 2.606, 2.575, 2.558, 2.531, 2.503, 2.501, 2.502, 2.522, 2.551, 2.592, 2.635, 2.669, 2.696, 2.727, 2.744,\n+ 2.648, 2.611, 2.579, 2.558, 2.532, 2.511, 2.502, 2.511, 2.522, 2.552, 2.592, 2.642, 2.673, 2.702, 2.731, 2.752,\n+ 2.648, 2.619, 2.589, 2.571, 2.556, 2.532, 2.519, 2.522, 2.552, 2.568, 2.605, 2.648, 2.683, 2.715, 2.743, 2.758,\n+ 2.659, 2.637, 2.613, 2.589, 2.571, 2.556, 2.555, 2.555, 2.568, 2.605, 2.641, 2.671, 2.699, 2.729, 2.758, 2.776,\n+ 2.679, 2.665, 2.637, 2.613, 2.602, 2.599, 2.599, 2.606, 2.619, 2.641, 2.671, 2.698, 2.723, 2.754, 2.776, 2.787,\n+ 2.695, 2.684, 2.671, 2.646, 2.636, 2.636, 2.641, 2.648, 2.661, 2.681, 2.698, 2.723, 2.751, 2.776, 2.788, 2.803,\n+ 2.702, 2.699, 2.684, 2.671, 2.664, 2.664, 2.664, 2.668, 2.681, 2.698, 2.723, 2.751, 2.773, 2.788, 2.803, 2.805\n+ ]\n+ }\n+ ],\n+ \"calibrations_Cb\": [\n+ {\n+ \"ct\": 2800,\n+ \"table\":\n+ [\n+ 2.876, 2.868, 2.863, 2.851, 2.846, 2.846, 2.847, 2.851, 2.851, 2.857, 2.867, 2.875, 2.889, 2.899, 2.913, 2.926,\n+ 2.863, 2.861, 2.856, 2.846, 2.846, 2.847, 2.848, 2.851, 2.857, 2.859, 2.875, 2.882, 2.886, 2.896, 2.909, 2.917,\n+ 2.861, 2.856, 2.846, 2.841, 2.841, 2.855, 2.867, 2.875, 2.888, 2.888, 2.885, 2.883, 2.886, 2.889, 2.901, 2.913,\n+ 2.858, 2.851, 2.846, 2.846, 2.855, 2.867, 2.884, 2.895, 2.902, 2.902, 2.901, 2.891, 2.891, 2.894, 2.901, 2.909,\n+ 2.858, 2.851, 2.846, 2.846, 2.867, 2.884, 2.895, 2.902, 2.909, 2.915, 2.911, 2.901, 2.895, 2.898, 2.904, 2.909,\n+ 2.858, 2.851, 2.849, 2.853, 2.874, 2.888, 2.901, 2.909, 2.917, 2.922, 2.917, 2.911, 2.901, 2.899, 2.905, 2.908,\n+ 2.861, 2.855, 2.853, 2.855, 2.874, 2.888, 2.901, 2.913, 2.918, 2.922, 2.921, 2.911, 2.901, 2.901, 2.907, 2.908,\n+ 2.862, 2.859, 2.855, 2.856, 2.872, 2.885, 2.899, 2.906, 2.915, 2.917, 2.911, 2.907, 2.907, 2.907, 2.908, 2.909,\n+ 2.863, 2.863, 2.859, 2.864, 2.871, 2.881, 2.885, 2.899, 2.905, 2.905, 2.904, 2.904, 2.907, 2.909, 2.913, 2.913,\n+ 2.866, 2.865, 2.865, 2.867, 2.868, 2.872, 2.881, 2.885, 2.889, 2.894, 2.895, 2.902, 2.906, 2.913, 2.914, 2.917,\n+ 2.875, 2.875, 2.871, 2.871, 2.871, 2.871, 2.869, 2.869, 2.878, 2.889, 2.894, 2.895, 2.906, 2.914, 2.917, 2.921,\n+ 2.882, 2.879, 2.876, 2.874, 2.871, 2.871, 2.869, 2.869, 2.869, 2.878, 2.891, 2.894, 2.905, 2.914, 2.919, 2.921\n+ ]\n+ },\n+ {\n+ \"ct\": 5500,\n+ \"table\":\n+ [\n+ 1.488, 1.488, 1.488, 1.488, 1.491, 1.492, 1.492, 1.491, 1.491, 1.491, 1.492, 1.495, 1.497, 1.499, 1.499, 1.503,\n+ 1.482, 1.485, 1.485, 1.487, 1.489, 1.492, 1.492, 1.492, 1.492, 1.492, 1.494, 1.494, 1.492, 1.491, 1.493, 1.494,\n+ 1.482, 1.482, 1.484, 1.485, 1.487, 1.492, 1.496, 1.498, 1.499, 1.498, 1.494, 1.492, 1.491, 1.491, 1.491, 1.491,\n+ 1.481, 1.481, 1.482, 1.485, 1.491, 1.496, 1.498, 1.499, 1.501, 1.499, 1.498, 1.493, 1.491, 1.488, 1.488, 1.488,\n+ 1.481, 1.481, 1.481, 1.483, 1.491, 1.497, 1.498, 1.499, 1.501, 1.499, 1.498, 1.492, 1.488, 1.485, 1.483, 1.483,\n+ 1.479, 1.479, 1.481, 1.482, 1.489, 1.495, 1.497, 1.498, 1.499, 1.499, 1.495, 1.492, 1.485, 1.482, 1.482, 1.481,\n+ 1.479, 1.479, 1.479, 1.481, 1.489, 1.494, 1.496, 1.497, 1.497, 1.496, 1.495, 1.489, 1.482, 1.481, 1.479, 1.477,\n+ 1.478, 1.478, 1.479, 1.481, 1.487, 1.491, 1.494, 1.496, 1.496, 1.495, 1.492, 1.487, 1.482, 1.479, 1.478, 1.476,\n+ 1.478, 1.478, 1.479, 1.482, 1.486, 1.488, 1.491, 1.493, 1.493, 1.492, 1.487, 1.484, 1.481, 1.479, 1.476, 1.476,\n+ 1.477, 1.479, 1.481, 1.483, 1.485, 1.486, 1.488, 1.488, 1.487, 1.487, 1.484, 1.483, 1.481, 1.479, 1.476, 1.476,\n+ 1.477, 1.479, 1.482, 1.483, 1.484, 1.485, 1.484, 1.482, 1.482, 1.484, 1.483, 1.482, 1.481, 1.479, 1.477, 1.476,\n+ 1.477, 1.479, 1.482, 1.483, 1.484, 1.484, 1.482, 1.482, 1.482, 1.482, 1.482, 1.481, 1.479, 1.479, 1.479, 1.479\n+ ]\n+ }\n+ ],\n+ \"luminance_lut\":\n [\n- 1.488, 1.488, 1.488, 1.488, 1.491, 1.492, 1.492, 1.491, 1.491, 1.491, 1.492, 1.495, 1.497, 1.499, 1.499, 1.503,\n- 1.482, 1.485, 1.485, 1.487, 1.489, 1.492, 1.492, 1.492, 1.492, 1.492, 1.494, 1.494, 1.492, 1.491, 1.493, 1.494,\n- 1.482, 1.482, 1.484, 1.485, 1.487, 1.492, 1.496, 1.498, 1.499, 1.498, 1.494, 1.492, 1.491, 1.491, 1.491, 1.491,\n- 1.481, 1.481, 1.482, 1.485, 1.491, 1.496, 1.498, 1.499, 1.501, 1.499, 1.498, 1.493, 1.491, 1.488, 1.488, 1.488,\n- 1.481, 1.481, 1.481, 1.483, 1.491, 1.497, 1.498, 1.499, 1.501, 1.499, 1.498, 1.492, 1.488, 1.485, 1.483, 1.483,\n- 1.479, 1.479, 1.481, 1.482, 1.489, 1.495, 1.497, 1.498, 1.499, 1.499, 1.495, 1.492, 1.485, 1.482, 1.482, 1.481,\n- 1.479, 1.479, 1.479, 1.481, 1.489, 1.494, 1.496, 1.497, 1.497, 1.496, 1.495, 1.489, 1.482, 1.481, 1.479, 1.477,\n- 1.478, 1.478, 1.479, 1.481, 1.487, 1.491, 1.494, 1.496, 1.496, 1.495, 1.492, 1.487, 1.482, 1.479, 1.478, 1.476,\n- 1.478, 1.478, 1.479, 1.482, 1.486, 1.488, 1.491, 1.493, 1.493, 1.492, 1.487, 1.484, 1.481, 1.479, 1.476, 1.476,\n- 1.477, 1.479, 1.481, 1.483, 1.485, 1.486, 1.488, 1.488, 1.487, 1.487, 1.484, 1.483, 1.481, 1.479, 1.476, 1.476,\n- 1.477, 1.479, 1.482, 1.483, 1.484, 1.485, 1.484, 1.482, 1.482, 1.484, 1.483, 1.482, 1.481, 1.479, 1.477, 1.476,\n- 1.477, 1.479, 1.482, 1.483, 1.484, 1.484, 1.482, 1.482, 1.482, 1.482, 1.482, 1.481, 1.479, 1.479, 1.479, 1.479\n- ]\n+ 2.764, 2.654, 2.321, 2.043, 1.768, 1.594, 1.558, 1.558, 1.558, 1.568, 1.661, 1.904, 2.193, 2.497, 2.888, 3.043,\n+ 2.654, 2.373, 2.049, 1.819, 1.569, 1.446, 1.381, 1.356, 1.356, 1.403, 1.501, 1.679, 1.939, 2.218, 2.586, 2.888,\n+ 2.376, 2.154, 1.819, 1.569, 1.438, 1.301, 1.246, 1.224, 1.224, 1.263, 1.349, 1.501, 1.679, 1.985, 2.359, 2.609,\n+ 2.267, 1.987, 1.662, 1.438, 1.301, 1.235, 1.132, 1.105, 1.105, 1.164, 1.263, 1.349, 1.528, 1.808, 2.184, 2.491,\n+ 2.218, 1.876, 1.568, 1.367, 1.235, 1.132, 1.087, 1.022, 1.023, 1.104, 1.164, 1.278, 1.439, 1.695, 2.066, 2.429,\n+ 2.218, 1.832, 1.533, 1.341, 1.206, 1.089, 1.013, 1.002, 1.013, 1.026, 1.122, 1.246, 1.399, 1.642, 2.004, 2.426,\n+ 2.218, 1.832, 1.533, 1.341, 1.206, 1.089, 1.011, 1.001, 1.009, 1.026, 1.122, 1.246, 1.399, 1.642, 2.004, 2.426,\n+ 2.224, 1.896, 1.584, 1.382, 1.248, 1.147, 1.088, 1.016, 1.026, 1.118, 1.168, 1.283, 1.444, 1.697, 2.066, 2.428,\n+ 2.292, 2.019, 1.689, 1.462, 1.322, 1.247, 1.147, 1.118, 1.118, 1.168, 1.275, 1.358, 1.532, 1.809, 2.189, 2.491,\n+ 2.444, 2.204, 1.856, 1.606, 1.462, 1.322, 1.257, 1.234, 1.234, 1.275, 1.358, 1.516, 1.686, 1.993, 2.371, 2.622,\n+ 2.748, 2.444, 2.108, 1.856, 1.606, 1.476, 1.399, 1.376, 1.376, 1.422, 1.516, 1.686, 1.968, 2.238, 2.611, 2.935,\n+ 2.862, 2.748, 2.395, 2.099, 1.811, 1.621, 1.582, 1.582, 1.582, 1.592, 1.677, 1.919, 2.223, 2.534, 2.935, 3.078\n+ ],\n+ \"sigma\": 0.00428,\n+ \"sigma_Cb\": 0.00363\n }\n- ],\n- \"luminance_lut\":\n- [\n- 2.764, 2.654, 2.321, 2.043, 1.768, 1.594, 1.558, 1.558, 1.558, 1.568, 1.661, 1.904, 2.193, 2.497, 2.888, 3.043,\n- 2.654, 2.373, 2.049, 1.819, 1.569, 1.446, 1.381, 1.356, 1.356, 1.403, 1.501, 1.679, 1.939, 2.218, 2.586, 2.888,\n- 2.376, 2.154, 1.819, 1.569, 1.438, 1.301, 1.246, 1.224, 1.224, 1.263, 1.349, 1.501, 1.679, 1.985, 2.359, 2.609,\n- 2.267, 1.987, 1.662, 1.438, 1.301, 1.235, 1.132, 1.105, 1.105, 1.164, 1.263, 1.349, 1.528, 1.808, 2.184, 2.491,\n- 2.218, 1.876, 1.568, 1.367, 1.235, 1.132, 1.087, 1.022, 1.023, 1.104, 1.164, 1.278, 1.439, 1.695, 2.066, 2.429,\n- 2.218, 1.832, 1.533, 1.341, 1.206, 1.089, 1.013, 1.002, 1.013, 1.026, 1.122, 1.246, 1.399, 1.642, 2.004, 2.426,\n- 2.218, 1.832, 1.533, 1.341, 1.206, 1.089, 1.011, 1.001, 1.009, 1.026, 1.122, 1.246, 1.399, 1.642, 2.004, 2.426,\n- 2.224, 1.896, 1.584, 1.382, 1.248, 1.147, 1.088, 1.016, 1.026, 1.118, 1.168, 1.283, 1.444, 1.697, 2.066, 2.428,\n- 2.292, 2.019, 1.689, 1.462, 1.322, 1.247, 1.147, 1.118, 1.118, 1.168, 1.275, 1.358, 1.532, 1.809, 2.189, 2.491,\n- 2.444, 2.204, 1.856, 1.606, 1.462, 1.322, 1.257, 1.234, 1.234, 1.275, 1.358, 1.516, 1.686, 1.993, 2.371, 2.622,\n- 2.748, 2.444, 2.108, 1.856, 1.606, 1.476, 1.399, 1.376, 1.376, 1.422, 1.516, 1.686, 1.968, 2.238, 2.611, 2.935,\n- 2.862, 2.748, 2.395, 2.099, 1.811, 1.621, 1.582, 1.582, 1.582, 1.592, 1.677, 1.919, 2.223, 2.534, 2.935, 3.078\n- ],\n- \"sigma\": 0.00428,\n- \"sigma_Cb\": 0.00363\n- },\n- \"rpi.contrast\":\n- {\n- \"ce_enable\": 1,\n- \"gamma_curve\":\n- [\n- 0, 0, 1024, 5040, 2048, 9338, 3072, 12356, 4096, 15312, 5120, 18051, 6144, 20790, 7168, 23193,\n- 8192, 25744, 9216, 27942, 10240, 30035, 11264, 32005, 12288, 33975, 13312, 35815, 14336, 37600, 15360, 39168,\n- 16384, 40642, 18432, 43379, 20480, 45749, 22528, 47753, 24576, 49621, 26624, 51253, 28672, 52698, 30720, 53796,\n- 32768, 54876, 36864, 57012, 40960, 58656, 45056, 59954, 49152, 61183, 53248, 62355, 57344, 63419, 61440, 64476,\n- 65535, 65535\n- ]\n- },\n- \"rpi.ccm\":\n- {\n- \"ccms\":\n- [\n- {\n- \"ct\": 2850, \"ccm\":\n- [\n- 1.42601, -0.20537, -0.22063, -0.47682, 1.81987, -0.34305, 0.01854, -0.86036, 1.84181\n- ]\n- },\n- {\n- \"ct\": 2900, \"ccm\":\n- [\n- 1.29755, 0.04602, -0.34356, -0.41491, 1.73477, -0.31987, -0.01345, -0.97115, 1.98459\n- ]\n- },\n- {\n- \"ct\": 3550, \"ccm\":\n- [\n- 1.49811, -0.33412, -0.16398, -0.40869, 1.72995, -0.32127, -0.01924, -0.62181, 1.64105\n- ]\n- },\n- {\n- \"ct\": 4500, \"ccm\":\n- [\n- 1.47015, -0.29229, -0.17786, -0.36561, 1.88919, -0.52358, -0.03552, -0.56717, 1.60269\n- ]\n- },\n+ },\n+ {\n+ \"rpi.contrast\":\n {\n- \"ct\": 5600, \"ccm\":\n+ \"ce_enable\": 1,\n+ \"gamma_curve\":\n [\n- 1.60962, -0.47434, -0.13528, -0.32701, 1.73797, -0.41096, -0.07626, -0.40171, 1.47796\n+ 0, 0,\n+ 1024, 5040,\n+ 2048, 9338,\n+ 3072, 12356,\n+ 4096, 15312,\n+ 5120, 18051,\n+ 6144, 20790,\n+ 7168, 23193,\n+ 8192, 25744,\n+ 9216, 27942,\n+ 10240, 30035,\n+ 11264, 32005,\n+ 12288, 33975,\n+ 13312, 35815,\n+ 14336, 37600,\n+ 15360, 39168,\n+ 16384, 40642,\n+ 18432, 43379,\n+ 20480, 45749,\n+ 22528, 47753,\n+ 24576, 49621,\n+ 26624, 51253,\n+ 28672, 52698,\n+ 30720, 53796,\n+ 32768, 54876,\n+ 36864, 57012,\n+ 40960, 58656,\n+ 45056, 59954,\n+ 49152, 61183,\n+ 53248, 62355,\n+ 57344, 63419,\n+ 61440, 64476,\n+ 65535, 65535\n ]\n- },\n+ }\n+ },\n+ {\n+ \"rpi.ccm\":\n {\n- \"ct\": 8000, \"ccm\":\n- [\n- 1.54642, -0.20396, -0.34246, -0.31748, 2.22559, -0.90811, -0.10035, -0.65877, 1.75912\n+ \"ccms\": [\n+ {\n+ \"ct\": 2850,\n+ \"ccm\":\n+ [\n+ 1.42601, -0.20537, -0.22063,\n+ -0.47682, 1.81987, -0.34305,\n+ 0.01854, -0.86036, 1.84181\n+ ]\n+ },\n+ {\n+ \"ct\": 2900,\n+ \"ccm\":\n+ [\n+ 1.29755, 0.04602, -0.34356,\n+ -0.41491, 1.73477, -0.31987,\n+ -0.01345, -0.97115, 1.98459\n+ ]\n+ },\n+ {\n+ \"ct\": 3550,\n+ \"ccm\":\n+ [\n+ 1.49811, -0.33412, -0.16398,\n+ -0.40869, 1.72995, -0.32127,\n+ -0.01924, -0.62181, 1.64105\n+ ]\n+ },\n+ {\n+ \"ct\": 4500,\n+ \"ccm\":\n+ [\n+ 1.47015, -0.29229, -0.17786,\n+ -0.36561, 1.88919, -0.52358,\n+ -0.03552, -0.56717, 1.60269\n+ ]\n+ },\n+ {\n+ \"ct\": 5600,\n+ \"ccm\":\n+ [\n+ 1.60962, -0.47434, -0.13528,\n+ -0.32701, 1.73797, -0.41096,\n+ -0.07626, -0.40171, 1.47796\n+ ]\n+ },\n+ {\n+ \"ct\": 8000,\n+ \"ccm\":\n+ [\n+ 1.54642, -0.20396, -0.34246,\n+ -0.31748, 2.22559, -0.90811,\n+ -0.10035, -0.65877, 1.75912\n+ ]\n+ }\n ]\n }\n- ]\n- },\n- \"rpi.sharpen\":\n- {\n- }\n-}\n+ },\n+ {\n+ \"rpi.sharpen\": { }\n+ }\n+ ]\n+}\n\\ No newline at end of file\ndiff --git a/src/ipa/raspberrypi/data/imx477.json b/src/ipa/raspberrypi/data/imx477.json\nindex 0f389661c246..5bcaac67069b 100644\n--- a/src/ipa/raspberrypi/data/imx477.json\n+++ b/src/ipa/raspberrypi/data/imx477.json\n@@ -1,430 +1,519 @@\n {\n- \"rpi.black_level\":\n- {\n- \"black_level\": 4096\n- },\n- \"rpi.dpc\":\n- {\n-\n- },\n- \"rpi.lux\":\n- {\n- \"reference_shutter_speed\": 27242,\n- \"reference_gain\": 1.0,\n- \"reference_aperture\": 1.0,\n- \"reference_lux\": 830,\n- \"reference_Y\": 17755\n- },\n- \"rpi.noise\":\n- {\n- \"reference_constant\": 0,\n- \"reference_slope\": 2.767\n- },\n- \"rpi.geq\":\n- {\n- \"offset\": 204,\n- \"slope\": 0.01078\n- },\n- \"rpi.sdn\":\n- {\n-\n- },\n- \"rpi.awb\":\n- {\n- \"priors\":\n- [\n- {\n- \"lux\": 0, \"prior\":\n- [\n- 2000, 1.0, 3000, 0.0, 13000, 0.0\n- ]\n- },\n- {\n- \"lux\": 800, \"prior\":\n- [\n- 2000, 0.0, 6000, 2.0, 13000, 2.0\n- ]\n- },\n+ \"version\": 2.0,\n+ \"target\": \"bcm2835\",\n+ \"algorithms\": [\n+ {\n+ \"rpi.black_level\":\n {\n- \"lux\": 1500, \"prior\":\n- [\n- 2000, 0.0, 4000, 1.0, 6000, 6.0, 6500, 7.0, 7000, 1.0, 13000, 1.0\n- ]\n+ \"black_level\": 4096\n }\n- ],\n- \"modes\":\n+ },\n {\n- \"auto\":\n- {\n- \"lo\": 2500,\n- \"hi\": 8000\n- },\n- \"incandescent\":\n- {\n- \"lo\": 2500,\n- \"hi\": 3000\n- },\n- \"tungsten\":\n- {\n- \"lo\": 3000,\n- \"hi\": 3500\n- },\n- \"fluorescent\":\n- {\n- \"lo\": 4000,\n- \"hi\": 4700\n- },\n- \"indoor\":\n- {\n- \"lo\": 3000,\n- \"hi\": 5000\n- },\n- \"daylight\":\n- {\n- \"lo\": 5500,\n- \"hi\": 6500\n- },\n- \"cloudy\":\n+ \"rpi.dpc\": { }\n+ },\n+ {\n+ \"rpi.lux\":\n {\n- \"lo\": 7000,\n- \"hi\": 8600\n+ \"reference_shutter_speed\": 27242,\n+ \"reference_gain\": 1.0,\n+ \"reference_aperture\": 1.0,\n+ \"reference_lux\": 830,\n+ \"reference_Y\": 17755\n }\n },\n- \"bayes\": 1,\n- \"ct_curve\":\n- [\n- 2360.0, 0.6009, 0.3093, 2870.0, 0.5047, 0.3936, 2970.0, 0.4782, 0.4221, 3700.0, 0.4212, 0.4923, 3870.0, 0.4037, 0.5166, 4000.0,\n- 0.3965, 0.5271, 4400.0, 0.3703, 0.5666, 4715.0, 0.3411, 0.6147, 5920.0, 0.3108, 0.6687, 9050.0, 0.2524, 0.7856\n- ],\n- \"sensitivity_r\": 1.05,\n- \"sensitivity_b\": 1.05,\n- \"transverse_pos\": 0.0238,\n- \"transverse_neg\": 0.04429\n- },\n- \"rpi.agc\":\n- {\n- \"metering_modes\":\n {\n- \"centre-weighted\":\n- {\n- \"weights\":\n- [\n- 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0\n- ]\n- },\n- \"spot\":\n+ \"rpi.noise\":\n {\n- \"weights\":\n- [\n- 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0\n- ]\n- },\n- \"matrix\":\n- {\n- \"weights\":\n- [\n- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1\n- ]\n+ \"reference_constant\": 0,\n+ \"reference_slope\": 2.767\n }\n },\n- \"exposure_modes\":\n {\n- \"normal\":\n+ \"rpi.geq\":\n {\n- \"shutter\":\n- [\n- 100, 10000, 30000, 60000, 66666\n- ],\n- \"gain\":\n- [\n- 1.0, 2.0, 4.0, 6.0, 8.0\n- ]\n- },\n- \"short\":\n- {\n- \"shutter\":\n- [\n- 100, 5000, 10000, 20000, 33333\n+ \"offset\": 204,\n+ \"slope\": 0.01078\n+ }\n+ },\n+ {\n+ \"rpi.sdn\": { }\n+ },\n+ {\n+ \"rpi.awb\":\n+ {\n+ \"priors\": [\n+ {\n+ \"lux\": 0,\n+ \"prior\":\n+ [\n+ 2000, 1.0,\n+ 3000, 0.0,\n+ 13000, 0.0\n+ ]\n+ },\n+ {\n+ \"lux\": 800,\n+ \"prior\":\n+ [\n+ 2000, 0.0,\n+ 6000, 2.0,\n+ 13000, 2.0\n+ ]\n+ },\n+ {\n+ \"lux\": 1500,\n+ \"prior\":\n+ [\n+ 2000, 0.0,\n+ 4000, 1.0,\n+ 6000, 6.0,\n+ 6500, 7.0,\n+ 7000, 1.0,\n+ 13000, 1.0\n+ ]\n+ }\n ],\n- \"gain\":\n- [\n- 1.0, 2.0, 4.0, 6.0, 8.0\n- ]\n- },\n- \"long\":\n- {\n- \"shutter\":\n+ \"modes\":\n+ {\n+ \"auto\":\n+ {\n+ \"lo\": 2500,\n+ \"hi\": 8000\n+ },\n+ \"incandescent\":\n+ {\n+ \"lo\": 2500,\n+ \"hi\": 3000\n+ },\n+ \"tungsten\":\n+ {\n+ \"lo\": 3000,\n+ \"hi\": 3500\n+ },\n+ \"fluorescent\":\n+ {\n+ \"lo\": 4000,\n+ \"hi\": 4700\n+ },\n+ \"indoor\":\n+ {\n+ \"lo\": 3000,\n+ \"hi\": 5000\n+ },\n+ \"daylight\":\n+ {\n+ \"lo\": 5500,\n+ \"hi\": 6500\n+ },\n+ \"cloudy\":\n+ {\n+ \"lo\": 7000,\n+ \"hi\": 8600\n+ }\n+ },\n+ \"bayes\": 1,\n+ \"ct_curve\":\n [\n- 100, 10000, 30000, 60000, 120000\n+ 2360.0, 0.6009, 0.3093,\n+ 2870.0, 0.5047, 0.3936,\n+ 2970.0, 0.4782, 0.4221,\n+ 3700.0, 0.4212, 0.4923,\n+ 3870.0, 0.4037, 0.5166,\n+ 4000.0, 0.3965, 0.5271,\n+ 4400.0, 0.3703, 0.5666,\n+ 4715.0, 0.3411, 0.6147,\n+ 5920.0, 0.3108, 0.6687,\n+ 9050.0, 0.2524, 0.7856\n ],\n- \"gain\":\n- [\n- 1.0, 2.0, 4.0, 6.0, 12.0\n- ]\n+ \"sensitivity_r\": 1.05,\n+ \"sensitivity_b\": 1.05,\n+ \"transverse_pos\": 0.0238,\n+ \"transverse_neg\": 0.04429\n }\n },\n- \"constraint_modes\":\n {\n- \"normal\":\n- [\n- {\n- \"bound\": \"LOWER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.3, 1000, 0.3\n- ]\n- }\n- ],\n- \"highlight\":\n- [\n+ \"rpi.agc\":\n+ {\n+ \"metering_modes\":\n {\n- \"bound\": \"LOWER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.3, 1000, 0.3\n- ]\n+ \"centre-weighted\":\n+ {\n+ \"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+ },\n+ \"spot\":\n+ {\n+ \"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+ },\n+ \"matrix\":\n+ {\n+ \"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+ }\n },\n+ \"exposure_modes\":\n {\n- \"bound\": \"UPPER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.8, 1000, 0.8\n- ]\n- }\n- ],\n- \"shadows\":\n- [\n+ \"normal\":\n+ {\n+ \"shutter\": [ 100, 10000, 30000, 60000, 66666 ],\n+ \"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+ },\n+ \"short\":\n+ {\n+ \"shutter\": [ 100, 5000, 10000, 20000, 33333 ],\n+ \"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+ },\n+ \"long\":\n+ {\n+ \"shutter\": [ 100, 10000, 30000, 60000, 120000 ],\n+ \"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+ }\n+ },\n+ \"constraint_modes\":\n {\n- \"bound\": \"LOWER\", \"q_lo\": 0.0, \"q_hi\": 0.5, \"y_target\":\n- [\n- 0, 0.17, 1000, 0.17\n+ \"normal\": [\n+ {\n+ \"bound\": \"LOWER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.3,\n+ 1000, 0.3\n+ ]\n+ }\n+ ],\n+ \"highlight\": [\n+ {\n+ \"bound\": \"LOWER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.3,\n+ 1000, 0.3\n+ ]\n+ },\n+ {\n+ \"bound\": \"UPPER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.8,\n+ 1000, 0.8\n+ ]\n+ }\n+ ],\n+ \"shadows\": [\n+ {\n+ \"bound\": \"LOWER\",\n+ \"q_lo\": 0.0,\n+ \"q_hi\": 0.5,\n+ \"y_target\":\n+ [\n+ 0, 0.17,\n+ 1000, 0.17\n+ ]\n+ }\n ]\n- }\n- ]\n- },\n- \"y_target\":\n- [\n- 0, 0.16, 1000, 0.165, 10000, 0.17\n- ]\n- },\n- \"rpi.alsc\":\n- {\n- \"omega\": 1.3,\n- \"n_iter\": 100,\n- \"luminance_strength\": 0.5,\n- \"calibrations_Cr\":\n- [\n- {\n- \"ct\": 2960, \"table\":\n- [\n- 2.088, 2.086, 2.082, 2.081, 2.077, 2.071, 2.068, 2.068, 2.072, 2.073, 2.075, 2.078, 2.084, 2.092, 2.095, 2.098,\n- 2.086, 2.084, 2.079, 2.078, 2.075, 2.068, 2.064, 2.063, 2.068, 2.071, 2.072, 2.075, 2.081, 2.089, 2.092, 2.094,\n- 2.083, 2.081, 2.077, 2.072, 2.069, 2.062, 2.059, 2.059, 2.063, 2.067, 2.069, 2.072, 2.079, 2.088, 2.089, 2.089,\n- 2.081, 2.077, 2.072, 2.068, 2.065, 2.058, 2.055, 2.054, 2.057, 2.062, 2.066, 2.069, 2.077, 2.084, 2.086, 2.086,\n- 2.078, 2.075, 2.069, 2.065, 2.061, 2.055, 2.052, 2.049, 2.051, 2.056, 2.062, 2.065, 2.072, 2.079, 2.081, 2.079,\n- 2.079, 2.075, 2.069, 2.064, 2.061, 2.053, 2.049, 2.046, 2.049, 2.051, 2.057, 2.062, 2.069, 2.075, 2.077, 2.075,\n- 2.082, 2.079, 2.072, 2.065, 2.061, 2.054, 2.049, 2.047, 2.049, 2.051, 2.056, 2.061, 2.066, 2.073, 2.073, 2.069,\n- 2.086, 2.082, 2.075, 2.068, 2.062, 2.054, 2.051, 2.049, 2.051, 2.052, 2.056, 2.061, 2.066, 2.073, 2.073, 2.072,\n- 2.088, 2.086, 2.079, 2.074, 2.066, 2.057, 2.051, 2.051, 2.054, 2.055, 2.056, 2.061, 2.067, 2.072, 2.073, 2.072,\n- 2.091, 2.087, 2.079, 2.075, 2.068, 2.057, 2.052, 2.052, 2.056, 2.055, 2.055, 2.059, 2.066, 2.072, 2.072, 2.072,\n- 2.093, 2.088, 2.081, 2.077, 2.069, 2.059, 2.054, 2.054, 2.057, 2.056, 2.056, 2.058, 2.066, 2.072, 2.073, 2.073,\n- 2.095, 2.091, 2.084, 2.078, 2.075, 2.067, 2.057, 2.057, 2.059, 2.059, 2.058, 2.059, 2.068, 2.073, 2.075, 2.078\n- ]\n- },\n- {\n- \"ct\": 4850, \"table\":\n- [\n- 2.973, 2.968, 2.956, 2.943, 2.941, 2.932, 2.923, 2.921, 2.924, 2.929, 2.931, 2.939, 2.953, 2.965, 2.966, 2.976,\n- 2.969, 2.962, 2.951, 2.941, 2.934, 2.928, 2.919, 2.918, 2.919, 2.923, 2.927, 2.933, 2.945, 2.957, 2.962, 2.962,\n- 2.964, 2.956, 2.944, 2.932, 2.929, 2.924, 2.915, 2.914, 2.915, 2.919, 2.924, 2.928, 2.941, 2.952, 2.958, 2.959,\n- 2.957, 2.951, 2.939, 2.928, 2.924, 2.919, 2.913, 2.911, 2.911, 2.915, 2.919, 2.925, 2.936, 2.947, 2.952, 2.953,\n- 2.954, 2.947, 2.935, 2.924, 2.919, 2.915, 2.908, 2.906, 2.906, 2.907, 2.914, 2.921, 2.932, 2.941, 2.943, 2.942,\n- 2.953, 2.946, 2.932, 2.921, 2.916, 2.911, 2.904, 2.902, 2.901, 2.904, 2.909, 2.919, 2.926, 2.937, 2.939, 2.939,\n- 2.953, 2.947, 2.932, 2.918, 2.915, 2.909, 2.903, 2.901, 2.901, 2.906, 2.911, 2.918, 2.924, 2.936, 2.936, 2.932,\n- 2.956, 2.948, 2.934, 2.919, 2.916, 2.908, 2.903, 2.901, 2.902, 2.907, 2.909, 2.917, 2.926, 2.936, 2.939, 2.939,\n- 2.957, 2.951, 2.936, 2.923, 2.917, 2.907, 2.904, 2.901, 2.902, 2.908, 2.911, 2.919, 2.929, 2.939, 2.942, 2.942,\n- 2.961, 2.951, 2.936, 2.922, 2.918, 2.906, 2.904, 2.901, 2.901, 2.907, 2.911, 2.921, 2.931, 2.941, 2.942, 2.944,\n- 2.964, 2.954, 2.936, 2.924, 2.918, 2.909, 2.905, 2.905, 2.905, 2.907, 2.912, 2.923, 2.933, 2.942, 2.944, 2.944,\n- 2.964, 2.958, 2.943, 2.927, 2.921, 2.914, 2.909, 2.907, 2.907, 2.912, 2.916, 2.928, 2.936, 2.944, 2.947, 2.952\n- ]\n- },\n- {\n- \"ct\": 5930, \"table\":\n+ },\n+ \"y_target\":\n [\n- 3.312, 3.308, 3.301, 3.294, 3.288, 3.277, 3.268, 3.261, 3.259, 3.261, 3.267, 3.273, 3.285, 3.301, 3.303, 3.312,\n- 3.308, 3.304, 3.294, 3.291, 3.283, 3.271, 3.263, 3.259, 3.257, 3.258, 3.261, 3.268, 3.278, 3.293, 3.299, 3.299,\n- 3.302, 3.296, 3.288, 3.282, 3.276, 3.267, 3.259, 3.254, 3.252, 3.253, 3.256, 3.261, 3.273, 3.289, 3.292, 3.292,\n- 3.296, 3.289, 3.282, 3.276, 3.269, 3.263, 3.256, 3.251, 3.248, 3.249, 3.251, 3.257, 3.268, 3.279, 3.284, 3.284,\n- 3.292, 3.285, 3.279, 3.271, 3.264, 3.257, 3.249, 3.243, 3.241, 3.241, 3.246, 3.252, 3.261, 3.274, 3.275, 3.273,\n- 3.291, 3.285, 3.276, 3.268, 3.259, 3.251, 3.242, 3.239, 3.236, 3.238, 3.244, 3.248, 3.258, 3.268, 3.269, 3.265,\n- 3.294, 3.288, 3.275, 3.266, 3.257, 3.248, 3.239, 3.238, 3.237, 3.238, 3.243, 3.246, 3.255, 3.264, 3.264, 3.257,\n- 3.297, 3.293, 3.279, 3.268, 3.258, 3.249, 3.238, 3.237, 3.239, 3.239, 3.243, 3.245, 3.255, 3.264, 3.264, 3.263,\n- 3.301, 3.295, 3.281, 3.271, 3.259, 3.248, 3.237, 3.237, 3.239, 3.241, 3.243, 3.246, 3.257, 3.265, 3.266, 3.264,\n- 3.306, 3.295, 3.279, 3.271, 3.261, 3.247, 3.235, 3.234, 3.239, 3.239, 3.243, 3.247, 3.258, 3.265, 3.265, 3.264,\n- 3.308, 3.297, 3.279, 3.272, 3.261, 3.249, 3.239, 3.239, 3.241, 3.243, 3.245, 3.248, 3.261, 3.265, 3.266, 3.265,\n- 3.309, 3.301, 3.286, 3.276, 3.267, 3.256, 3.246, 3.242, 3.244, 3.244, 3.249, 3.253, 3.263, 3.267, 3.271, 3.274\n+ 0, 0.16,\n+ 1000, 0.165,\n+ 10000, 0.17\n ]\n }\n- ],\n- \"calibrations_Cb\":\n- [\n- {\n- \"ct\": 2960, \"table\":\n- [\n- 2.133, 2.134, 2.139, 2.143, 2.148, 2.155, 2.158, 2.158, 2.158, 2.161, 2.161, 2.162, 2.159, 2.156, 2.152, 2.151,\n- 2.132, 2.133, 2.135, 2.142, 2.147, 2.153, 2.158, 2.158, 2.158, 2.158, 2.159, 2.159, 2.157, 2.154, 2.151, 2.148,\n- 2.133, 2.133, 2.135, 2.142, 2.149, 2.154, 2.158, 2.158, 2.157, 2.156, 2.158, 2.157, 2.155, 2.153, 2.148, 2.146,\n- 2.133, 2.133, 2.138, 2.145, 2.149, 2.154, 2.158, 2.159, 2.158, 2.155, 2.157, 2.156, 2.153, 2.149, 2.146, 2.144,\n- 2.133, 2.134, 2.139, 2.146, 2.149, 2.154, 2.158, 2.159, 2.159, 2.156, 2.154, 2.154, 2.149, 2.145, 2.143, 2.139,\n- 2.135, 2.135, 2.139, 2.146, 2.151, 2.155, 2.158, 2.159, 2.158, 2.156, 2.153, 2.151, 2.146, 2.143, 2.139, 2.136,\n- 2.135, 2.135, 2.138, 2.145, 2.151, 2.154, 2.157, 2.158, 2.157, 2.156, 2.153, 2.151, 2.147, 2.143, 2.141, 2.137,\n- 2.135, 2.134, 2.135, 2.141, 2.149, 2.154, 2.157, 2.157, 2.157, 2.157, 2.157, 2.153, 2.149, 2.146, 2.142, 2.139,\n- 2.132, 2.133, 2.135, 2.139, 2.148, 2.153, 2.158, 2.159, 2.159, 2.161, 2.161, 2.157, 2.154, 2.149, 2.144, 2.141,\n- 2.132, 2.133, 2.135, 2.141, 2.149, 2.155, 2.161, 2.161, 2.162, 2.162, 2.163, 2.159, 2.154, 2.149, 2.144, 2.138,\n- 2.136, 2.136, 2.137, 2.143, 2.149, 2.156, 2.162, 2.163, 2.162, 2.163, 2.164, 2.161, 2.157, 2.152, 2.146, 2.138,\n- 2.137, 2.137, 2.141, 2.147, 2.152, 2.157, 2.162, 2.162, 2.159, 2.161, 2.162, 2.162, 2.157, 2.152, 2.148, 2.148\n- ]\n- },\n- {\n- \"ct\": 4850, \"table\":\n- [\n- 1.463, 1.464, 1.471, 1.478, 1.479, 1.483, 1.484, 1.486, 1.486, 1.484, 1.483, 1.481, 1.478, 1.475, 1.471, 1.468,\n- 1.463, 1.463, 1.468, 1.476, 1.479, 1.482, 1.484, 1.487, 1.486, 1.484, 1.483, 1.482, 1.478, 1.473, 1.469, 1.468,\n- 1.463, 1.464, 1.468, 1.476, 1.479, 1.483, 1.484, 1.486, 1.486, 1.485, 1.484, 1.482, 1.477, 1.473, 1.469, 1.468,\n- 1.463, 1.464, 1.469, 1.477, 1.481, 1.483, 1.485, 1.487, 1.487, 1.485, 1.485, 1.482, 1.478, 1.474, 1.469, 1.468,\n- 1.465, 1.465, 1.471, 1.478, 1.481, 1.484, 1.486, 1.488, 1.488, 1.487, 1.485, 1.482, 1.477, 1.472, 1.468, 1.467,\n- 1.465, 1.466, 1.472, 1.479, 1.482, 1.485, 1.486, 1.488, 1.488, 1.486, 1.484, 1.479, 1.475, 1.472, 1.468, 1.466,\n- 1.466, 1.466, 1.472, 1.478, 1.482, 1.484, 1.485, 1.488, 1.487, 1.485, 1.483, 1.479, 1.475, 1.472, 1.469, 1.468,\n- 1.465, 1.466, 1.469, 1.476, 1.481, 1.485, 1.485, 1.486, 1.486, 1.485, 1.483, 1.479, 1.477, 1.474, 1.471, 1.469,\n- 1.464, 1.465, 1.469, 1.476, 1.481, 1.484, 1.485, 1.487, 1.487, 1.486, 1.485, 1.481, 1.478, 1.475, 1.471, 1.469,\n- 1.463, 1.464, 1.469, 1.477, 1.481, 1.485, 1.485, 1.488, 1.488, 1.487, 1.486, 1.481, 1.478, 1.475, 1.471, 1.468,\n- 1.464, 1.465, 1.471, 1.478, 1.482, 1.486, 1.486, 1.488, 1.488, 1.487, 1.486, 1.481, 1.478, 1.475, 1.472, 1.468,\n- 1.465, 1.466, 1.472, 1.481, 1.483, 1.487, 1.487, 1.488, 1.488, 1.486, 1.485, 1.481, 1.479, 1.476, 1.473, 1.472\n- ]\n- },\n- {\n- \"ct\": 5930, \"table\":\n+ },\n+ {\n+ \"rpi.alsc\":\n+ {\n+ \"omega\": 1.3,\n+ \"n_iter\": 100,\n+ \"luminance_strength\": 0.5,\n+ \"calibrations_Cr\": [\n+ {\n+ \"ct\": 2960,\n+ \"table\":\n+ [\n+ 2.088, 2.086, 2.082, 2.081, 2.077, 2.071, 2.068, 2.068, 2.072, 2.073, 2.075, 2.078, 2.084, 2.092, 2.095, 2.098,\n+ 2.086, 2.084, 2.079, 2.078, 2.075, 2.068, 2.064, 2.063, 2.068, 2.071, 2.072, 2.075, 2.081, 2.089, 2.092, 2.094,\n+ 2.083, 2.081, 2.077, 2.072, 2.069, 2.062, 2.059, 2.059, 2.063, 2.067, 2.069, 2.072, 2.079, 2.088, 2.089, 2.089,\n+ 2.081, 2.077, 2.072, 2.068, 2.065, 2.058, 2.055, 2.054, 2.057, 2.062, 2.066, 2.069, 2.077, 2.084, 2.086, 2.086,\n+ 2.078, 2.075, 2.069, 2.065, 2.061, 2.055, 2.052, 2.049, 2.051, 2.056, 2.062, 2.065, 2.072, 2.079, 2.081, 2.079,\n+ 2.079, 2.075, 2.069, 2.064, 2.061, 2.053, 2.049, 2.046, 2.049, 2.051, 2.057, 2.062, 2.069, 2.075, 2.077, 2.075,\n+ 2.082, 2.079, 2.072, 2.065, 2.061, 2.054, 2.049, 2.047, 2.049, 2.051, 2.056, 2.061, 2.066, 2.073, 2.073, 2.069,\n+ 2.086, 2.082, 2.075, 2.068, 2.062, 2.054, 2.051, 2.049, 2.051, 2.052, 2.056, 2.061, 2.066, 2.073, 2.073, 2.072,\n+ 2.088, 2.086, 2.079, 2.074, 2.066, 2.057, 2.051, 2.051, 2.054, 2.055, 2.056, 2.061, 2.067, 2.072, 2.073, 2.072,\n+ 2.091, 2.087, 2.079, 2.075, 2.068, 2.057, 2.052, 2.052, 2.056, 2.055, 2.055, 2.059, 2.066, 2.072, 2.072, 2.072,\n+ 2.093, 2.088, 2.081, 2.077, 2.069, 2.059, 2.054, 2.054, 2.057, 2.056, 2.056, 2.058, 2.066, 2.072, 2.073, 2.073,\n+ 2.095, 2.091, 2.084, 2.078, 2.075, 2.067, 2.057, 2.057, 2.059, 2.059, 2.058, 2.059, 2.068, 2.073, 2.075, 2.078\n+ ]\n+ },\n+ {\n+ \"ct\": 4850,\n+ \"table\":\n+ [\n+ 2.973, 2.968, 2.956, 2.943, 2.941, 2.932, 2.923, 2.921, 2.924, 2.929, 2.931, 2.939, 2.953, 2.965, 2.966, 2.976,\n+ 2.969, 2.962, 2.951, 2.941, 2.934, 2.928, 2.919, 2.918, 2.919, 2.923, 2.927, 2.933, 2.945, 2.957, 2.962, 2.962,\n+ 2.964, 2.956, 2.944, 2.932, 2.929, 2.924, 2.915, 2.914, 2.915, 2.919, 2.924, 2.928, 2.941, 2.952, 2.958, 2.959,\n+ 2.957, 2.951, 2.939, 2.928, 2.924, 2.919, 2.913, 2.911, 2.911, 2.915, 2.919, 2.925, 2.936, 2.947, 2.952, 2.953,\n+ 2.954, 2.947, 2.935, 2.924, 2.919, 2.915, 2.908, 2.906, 2.906, 2.907, 2.914, 2.921, 2.932, 2.941, 2.943, 2.942,\n+ 2.953, 2.946, 2.932, 2.921, 2.916, 2.911, 2.904, 2.902, 2.901, 2.904, 2.909, 2.919, 2.926, 2.937, 2.939, 2.939,\n+ 2.953, 2.947, 2.932, 2.918, 2.915, 2.909, 2.903, 2.901, 2.901, 2.906, 2.911, 2.918, 2.924, 2.936, 2.936, 2.932,\n+ 2.956, 2.948, 2.934, 2.919, 2.916, 2.908, 2.903, 2.901, 2.902, 2.907, 2.909, 2.917, 2.926, 2.936, 2.939, 2.939,\n+ 2.957, 2.951, 2.936, 2.923, 2.917, 2.907, 2.904, 2.901, 2.902, 2.908, 2.911, 2.919, 2.929, 2.939, 2.942, 2.942,\n+ 2.961, 2.951, 2.936, 2.922, 2.918, 2.906, 2.904, 2.901, 2.901, 2.907, 2.911, 2.921, 2.931, 2.941, 2.942, 2.944,\n+ 2.964, 2.954, 2.936, 2.924, 2.918, 2.909, 2.905, 2.905, 2.905, 2.907, 2.912, 2.923, 2.933, 2.942, 2.944, 2.944,\n+ 2.964, 2.958, 2.943, 2.927, 2.921, 2.914, 2.909, 2.907, 2.907, 2.912, 2.916, 2.928, 2.936, 2.944, 2.947, 2.952\n+ ]\n+ },\n+ {\n+ \"ct\": 5930,\n+ \"table\":\n+ [\n+ 3.312, 3.308, 3.301, 3.294, 3.288, 3.277, 3.268, 3.261, 3.259, 3.261, 3.267, 3.273, 3.285, 3.301, 3.303, 3.312,\n+ 3.308, 3.304, 3.294, 3.291, 3.283, 3.271, 3.263, 3.259, 3.257, 3.258, 3.261, 3.268, 3.278, 3.293, 3.299, 3.299,\n+ 3.302, 3.296, 3.288, 3.282, 3.276, 3.267, 3.259, 3.254, 3.252, 3.253, 3.256, 3.261, 3.273, 3.289, 3.292, 3.292,\n+ 3.296, 3.289, 3.282, 3.276, 3.269, 3.263, 3.256, 3.251, 3.248, 3.249, 3.251, 3.257, 3.268, 3.279, 3.284, 3.284,\n+ 3.292, 3.285, 3.279, 3.271, 3.264, 3.257, 3.249, 3.243, 3.241, 3.241, 3.246, 3.252, 3.261, 3.274, 3.275, 3.273,\n+ 3.291, 3.285, 3.276, 3.268, 3.259, 3.251, 3.242, 3.239, 3.236, 3.238, 3.244, 3.248, 3.258, 3.268, 3.269, 3.265,\n+ 3.294, 3.288, 3.275, 3.266, 3.257, 3.248, 3.239, 3.238, 3.237, 3.238, 3.243, 3.246, 3.255, 3.264, 3.264, 3.257,\n+ 3.297, 3.293, 3.279, 3.268, 3.258, 3.249, 3.238, 3.237, 3.239, 3.239, 3.243, 3.245, 3.255, 3.264, 3.264, 3.263,\n+ 3.301, 3.295, 3.281, 3.271, 3.259, 3.248, 3.237, 3.237, 3.239, 3.241, 3.243, 3.246, 3.257, 3.265, 3.266, 3.264,\n+ 3.306, 3.295, 3.279, 3.271, 3.261, 3.247, 3.235, 3.234, 3.239, 3.239, 3.243, 3.247, 3.258, 3.265, 3.265, 3.264,\n+ 3.308, 3.297, 3.279, 3.272, 3.261, 3.249, 3.239, 3.239, 3.241, 3.243, 3.245, 3.248, 3.261, 3.265, 3.266, 3.265,\n+ 3.309, 3.301, 3.286, 3.276, 3.267, 3.256, 3.246, 3.242, 3.244, 3.244, 3.249, 3.253, 3.263, 3.267, 3.271, 3.274\n+ ]\n+ }\n+ ],\n+ \"calibrations_Cb\": [\n+ {\n+ \"ct\": 2960,\n+ \"table\":\n+ [\n+ 2.133, 2.134, 2.139, 2.143, 2.148, 2.155, 2.158, 2.158, 2.158, 2.161, 2.161, 2.162, 2.159, 2.156, 2.152, 2.151,\n+ 2.132, 2.133, 2.135, 2.142, 2.147, 2.153, 2.158, 2.158, 2.158, 2.158, 2.159, 2.159, 2.157, 2.154, 2.151, 2.148,\n+ 2.133, 2.133, 2.135, 2.142, 2.149, 2.154, 2.158, 2.158, 2.157, 2.156, 2.158, 2.157, 2.155, 2.153, 2.148, 2.146,\n+ 2.133, 2.133, 2.138, 2.145, 2.149, 2.154, 2.158, 2.159, 2.158, 2.155, 2.157, 2.156, 2.153, 2.149, 2.146, 2.144,\n+ 2.133, 2.134, 2.139, 2.146, 2.149, 2.154, 2.158, 2.159, 2.159, 2.156, 2.154, 2.154, 2.149, 2.145, 2.143, 2.139,\n+ 2.135, 2.135, 2.139, 2.146, 2.151, 2.155, 2.158, 2.159, 2.158, 2.156, 2.153, 2.151, 2.146, 2.143, 2.139, 2.136,\n+ 2.135, 2.135, 2.138, 2.145, 2.151, 2.154, 2.157, 2.158, 2.157, 2.156, 2.153, 2.151, 2.147, 2.143, 2.141, 2.137,\n+ 2.135, 2.134, 2.135, 2.141, 2.149, 2.154, 2.157, 2.157, 2.157, 2.157, 2.157, 2.153, 2.149, 2.146, 2.142, 2.139,\n+ 2.132, 2.133, 2.135, 2.139, 2.148, 2.153, 2.158, 2.159, 2.159, 2.161, 2.161, 2.157, 2.154, 2.149, 2.144, 2.141,\n+ 2.132, 2.133, 2.135, 2.141, 2.149, 2.155, 2.161, 2.161, 2.162, 2.162, 2.163, 2.159, 2.154, 2.149, 2.144, 2.138,\n+ 2.136, 2.136, 2.137, 2.143, 2.149, 2.156, 2.162, 2.163, 2.162, 2.163, 2.164, 2.161, 2.157, 2.152, 2.146, 2.138,\n+ 2.137, 2.137, 2.141, 2.147, 2.152, 2.157, 2.162, 2.162, 2.159, 2.161, 2.162, 2.162, 2.157, 2.152, 2.148, 2.148\n+ ]\n+ },\n+ {\n+ \"ct\": 4850,\n+ \"table\":\n+ [\n+ 1.463, 1.464, 1.471, 1.478, 1.479, 1.483, 1.484, 1.486, 1.486, 1.484, 1.483, 1.481, 1.478, 1.475, 1.471, 1.468,\n+ 1.463, 1.463, 1.468, 1.476, 1.479, 1.482, 1.484, 1.487, 1.486, 1.484, 1.483, 1.482, 1.478, 1.473, 1.469, 1.468,\n+ 1.463, 1.464, 1.468, 1.476, 1.479, 1.483, 1.484, 1.486, 1.486, 1.485, 1.484, 1.482, 1.477, 1.473, 1.469, 1.468,\n+ 1.463, 1.464, 1.469, 1.477, 1.481, 1.483, 1.485, 1.487, 1.487, 1.485, 1.485, 1.482, 1.478, 1.474, 1.469, 1.468,\n+ 1.465, 1.465, 1.471, 1.478, 1.481, 1.484, 1.486, 1.488, 1.488, 1.487, 1.485, 1.482, 1.477, 1.472, 1.468, 1.467,\n+ 1.465, 1.466, 1.472, 1.479, 1.482, 1.485, 1.486, 1.488, 1.488, 1.486, 1.484, 1.479, 1.475, 1.472, 1.468, 1.466,\n+ 1.466, 1.466, 1.472, 1.478, 1.482, 1.484, 1.485, 1.488, 1.487, 1.485, 1.483, 1.479, 1.475, 1.472, 1.469, 1.468,\n+ 1.465, 1.466, 1.469, 1.476, 1.481, 1.485, 1.485, 1.486, 1.486, 1.485, 1.483, 1.479, 1.477, 1.474, 1.471, 1.469,\n+ 1.464, 1.465, 1.469, 1.476, 1.481, 1.484, 1.485, 1.487, 1.487, 1.486, 1.485, 1.481, 1.478, 1.475, 1.471, 1.469,\n+ 1.463, 1.464, 1.469, 1.477, 1.481, 1.485, 1.485, 1.488, 1.488, 1.487, 1.486, 1.481, 1.478, 1.475, 1.471, 1.468,\n+ 1.464, 1.465, 1.471, 1.478, 1.482, 1.486, 1.486, 1.488, 1.488, 1.487, 1.486, 1.481, 1.478, 1.475, 1.472, 1.468,\n+ 1.465, 1.466, 1.472, 1.481, 1.483, 1.487, 1.487, 1.488, 1.488, 1.486, 1.485, 1.481, 1.479, 1.476, 1.473, 1.472\n+ ]\n+ },\n+ {\n+ \"ct\": 5930,\n+ \"table\":\n+ [\n+ 1.443, 1.444, 1.448, 1.453, 1.459, 1.463, 1.465, 1.467, 1.469, 1.469, 1.467, 1.466, 1.462, 1.457, 1.454, 1.451,\n+ 1.443, 1.444, 1.445, 1.451, 1.459, 1.463, 1.465, 1.467, 1.469, 1.469, 1.467, 1.465, 1.461, 1.456, 1.452, 1.451,\n+ 1.444, 1.444, 1.445, 1.451, 1.459, 1.463, 1.466, 1.468, 1.469, 1.469, 1.467, 1.465, 1.461, 1.456, 1.452, 1.449,\n+ 1.444, 1.444, 1.447, 1.452, 1.459, 1.464, 1.467, 1.469, 1.471, 1.469, 1.467, 1.466, 1.461, 1.456, 1.452, 1.449,\n+ 1.444, 1.445, 1.448, 1.452, 1.459, 1.465, 1.469, 1.471, 1.471, 1.471, 1.468, 1.465, 1.461, 1.455, 1.451, 1.449,\n+ 1.445, 1.446, 1.449, 1.453, 1.461, 1.466, 1.469, 1.471, 1.472, 1.469, 1.467, 1.465, 1.459, 1.455, 1.451, 1.447,\n+ 1.446, 1.446, 1.449, 1.453, 1.461, 1.466, 1.469, 1.469, 1.469, 1.469, 1.467, 1.465, 1.459, 1.455, 1.452, 1.449,\n+ 1.446, 1.446, 1.447, 1.451, 1.459, 1.466, 1.469, 1.469, 1.469, 1.469, 1.467, 1.465, 1.461, 1.457, 1.454, 1.451,\n+ 1.444, 1.444, 1.447, 1.451, 1.459, 1.466, 1.469, 1.469, 1.471, 1.471, 1.468, 1.466, 1.462, 1.458, 1.454, 1.452,\n+ 1.444, 1.444, 1.448, 1.453, 1.459, 1.466, 1.469, 1.471, 1.472, 1.472, 1.468, 1.466, 1.462, 1.458, 1.454, 1.449,\n+ 1.446, 1.447, 1.449, 1.454, 1.461, 1.466, 1.471, 1.471, 1.471, 1.471, 1.468, 1.466, 1.462, 1.459, 1.455, 1.449,\n+ 1.447, 1.447, 1.452, 1.457, 1.462, 1.468, 1.472, 1.472, 1.471, 1.471, 1.468, 1.466, 1.462, 1.459, 1.456, 1.455\n+ ]\n+ }\n+ ],\n+ \"luminance_lut\":\n [\n- 1.443, 1.444, 1.448, 1.453, 1.459, 1.463, 1.465, 1.467, 1.469, 1.469, 1.467, 1.466, 1.462, 1.457, 1.454, 1.451,\n- 1.443, 1.444, 1.445, 1.451, 1.459, 1.463, 1.465, 1.467, 1.469, 1.469, 1.467, 1.465, 1.461, 1.456, 1.452, 1.451,\n- 1.444, 1.444, 1.445, 1.451, 1.459, 1.463, 1.466, 1.468, 1.469, 1.469, 1.467, 1.465, 1.461, 1.456, 1.452, 1.449,\n- 1.444, 1.444, 1.447, 1.452, 1.459, 1.464, 1.467, 1.469, 1.471, 1.469, 1.467, 1.466, 1.461, 1.456, 1.452, 1.449,\n- 1.444, 1.445, 1.448, 1.452, 1.459, 1.465, 1.469, 1.471, 1.471, 1.471, 1.468, 1.465, 1.461, 1.455, 1.451, 1.449,\n- 1.445, 1.446, 1.449, 1.453, 1.461, 1.466, 1.469, 1.471, 1.472, 1.469, 1.467, 1.465, 1.459, 1.455, 1.451, 1.447,\n- 1.446, 1.446, 1.449, 1.453, 1.461, 1.466, 1.469, 1.469, 1.469, 1.469, 1.467, 1.465, 1.459, 1.455, 1.452, 1.449,\n- 1.446, 1.446, 1.447, 1.451, 1.459, 1.466, 1.469, 1.469, 1.469, 1.469, 1.467, 1.465, 1.461, 1.457, 1.454, 1.451,\n- 1.444, 1.444, 1.447, 1.451, 1.459, 1.466, 1.469, 1.469, 1.471, 1.471, 1.468, 1.466, 1.462, 1.458, 1.454, 1.452,\n- 1.444, 1.444, 1.448, 1.453, 1.459, 1.466, 1.469, 1.471, 1.472, 1.472, 1.468, 1.466, 1.462, 1.458, 1.454, 1.449,\n- 1.446, 1.447, 1.449, 1.454, 1.461, 1.466, 1.471, 1.471, 1.471, 1.471, 1.468, 1.466, 1.462, 1.459, 1.455, 1.449,\n- 1.447, 1.447, 1.452, 1.457, 1.462, 1.468, 1.472, 1.472, 1.471, 1.471, 1.468, 1.466, 1.462, 1.459, 1.456, 1.455\n- ]\n+ 1.548, 1.499, 1.387, 1.289, 1.223, 1.183, 1.164, 1.154, 1.153, 1.169, 1.211, 1.265, 1.345, 1.448, 1.581, 1.619,\n+ 1.513, 1.412, 1.307, 1.228, 1.169, 1.129, 1.105, 1.098, 1.103, 1.127, 1.157, 1.209, 1.272, 1.361, 1.481, 1.583,\n+ 1.449, 1.365, 1.257, 1.175, 1.124, 1.085, 1.062, 1.054, 1.059, 1.079, 1.113, 1.151, 1.211, 1.293, 1.407, 1.488,\n+ 1.424, 1.324, 1.222, 1.139, 1.089, 1.056, 1.034, 1.031, 1.034, 1.049, 1.075, 1.115, 1.164, 1.241, 1.351, 1.446,\n+ 1.412, 1.297, 1.203, 1.119, 1.069, 1.039, 1.021, 1.016, 1.022, 1.032, 1.052, 1.086, 1.135, 1.212, 1.321, 1.439,\n+ 1.406, 1.287, 1.195, 1.115, 1.059, 1.028, 1.014, 1.012, 1.015, 1.026, 1.041, 1.074, 1.125, 1.201, 1.302, 1.425,\n+ 1.406, 1.294, 1.205, 1.126, 1.062, 1.031, 1.013, 1.009, 1.011, 1.019, 1.042, 1.079, 1.129, 1.203, 1.302, 1.435,\n+ 1.415, 1.318, 1.229, 1.146, 1.076, 1.039, 1.019, 1.014, 1.017, 1.031, 1.053, 1.093, 1.144, 1.219, 1.314, 1.436,\n+ 1.435, 1.348, 1.246, 1.164, 1.094, 1.059, 1.036, 1.032, 1.037, 1.049, 1.072, 1.114, 1.167, 1.257, 1.343, 1.462,\n+ 1.471, 1.385, 1.278, 1.189, 1.124, 1.084, 1.064, 1.061, 1.069, 1.078, 1.101, 1.146, 1.207, 1.298, 1.415, 1.496,\n+ 1.522, 1.436, 1.323, 1.228, 1.169, 1.118, 1.101, 1.094, 1.099, 1.113, 1.146, 1.194, 1.265, 1.353, 1.474, 1.571,\n+ 1.578, 1.506, 1.378, 1.281, 1.211, 1.156, 1.135, 1.134, 1.139, 1.158, 1.194, 1.251, 1.327, 1.427, 1.559, 1.611\n+ ],\n+ \"sigma\": 0.00121,\n+ \"sigma_Cb\": 0.00115\n }\n- ],\n- \"luminance_lut\":\n- [\n- 1.548, 1.499, 1.387, 1.289, 1.223, 1.183, 1.164, 1.154, 1.153, 1.169, 1.211, 1.265, 1.345, 1.448, 1.581, 1.619,\n- 1.513, 1.412, 1.307, 1.228, 1.169, 1.129, 1.105, 1.098, 1.103, 1.127, 1.157, 1.209, 1.272, 1.361, 1.481, 1.583,\n- 1.449, 1.365, 1.257, 1.175, 1.124, 1.085, 1.062, 1.054, 1.059, 1.079, 1.113, 1.151, 1.211, 1.293, 1.407, 1.488,\n- 1.424, 1.324, 1.222, 1.139, 1.089, 1.056, 1.034, 1.031, 1.034, 1.049, 1.075, 1.115, 1.164, 1.241, 1.351, 1.446,\n- 1.412, 1.297, 1.203, 1.119, 1.069, 1.039, 1.021, 1.016, 1.022, 1.032, 1.052, 1.086, 1.135, 1.212, 1.321, 1.439,\n- 1.406, 1.287, 1.195, 1.115, 1.059, 1.028, 1.014, 1.012, 1.015, 1.026, 1.041, 1.074, 1.125, 1.201, 1.302, 1.425,\n- 1.406, 1.294, 1.205, 1.126, 1.062, 1.031, 1.013, 1.009, 1.011, 1.019, 1.042, 1.079, 1.129, 1.203, 1.302, 1.435,\n- 1.415, 1.318, 1.229, 1.146, 1.076, 1.039, 1.019, 1.014, 1.017, 1.031, 1.053, 1.093, 1.144, 1.219, 1.314, 1.436,\n- 1.435, 1.348, 1.246, 1.164, 1.094, 1.059, 1.036, 1.032, 1.037, 1.049, 1.072, 1.114, 1.167, 1.257, 1.343, 1.462,\n- 1.471, 1.385, 1.278, 1.189, 1.124, 1.084, 1.064, 1.061, 1.069, 1.078, 1.101, 1.146, 1.207, 1.298, 1.415, 1.496,\n- 1.522, 1.436, 1.323, 1.228, 1.169, 1.118, 1.101, 1.094, 1.099, 1.113, 1.146, 1.194, 1.265, 1.353, 1.474, 1.571,\n- 1.578, 1.506, 1.378, 1.281, 1.211, 1.156, 1.135, 1.134, 1.139, 1.158, 1.194, 1.251, 1.327, 1.427, 1.559, 1.611\n- ],\n- \"sigma\": 0.00121,\n- \"sigma_Cb\": 0.00115\n- },\n- \"rpi.contrast\":\n- {\n- \"ce_enable\": 1,\n- \"gamma_curve\":\n- [\n- 0, 0, 1024, 5040, 2048, 9338, 3072, 12356, 4096, 15312, 5120, 18051, 6144, 20790, 7168, 23193,\n- 8192, 25744, 9216, 27942, 10240, 30035, 11264, 32005, 12288, 33975, 13312, 35815, 14336, 37600, 15360, 39168,\n- 16384, 40642, 18432, 43379, 20480, 45749, 22528, 47753, 24576, 49621, 26624, 51253, 28672, 52698, 30720, 53796,\n- 32768, 54876, 36864, 57012, 40960, 58656, 45056, 59954, 49152, 61183, 53248, 62355, 57344, 63419, 61440, 64476,\n- 65535, 65535\n- ]\n- },\n- \"rpi.ccm\":\n- {\n- \"ccms\":\n- [\n- {\n- \"ct\": 2360, \"ccm\":\n- [\n- 1.66078, -0.23588, -0.42491, -0.47456, 1.82763, -0.35307, -0.00545, -1.44729, 2.45273\n- ]\n- },\n- {\n- \"ct\": 2870, \"ccm\":\n- [\n- 1.78373, -0.55344, -0.23029, -0.39951, 1.69701, -0.29751, 0.01986, -1.06525, 2.04539\n- ]\n- },\n- {\n- \"ct\": 2970, \"ccm\":\n- [\n- 1.73511, -0.56973, -0.16537, -0.36338, 1.69878, -0.33539, -0.02354, -0.76813, 1.79168\n- ]\n- },\n- {\n- \"ct\": 3000, \"ccm\":\n- [\n- 2.06374, -0.92218, -0.14156, -0.41721, 1.69289, -0.27568, -0.00554, -0.92741, 1.93295\n- ]\n- },\n- {\n- \"ct\": 3700, \"ccm\":\n- [\n- 2.13792, -1.08136, -0.05655, -0.34739, 1.58989, -0.24249, -0.00349, -0.76789, 1.77138\n- ]\n- },\n- {\n- \"ct\": 3870, \"ccm\":\n- [\n- 1.83834, -0.70528, -0.13307, -0.30499, 1.60523, -0.30024, -0.05701, -0.58313, 1.64014\n- ]\n- },\n- {\n- \"ct\": 4000, \"ccm\":\n- [\n- 2.15741, -1.10295, -0.05447, -0.34631, 1.61158, -0.26528, -0.02723, -0.70288, 1.73011\n- ]\n- },\n- {\n- \"ct\": 4400, \"ccm\":\n- [\n- 2.05729, -0.95007, -0.10723, -0.41712, 1.78606, -0.36894, -0.11899, -0.55727, 1.67626\n- ]\n- },\n-\n- {\n- \"ct\": 4715, \"ccm\":\n- [\n- 1.90255, -0.77478, -0.12777, -0.31338, 1.88197, -0.56858, -0.06001, -0.61785, 1.67786\n- ]\n- },\n+ },\n+ {\n+ \"rpi.contrast\":\n {\n- \"ct\": 5920, \"ccm\":\n+ \"ce_enable\": 1,\n+ \"gamma_curve\":\n [\n- 1.98691, -0.84671, -0.14019, -0.26581, 1.70615, -0.44035, -0.09532, -0.47332, 1.56864\n+ 0, 0,\n+ 1024, 5040,\n+ 2048, 9338,\n+ 3072, 12356,\n+ 4096, 15312,\n+ 5120, 18051,\n+ 6144, 20790,\n+ 7168, 23193,\n+ 8192, 25744,\n+ 9216, 27942,\n+ 10240, 30035,\n+ 11264, 32005,\n+ 12288, 33975,\n+ 13312, 35815,\n+ 14336, 37600,\n+ 15360, 39168,\n+ 16384, 40642,\n+ 18432, 43379,\n+ 20480, 45749,\n+ 22528, 47753,\n+ 24576, 49621,\n+ 26624, 51253,\n+ 28672, 52698,\n+ 30720, 53796,\n+ 32768, 54876,\n+ 36864, 57012,\n+ 40960, 58656,\n+ 45056, 59954,\n+ 49152, 61183,\n+ 53248, 62355,\n+ 57344, 63419,\n+ 61440, 64476,\n+ 65535, 65535\n ]\n- },\n- {\n- \"ct\": 9050, \"ccm\":\n- [\n- 2.09255, -0.76541, -0.32714, -0.28973, 2.27462, -0.98489, -0.17299, -0.61275, 1.78574\n+ }\n+ },\n+ {\n+ \"rpi.ccm\":\n+ {\n+ \"ccms\": [\n+ {\n+ \"ct\": 2360,\n+ \"ccm\":\n+ [\n+ 1.66078, -0.23588, -0.42491,\n+ -0.47456, 1.82763, -0.35307,\n+ -0.00545, -1.44729, 2.45273\n+ ]\n+ },\n+ {\n+ \"ct\": 2870,\n+ \"ccm\":\n+ [\n+ 1.78373, -0.55344, -0.23029,\n+ -0.39951, 1.69701, -0.29751,\n+ 0.01986, -1.06525, 2.04539\n+ ]\n+ },\n+ {\n+ \"ct\": 2970,\n+ \"ccm\":\n+ [\n+ 1.73511, -0.56973, -0.16537,\n+ -0.36338, 1.69878, -0.33539,\n+ -0.02354, -0.76813, 1.79168\n+ ]\n+ },\n+ {\n+ \"ct\": 3000,\n+ \"ccm\":\n+ [\n+ 2.06374, -0.92218, -0.14156,\n+ -0.41721, 1.69289, -0.27568,\n+ -0.00554, -0.92741, 1.93295\n+ ]\n+ },\n+ {\n+ \"ct\": 3700,\n+ \"ccm\":\n+ [\n+ 2.13792, -1.08136, -0.05655,\n+ -0.34739, 1.58989, -0.24249,\n+ -0.00349, -0.76789, 1.77138\n+ ]\n+ },\n+ {\n+ \"ct\": 3870,\n+ \"ccm\":\n+ [\n+ 1.83834, -0.70528, -0.13307,\n+ -0.30499, 1.60523, -0.30024,\n+ -0.05701, -0.58313, 1.64014\n+ ]\n+ },\n+ {\n+ \"ct\": 4000,\n+ \"ccm\":\n+ [\n+ 2.15741, -1.10295, -0.05447,\n+ -0.34631, 1.61158, -0.26528,\n+ -0.02723, -0.70288, 1.73011\n+ ]\n+ },\n+ {\n+ \"ct\": 4400,\n+ \"ccm\":\n+ [\n+ 2.05729, -0.95007, -0.10723,\n+ -0.41712, 1.78606, -0.36894,\n+ -0.11899, -0.55727, 1.67626\n+ ]\n+ },\n+ {\n+ \"ct\": 4715,\n+ \"ccm\":\n+ [\n+ 1.90255, -0.77478, -0.12777,\n+ -0.31338, 1.88197, -0.56858,\n+ -0.06001, -0.61785, 1.67786\n+ ]\n+ },\n+ {\n+ \"ct\": 5920,\n+ \"ccm\":\n+ [\n+ 1.98691, -0.84671, -0.14019,\n+ -0.26581, 1.70615, -0.44035,\n+ -0.09532, -0.47332, 1.56864\n+ ]\n+ },\n+ {\n+ \"ct\": 9050,\n+ \"ccm\":\n+ [\n+ 2.09255, -0.76541, -0.32714,\n+ -0.28973, 2.27462, -0.98489,\n+ -0.17299, -0.61275, 1.78574\n+ ]\n+ }\n ]\n }\n- ]\n- },\n- \"rpi.sharpen\":\n- {\n-\n- },\n- \"rpi.focus\":\n- {\n- }\n-}\n+ },\n+ {\n+ \"rpi.sharpen\": { }\n+ },\n+ {\n+ \"rpi.focus\": { }\n+ }\n+ ]\n+}\n\\ No newline at end of file\ndiff --git a/src/ipa/raspberrypi/data/imx477_noir.json b/src/ipa/raspberrypi/data/imx477_noir.json\nindex a379d780d966..dadd97bc3d78 100644\n--- a/src/ipa/raspberrypi/data/imx477_noir.json\n+++ b/src/ipa/raspberrypi/data/imx477_noir.json\n@@ -1,362 +1,432 @@\n {\n- \"rpi.black_level\":\n- {\n- \"black_level\": 4096\n- },\n- \"rpi.dpc\":\n- {\n-\n- },\n- \"rpi.lux\":\n- {\n- \"reference_shutter_speed\": 27242,\n- \"reference_gain\": 1.0,\n- \"reference_aperture\": 1.0,\n- \"reference_lux\": 830,\n- \"reference_Y\": 17755\n- },\n- \"rpi.noise\":\n- {\n- \"reference_constant\": 0,\n- \"reference_slope\": 2.767\n- },\n- \"rpi.geq\":\n- {\n- \"offset\": 204,\n- \"slope\": 0.01078\n- },\n- \"rpi.sdn\":\n- {\n-\n- },\n- \"rpi.awb\":\n- {\n- \"bayes\": 0\n- },\n- \"rpi.agc\":\n- {\n- \"metering_modes\":\n+ \"version\": 2.0,\n+ \"target\": \"bcm2835\",\n+ \"algorithms\": [\n {\n- \"centre-weighted\":\n+ \"rpi.black_level\":\n {\n- \"weights\":\n- [\n- 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0\n- ]\n- },\n- \"spot\":\n- {\n- \"weights\":\n- [\n- 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0\n- ]\n- },\n- \"matrix\":\n+ \"black_level\": 4096\n+ }\n+ },\n+ {\n+ \"rpi.dpc\": { }\n+ },\n+ {\n+ \"rpi.lux\":\n {\n- \"weights\":\n- [\n- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1\n- ]\n+ \"reference_shutter_speed\": 27242,\n+ \"reference_gain\": 1.0,\n+ \"reference_aperture\": 1.0,\n+ \"reference_lux\": 830,\n+ \"reference_Y\": 17755\n }\n },\n- \"exposure_modes\":\n {\n- \"normal\":\n+ \"rpi.noise\":\n {\n- \"shutter\":\n- [\n- 100, 10000, 30000, 60000, 66666\n- ],\n- \"gain\":\n- [\n- 1.0, 2.0, 4.0, 6.0, 8.0\n- ]\n- },\n- \"short\":\n+ \"reference_constant\": 0,\n+ \"reference_slope\": 2.767\n+ }\n+ },\n+ {\n+ \"rpi.geq\":\n {\n- \"shutter\":\n- [\n- 100, 5000, 10000, 20000, 33333\n- ],\n- \"gain\":\n- [\n- 1.0, 2.0, 4.0, 6.0, 8.0\n- ]\n- },\n- \"long\":\n+ \"offset\": 204,\n+ \"slope\": 0.01078\n+ }\n+ },\n+ {\n+ \"rpi.sdn\": { }\n+ },\n+ {\n+ \"rpi.awb\":\n {\n- \"shutter\":\n- [\n- 100, 10000, 30000, 60000, 120000\n- ],\n- \"gain\":\n- [\n- 1.0, 2.0, 4.0, 6.0, 12.0\n- ]\n+ \"bayes\": 0\n }\n },\n- \"constraint_modes\":\n {\n- \"normal\":\n- [\n- {\n- \"bound\": \"LOWER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.3, 1000, 0.3\n- ]\n- }\n- ],\n- \"highlight\":\n- [\n+ \"rpi.agc\":\n+ {\n+ \"metering_modes\":\n {\n- \"bound\": \"LOWER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.3, 1000, 0.3\n- ]\n+ \"centre-weighted\":\n+ {\n+ \"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+ },\n+ \"spot\":\n+ {\n+ \"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+ },\n+ \"matrix\":\n+ {\n+ \"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+ }\n },\n+ \"exposure_modes\":\n {\n- \"bound\": \"UPPER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.8, 1000, 0.8\n- ]\n- }\n- ],\n- \"shadows\":\n- [\n+ \"normal\":\n+ {\n+ \"shutter\": [ 100, 10000, 30000, 60000, 66666 ],\n+ \"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+ },\n+ \"short\":\n+ {\n+ \"shutter\": [ 100, 5000, 10000, 20000, 33333 ],\n+ \"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+ },\n+ \"long\":\n+ {\n+ \"shutter\": [ 100, 10000, 30000, 60000, 120000 ],\n+ \"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+ }\n+ },\n+ \"constraint_modes\":\n {\n- \"bound\": \"LOWER\", \"q_lo\": 0.0, \"q_hi\": 0.5, \"y_target\":\n- [\n- 0, 0.17, 1000, 0.17\n+ \"normal\": [\n+ {\n+ \"bound\": \"LOWER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.3,\n+ 1000, 0.3\n+ ]\n+ }\n+ ],\n+ \"highlight\": [\n+ {\n+ \"bound\": \"LOWER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.3,\n+ 1000, 0.3\n+ ]\n+ },\n+ {\n+ \"bound\": \"UPPER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.8,\n+ 1000, 0.8\n+ ]\n+ }\n+ ],\n+ \"shadows\": [\n+ {\n+ \"bound\": \"LOWER\",\n+ \"q_lo\": 0.0,\n+ \"q_hi\": 0.5,\n+ \"y_target\":\n+ [\n+ 0, 0.17,\n+ 1000, 0.17\n+ ]\n+ }\n ]\n- }\n- ]\n- },\n- \"y_target\":\n- [\n- 0, 0.16, 1000, 0.165, 10000, 0.17\n- ]\n- },\n- \"rpi.alsc\":\n- {\n- \"omega\": 1.3,\n- \"n_iter\": 100,\n- \"luminance_strength\": 0.5,\n- \"calibrations_Cr\":\n- [\n- {\n- \"ct\": 2960, \"table\":\n- [\n- 2.088, 2.086, 2.082, 2.081, 2.077, 2.071, 2.068, 2.068, 2.072, 2.073, 2.075, 2.078, 2.084, 2.092, 2.095, 2.098,\n- 2.086, 2.084, 2.079, 2.078, 2.075, 2.068, 2.064, 2.063, 2.068, 2.071, 2.072, 2.075, 2.081, 2.089, 2.092, 2.094,\n- 2.083, 2.081, 2.077, 2.072, 2.069, 2.062, 2.059, 2.059, 2.063, 2.067, 2.069, 2.072, 2.079, 2.088, 2.089, 2.089,\n- 2.081, 2.077, 2.072, 2.068, 2.065, 2.058, 2.055, 2.054, 2.057, 2.062, 2.066, 2.069, 2.077, 2.084, 2.086, 2.086,\n- 2.078, 2.075, 2.069, 2.065, 2.061, 2.055, 2.052, 2.049, 2.051, 2.056, 2.062, 2.065, 2.072, 2.079, 2.081, 2.079,\n- 2.079, 2.075, 2.069, 2.064, 2.061, 2.053, 2.049, 2.046, 2.049, 2.051, 2.057, 2.062, 2.069, 2.075, 2.077, 2.075,\n- 2.082, 2.079, 2.072, 2.065, 2.061, 2.054, 2.049, 2.047, 2.049, 2.051, 2.056, 2.061, 2.066, 2.073, 2.073, 2.069,\n- 2.086, 2.082, 2.075, 2.068, 2.062, 2.054, 2.051, 2.049, 2.051, 2.052, 2.056, 2.061, 2.066, 2.073, 2.073, 2.072,\n- 2.088, 2.086, 2.079, 2.074, 2.066, 2.057, 2.051, 2.051, 2.054, 2.055, 2.056, 2.061, 2.067, 2.072, 2.073, 2.072,\n- 2.091, 2.087, 2.079, 2.075, 2.068, 2.057, 2.052, 2.052, 2.056, 2.055, 2.055, 2.059, 2.066, 2.072, 2.072, 2.072,\n- 2.093, 2.088, 2.081, 2.077, 2.069, 2.059, 2.054, 2.054, 2.057, 2.056, 2.056, 2.058, 2.066, 2.072, 2.073, 2.073,\n- 2.095, 2.091, 2.084, 2.078, 2.075, 2.067, 2.057, 2.057, 2.059, 2.059, 2.058, 2.059, 2.068, 2.073, 2.075, 2.078\n- ]\n- },\n- {\n- \"ct\": 4850, \"table\":\n- [\n- 2.973, 2.968, 2.956, 2.943, 2.941, 2.932, 2.923, 2.921, 2.924, 2.929, 2.931, 2.939, 2.953, 2.965, 2.966, 2.976,\n- 2.969, 2.962, 2.951, 2.941, 2.934, 2.928, 2.919, 2.918, 2.919, 2.923, 2.927, 2.933, 2.945, 2.957, 2.962, 2.962,\n- 2.964, 2.956, 2.944, 2.932, 2.929, 2.924, 2.915, 2.914, 2.915, 2.919, 2.924, 2.928, 2.941, 2.952, 2.958, 2.959,\n- 2.957, 2.951, 2.939, 2.928, 2.924, 2.919, 2.913, 2.911, 2.911, 2.915, 2.919, 2.925, 2.936, 2.947, 2.952, 2.953,\n- 2.954, 2.947, 2.935, 2.924, 2.919, 2.915, 2.908, 2.906, 2.906, 2.907, 2.914, 2.921, 2.932, 2.941, 2.943, 2.942,\n- 2.953, 2.946, 2.932, 2.921, 2.916, 2.911, 2.904, 2.902, 2.901, 2.904, 2.909, 2.919, 2.926, 2.937, 2.939, 2.939,\n- 2.953, 2.947, 2.932, 2.918, 2.915, 2.909, 2.903, 2.901, 2.901, 2.906, 2.911, 2.918, 2.924, 2.936, 2.936, 2.932,\n- 2.956, 2.948, 2.934, 2.919, 2.916, 2.908, 2.903, 2.901, 2.902, 2.907, 2.909, 2.917, 2.926, 2.936, 2.939, 2.939,\n- 2.957, 2.951, 2.936, 2.923, 2.917, 2.907, 2.904, 2.901, 2.902, 2.908, 2.911, 2.919, 2.929, 2.939, 2.942, 2.942,\n- 2.961, 2.951, 2.936, 2.922, 2.918, 2.906, 2.904, 2.901, 2.901, 2.907, 2.911, 2.921, 2.931, 2.941, 2.942, 2.944,\n- 2.964, 2.954, 2.936, 2.924, 2.918, 2.909, 2.905, 2.905, 2.905, 2.907, 2.912, 2.923, 2.933, 2.942, 2.944, 2.944,\n- 2.964, 2.958, 2.943, 2.927, 2.921, 2.914, 2.909, 2.907, 2.907, 2.912, 2.916, 2.928, 2.936, 2.944, 2.947, 2.952\n- ]\n- },\n- {\n- \"ct\": 5930, \"table\":\n+ },\n+ \"y_target\":\n [\n- 3.312, 3.308, 3.301, 3.294, 3.288, 3.277, 3.268, 3.261, 3.259, 3.261, 3.267, 3.273, 3.285, 3.301, 3.303, 3.312,\n- 3.308, 3.304, 3.294, 3.291, 3.283, 3.271, 3.263, 3.259, 3.257, 3.258, 3.261, 3.268, 3.278, 3.293, 3.299, 3.299,\n- 3.302, 3.296, 3.288, 3.282, 3.276, 3.267, 3.259, 3.254, 3.252, 3.253, 3.256, 3.261, 3.273, 3.289, 3.292, 3.292,\n- 3.296, 3.289, 3.282, 3.276, 3.269, 3.263, 3.256, 3.251, 3.248, 3.249, 3.251, 3.257, 3.268, 3.279, 3.284, 3.284,\n- 3.292, 3.285, 3.279, 3.271, 3.264, 3.257, 3.249, 3.243, 3.241, 3.241, 3.246, 3.252, 3.261, 3.274, 3.275, 3.273,\n- 3.291, 3.285, 3.276, 3.268, 3.259, 3.251, 3.242, 3.239, 3.236, 3.238, 3.244, 3.248, 3.258, 3.268, 3.269, 3.265,\n- 3.294, 3.288, 3.275, 3.266, 3.257, 3.248, 3.239, 3.238, 3.237, 3.238, 3.243, 3.246, 3.255, 3.264, 3.264, 3.257,\n- 3.297, 3.293, 3.279, 3.268, 3.258, 3.249, 3.238, 3.237, 3.239, 3.239, 3.243, 3.245, 3.255, 3.264, 3.264, 3.263,\n- 3.301, 3.295, 3.281, 3.271, 3.259, 3.248, 3.237, 3.237, 3.239, 3.241, 3.243, 3.246, 3.257, 3.265, 3.266, 3.264,\n- 3.306, 3.295, 3.279, 3.271, 3.261, 3.247, 3.235, 3.234, 3.239, 3.239, 3.243, 3.247, 3.258, 3.265, 3.265, 3.264,\n- 3.308, 3.297, 3.279, 3.272, 3.261, 3.249, 3.239, 3.239, 3.241, 3.243, 3.245, 3.248, 3.261, 3.265, 3.266, 3.265,\n- 3.309, 3.301, 3.286, 3.276, 3.267, 3.256, 3.246, 3.242, 3.244, 3.244, 3.249, 3.253, 3.263, 3.267, 3.271, 3.274\n+ 0, 0.16,\n+ 1000, 0.165,\n+ 10000, 0.17\n ]\n }\n- ],\n- \"calibrations_Cb\":\n- [\n- {\n- \"ct\": 2960, \"table\":\n- [\n- 2.133, 2.134, 2.139, 2.143, 2.148, 2.155, 2.158, 2.158, 2.158, 2.161, 2.161, 2.162, 2.159, 2.156, 2.152, 2.151,\n- 2.132, 2.133, 2.135, 2.142, 2.147, 2.153, 2.158, 2.158, 2.158, 2.158, 2.159, 2.159, 2.157, 2.154, 2.151, 2.148,\n- 2.133, 2.133, 2.135, 2.142, 2.149, 2.154, 2.158, 2.158, 2.157, 2.156, 2.158, 2.157, 2.155, 2.153, 2.148, 2.146,\n- 2.133, 2.133, 2.138, 2.145, 2.149, 2.154, 2.158, 2.159, 2.158, 2.155, 2.157, 2.156, 2.153, 2.149, 2.146, 2.144,\n- 2.133, 2.134, 2.139, 2.146, 2.149, 2.154, 2.158, 2.159, 2.159, 2.156, 2.154, 2.154, 2.149, 2.145, 2.143, 2.139,\n- 2.135, 2.135, 2.139, 2.146, 2.151, 2.155, 2.158, 2.159, 2.158, 2.156, 2.153, 2.151, 2.146, 2.143, 2.139, 2.136,\n- 2.135, 2.135, 2.138, 2.145, 2.151, 2.154, 2.157, 2.158, 2.157, 2.156, 2.153, 2.151, 2.147, 2.143, 2.141, 2.137,\n- 2.135, 2.134, 2.135, 2.141, 2.149, 2.154, 2.157, 2.157, 2.157, 2.157, 2.157, 2.153, 2.149, 2.146, 2.142, 2.139,\n- 2.132, 2.133, 2.135, 2.139, 2.148, 2.153, 2.158, 2.159, 2.159, 2.161, 2.161, 2.157, 2.154, 2.149, 2.144, 2.141,\n- 2.132, 2.133, 2.135, 2.141, 2.149, 2.155, 2.161, 2.161, 2.162, 2.162, 2.163, 2.159, 2.154, 2.149, 2.144, 2.138,\n- 2.136, 2.136, 2.137, 2.143, 2.149, 2.156, 2.162, 2.163, 2.162, 2.163, 2.164, 2.161, 2.157, 2.152, 2.146, 2.138,\n- 2.137, 2.137, 2.141, 2.147, 2.152, 2.157, 2.162, 2.162, 2.159, 2.161, 2.162, 2.162, 2.157, 2.152, 2.148, 2.148\n- ]\n- },\n- {\n- \"ct\": 4850, \"table\":\n- [\n- 1.463, 1.464, 1.471, 1.478, 1.479, 1.483, 1.484, 1.486, 1.486, 1.484, 1.483, 1.481, 1.478, 1.475, 1.471, 1.468,\n- 1.463, 1.463, 1.468, 1.476, 1.479, 1.482, 1.484, 1.487, 1.486, 1.484, 1.483, 1.482, 1.478, 1.473, 1.469, 1.468,\n- 1.463, 1.464, 1.468, 1.476, 1.479, 1.483, 1.484, 1.486, 1.486, 1.485, 1.484, 1.482, 1.477, 1.473, 1.469, 1.468,\n- 1.463, 1.464, 1.469, 1.477, 1.481, 1.483, 1.485, 1.487, 1.487, 1.485, 1.485, 1.482, 1.478, 1.474, 1.469, 1.468,\n- 1.465, 1.465, 1.471, 1.478, 1.481, 1.484, 1.486, 1.488, 1.488, 1.487, 1.485, 1.482, 1.477, 1.472, 1.468, 1.467,\n- 1.465, 1.466, 1.472, 1.479, 1.482, 1.485, 1.486, 1.488, 1.488, 1.486, 1.484, 1.479, 1.475, 1.472, 1.468, 1.466,\n- 1.466, 1.466, 1.472, 1.478, 1.482, 1.484, 1.485, 1.488, 1.487, 1.485, 1.483, 1.479, 1.475, 1.472, 1.469, 1.468,\n- 1.465, 1.466, 1.469, 1.476, 1.481, 1.485, 1.485, 1.486, 1.486, 1.485, 1.483, 1.479, 1.477, 1.474, 1.471, 1.469,\n- 1.464, 1.465, 1.469, 1.476, 1.481, 1.484, 1.485, 1.487, 1.487, 1.486, 1.485, 1.481, 1.478, 1.475, 1.471, 1.469,\n- 1.463, 1.464, 1.469, 1.477, 1.481, 1.485, 1.485, 1.488, 1.488, 1.487, 1.486, 1.481, 1.478, 1.475, 1.471, 1.468,\n- 1.464, 1.465, 1.471, 1.478, 1.482, 1.486, 1.486, 1.488, 1.488, 1.487, 1.486, 1.481, 1.478, 1.475, 1.472, 1.468,\n- 1.465, 1.466, 1.472, 1.481, 1.483, 1.487, 1.487, 1.488, 1.488, 1.486, 1.485, 1.481, 1.479, 1.476, 1.473, 1.472\n- ]\n- },\n+ },\n+ {\n+ \"rpi.alsc\":\n {\n- \"ct\": 5930, \"table\":\n+ \"omega\": 1.3,\n+ \"n_iter\": 100,\n+ \"luminance_strength\": 0.5,\n+ \"calibrations_Cr\": [\n+ {\n+ \"ct\": 2960,\n+ \"table\":\n+ [\n+ 2.088, 2.086, 2.082, 2.081, 2.077, 2.071, 2.068, 2.068, 2.072, 2.073, 2.075, 2.078, 2.084, 2.092, 2.095, 2.098,\n+ 2.086, 2.084, 2.079, 2.078, 2.075, 2.068, 2.064, 2.063, 2.068, 2.071, 2.072, 2.075, 2.081, 2.089, 2.092, 2.094,\n+ 2.083, 2.081, 2.077, 2.072, 2.069, 2.062, 2.059, 2.059, 2.063, 2.067, 2.069, 2.072, 2.079, 2.088, 2.089, 2.089,\n+ 2.081, 2.077, 2.072, 2.068, 2.065, 2.058, 2.055, 2.054, 2.057, 2.062, 2.066, 2.069, 2.077, 2.084, 2.086, 2.086,\n+ 2.078, 2.075, 2.069, 2.065, 2.061, 2.055, 2.052, 2.049, 2.051, 2.056, 2.062, 2.065, 2.072, 2.079, 2.081, 2.079,\n+ 2.079, 2.075, 2.069, 2.064, 2.061, 2.053, 2.049, 2.046, 2.049, 2.051, 2.057, 2.062, 2.069, 2.075, 2.077, 2.075,\n+ 2.082, 2.079, 2.072, 2.065, 2.061, 2.054, 2.049, 2.047, 2.049, 2.051, 2.056, 2.061, 2.066, 2.073, 2.073, 2.069,\n+ 2.086, 2.082, 2.075, 2.068, 2.062, 2.054, 2.051, 2.049, 2.051, 2.052, 2.056, 2.061, 2.066, 2.073, 2.073, 2.072,\n+ 2.088, 2.086, 2.079, 2.074, 2.066, 2.057, 2.051, 2.051, 2.054, 2.055, 2.056, 2.061, 2.067, 2.072, 2.073, 2.072,\n+ 2.091, 2.087, 2.079, 2.075, 2.068, 2.057, 2.052, 2.052, 2.056, 2.055, 2.055, 2.059, 2.066, 2.072, 2.072, 2.072,\n+ 2.093, 2.088, 2.081, 2.077, 2.069, 2.059, 2.054, 2.054, 2.057, 2.056, 2.056, 2.058, 2.066, 2.072, 2.073, 2.073,\n+ 2.095, 2.091, 2.084, 2.078, 2.075, 2.067, 2.057, 2.057, 2.059, 2.059, 2.058, 2.059, 2.068, 2.073, 2.075, 2.078\n+ ]\n+ },\n+ {\n+ \"ct\": 4850,\n+ \"table\":\n+ [\n+ 2.973, 2.968, 2.956, 2.943, 2.941, 2.932, 2.923, 2.921, 2.924, 2.929, 2.931, 2.939, 2.953, 2.965, 2.966, 2.976,\n+ 2.969, 2.962, 2.951, 2.941, 2.934, 2.928, 2.919, 2.918, 2.919, 2.923, 2.927, 2.933, 2.945, 2.957, 2.962, 2.962,\n+ 2.964, 2.956, 2.944, 2.932, 2.929, 2.924, 2.915, 2.914, 2.915, 2.919, 2.924, 2.928, 2.941, 2.952, 2.958, 2.959,\n+ 2.957, 2.951, 2.939, 2.928, 2.924, 2.919, 2.913, 2.911, 2.911, 2.915, 2.919, 2.925, 2.936, 2.947, 2.952, 2.953,\n+ 2.954, 2.947, 2.935, 2.924, 2.919, 2.915, 2.908, 2.906, 2.906, 2.907, 2.914, 2.921, 2.932, 2.941, 2.943, 2.942,\n+ 2.953, 2.946, 2.932, 2.921, 2.916, 2.911, 2.904, 2.902, 2.901, 2.904, 2.909, 2.919, 2.926, 2.937, 2.939, 2.939,\n+ 2.953, 2.947, 2.932, 2.918, 2.915, 2.909, 2.903, 2.901, 2.901, 2.906, 2.911, 2.918, 2.924, 2.936, 2.936, 2.932,\n+ 2.956, 2.948, 2.934, 2.919, 2.916, 2.908, 2.903, 2.901, 2.902, 2.907, 2.909, 2.917, 2.926, 2.936, 2.939, 2.939,\n+ 2.957, 2.951, 2.936, 2.923, 2.917, 2.907, 2.904, 2.901, 2.902, 2.908, 2.911, 2.919, 2.929, 2.939, 2.942, 2.942,\n+ 2.961, 2.951, 2.936, 2.922, 2.918, 2.906, 2.904, 2.901, 2.901, 2.907, 2.911, 2.921, 2.931, 2.941, 2.942, 2.944,\n+ 2.964, 2.954, 2.936, 2.924, 2.918, 2.909, 2.905, 2.905, 2.905, 2.907, 2.912, 2.923, 2.933, 2.942, 2.944, 2.944,\n+ 2.964, 2.958, 2.943, 2.927, 2.921, 2.914, 2.909, 2.907, 2.907, 2.912, 2.916, 2.928, 2.936, 2.944, 2.947, 2.952\n+ ]\n+ },\n+ {\n+ \"ct\": 5930,\n+ \"table\":\n+ [\n+ 3.312, 3.308, 3.301, 3.294, 3.288, 3.277, 3.268, 3.261, 3.259, 3.261, 3.267, 3.273, 3.285, 3.301, 3.303, 3.312,\n+ 3.308, 3.304, 3.294, 3.291, 3.283, 3.271, 3.263, 3.259, 3.257, 3.258, 3.261, 3.268, 3.278, 3.293, 3.299, 3.299,\n+ 3.302, 3.296, 3.288, 3.282, 3.276, 3.267, 3.259, 3.254, 3.252, 3.253, 3.256, 3.261, 3.273, 3.289, 3.292, 3.292,\n+ 3.296, 3.289, 3.282, 3.276, 3.269, 3.263, 3.256, 3.251, 3.248, 3.249, 3.251, 3.257, 3.268, 3.279, 3.284, 3.284,\n+ 3.292, 3.285, 3.279, 3.271, 3.264, 3.257, 3.249, 3.243, 3.241, 3.241, 3.246, 3.252, 3.261, 3.274, 3.275, 3.273,\n+ 3.291, 3.285, 3.276, 3.268, 3.259, 3.251, 3.242, 3.239, 3.236, 3.238, 3.244, 3.248, 3.258, 3.268, 3.269, 3.265,\n+ 3.294, 3.288, 3.275, 3.266, 3.257, 3.248, 3.239, 3.238, 3.237, 3.238, 3.243, 3.246, 3.255, 3.264, 3.264, 3.257,\n+ 3.297, 3.293, 3.279, 3.268, 3.258, 3.249, 3.238, 3.237, 3.239, 3.239, 3.243, 3.245, 3.255, 3.264, 3.264, 3.263,\n+ 3.301, 3.295, 3.281, 3.271, 3.259, 3.248, 3.237, 3.237, 3.239, 3.241, 3.243, 3.246, 3.257, 3.265, 3.266, 3.264,\n+ 3.306, 3.295, 3.279, 3.271, 3.261, 3.247, 3.235, 3.234, 3.239, 3.239, 3.243, 3.247, 3.258, 3.265, 3.265, 3.264,\n+ 3.308, 3.297, 3.279, 3.272, 3.261, 3.249, 3.239, 3.239, 3.241, 3.243, 3.245, 3.248, 3.261, 3.265, 3.266, 3.265,\n+ 3.309, 3.301, 3.286, 3.276, 3.267, 3.256, 3.246, 3.242, 3.244, 3.244, 3.249, 3.253, 3.263, 3.267, 3.271, 3.274\n+ ]\n+ }\n+ ],\n+ \"calibrations_Cb\": [\n+ {\n+ \"ct\": 2960,\n+ \"table\":\n+ [\n+ 2.133, 2.134, 2.139, 2.143, 2.148, 2.155, 2.158, 2.158, 2.158, 2.161, 2.161, 2.162, 2.159, 2.156, 2.152, 2.151,\n+ 2.132, 2.133, 2.135, 2.142, 2.147, 2.153, 2.158, 2.158, 2.158, 2.158, 2.159, 2.159, 2.157, 2.154, 2.151, 2.148,\n+ 2.133, 2.133, 2.135, 2.142, 2.149, 2.154, 2.158, 2.158, 2.157, 2.156, 2.158, 2.157, 2.155, 2.153, 2.148, 2.146,\n+ 2.133, 2.133, 2.138, 2.145, 2.149, 2.154, 2.158, 2.159, 2.158, 2.155, 2.157, 2.156, 2.153, 2.149, 2.146, 2.144,\n+ 2.133, 2.134, 2.139, 2.146, 2.149, 2.154, 2.158, 2.159, 2.159, 2.156, 2.154, 2.154, 2.149, 2.145, 2.143, 2.139,\n+ 2.135, 2.135, 2.139, 2.146, 2.151, 2.155, 2.158, 2.159, 2.158, 2.156, 2.153, 2.151, 2.146, 2.143, 2.139, 2.136,\n+ 2.135, 2.135, 2.138, 2.145, 2.151, 2.154, 2.157, 2.158, 2.157, 2.156, 2.153, 2.151, 2.147, 2.143, 2.141, 2.137,\n+ 2.135, 2.134, 2.135, 2.141, 2.149, 2.154, 2.157, 2.157, 2.157, 2.157, 2.157, 2.153, 2.149, 2.146, 2.142, 2.139,\n+ 2.132, 2.133, 2.135, 2.139, 2.148, 2.153, 2.158, 2.159, 2.159, 2.161, 2.161, 2.157, 2.154, 2.149, 2.144, 2.141,\n+ 2.132, 2.133, 2.135, 2.141, 2.149, 2.155, 2.161, 2.161, 2.162, 2.162, 2.163, 2.159, 2.154, 2.149, 2.144, 2.138,\n+ 2.136, 2.136, 2.137, 2.143, 2.149, 2.156, 2.162, 2.163, 2.162, 2.163, 2.164, 2.161, 2.157, 2.152, 2.146, 2.138,\n+ 2.137, 2.137, 2.141, 2.147, 2.152, 2.157, 2.162, 2.162, 2.159, 2.161, 2.162, 2.162, 2.157, 2.152, 2.148, 2.148\n+ ]\n+ },\n+ {\n+ \"ct\": 4850,\n+ \"table\":\n+ [\n+ 1.463, 1.464, 1.471, 1.478, 1.479, 1.483, 1.484, 1.486, 1.486, 1.484, 1.483, 1.481, 1.478, 1.475, 1.471, 1.468,\n+ 1.463, 1.463, 1.468, 1.476, 1.479, 1.482, 1.484, 1.487, 1.486, 1.484, 1.483, 1.482, 1.478, 1.473, 1.469, 1.468,\n+ 1.463, 1.464, 1.468, 1.476, 1.479, 1.483, 1.484, 1.486, 1.486, 1.485, 1.484, 1.482, 1.477, 1.473, 1.469, 1.468,\n+ 1.463, 1.464, 1.469, 1.477, 1.481, 1.483, 1.485, 1.487, 1.487, 1.485, 1.485, 1.482, 1.478, 1.474, 1.469, 1.468,\n+ 1.465, 1.465, 1.471, 1.478, 1.481, 1.484, 1.486, 1.488, 1.488, 1.487, 1.485, 1.482, 1.477, 1.472, 1.468, 1.467,\n+ 1.465, 1.466, 1.472, 1.479, 1.482, 1.485, 1.486, 1.488, 1.488, 1.486, 1.484, 1.479, 1.475, 1.472, 1.468, 1.466,\n+ 1.466, 1.466, 1.472, 1.478, 1.482, 1.484, 1.485, 1.488, 1.487, 1.485, 1.483, 1.479, 1.475, 1.472, 1.469, 1.468,\n+ 1.465, 1.466, 1.469, 1.476, 1.481, 1.485, 1.485, 1.486, 1.486, 1.485, 1.483, 1.479, 1.477, 1.474, 1.471, 1.469,\n+ 1.464, 1.465, 1.469, 1.476, 1.481, 1.484, 1.485, 1.487, 1.487, 1.486, 1.485, 1.481, 1.478, 1.475, 1.471, 1.469,\n+ 1.463, 1.464, 1.469, 1.477, 1.481, 1.485, 1.485, 1.488, 1.488, 1.487, 1.486, 1.481, 1.478, 1.475, 1.471, 1.468,\n+ 1.464, 1.465, 1.471, 1.478, 1.482, 1.486, 1.486, 1.488, 1.488, 1.487, 1.486, 1.481, 1.478, 1.475, 1.472, 1.468,\n+ 1.465, 1.466, 1.472, 1.481, 1.483, 1.487, 1.487, 1.488, 1.488, 1.486, 1.485, 1.481, 1.479, 1.476, 1.473, 1.472\n+ ]\n+ },\n+ {\n+ \"ct\": 5930,\n+ \"table\":\n+ [\n+ 1.443, 1.444, 1.448, 1.453, 1.459, 1.463, 1.465, 1.467, 1.469, 1.469, 1.467, 1.466, 1.462, 1.457, 1.454, 1.451,\n+ 1.443, 1.444, 1.445, 1.451, 1.459, 1.463, 1.465, 1.467, 1.469, 1.469, 1.467, 1.465, 1.461, 1.456, 1.452, 1.451,\n+ 1.444, 1.444, 1.445, 1.451, 1.459, 1.463, 1.466, 1.468, 1.469, 1.469, 1.467, 1.465, 1.461, 1.456, 1.452, 1.449,\n+ 1.444, 1.444, 1.447, 1.452, 1.459, 1.464, 1.467, 1.469, 1.471, 1.469, 1.467, 1.466, 1.461, 1.456, 1.452, 1.449,\n+ 1.444, 1.445, 1.448, 1.452, 1.459, 1.465, 1.469, 1.471, 1.471, 1.471, 1.468, 1.465, 1.461, 1.455, 1.451, 1.449,\n+ 1.445, 1.446, 1.449, 1.453, 1.461, 1.466, 1.469, 1.471, 1.472, 1.469, 1.467, 1.465, 1.459, 1.455, 1.451, 1.447,\n+ 1.446, 1.446, 1.449, 1.453, 1.461, 1.466, 1.469, 1.469, 1.469, 1.469, 1.467, 1.465, 1.459, 1.455, 1.452, 1.449,\n+ 1.446, 1.446, 1.447, 1.451, 1.459, 1.466, 1.469, 1.469, 1.469, 1.469, 1.467, 1.465, 1.461, 1.457, 1.454, 1.451,\n+ 1.444, 1.444, 1.447, 1.451, 1.459, 1.466, 1.469, 1.469, 1.471, 1.471, 1.468, 1.466, 1.462, 1.458, 1.454, 1.452,\n+ 1.444, 1.444, 1.448, 1.453, 1.459, 1.466, 1.469, 1.471, 1.472, 1.472, 1.468, 1.466, 1.462, 1.458, 1.454, 1.449,\n+ 1.446, 1.447, 1.449, 1.454, 1.461, 1.466, 1.471, 1.471, 1.471, 1.471, 1.468, 1.466, 1.462, 1.459, 1.455, 1.449,\n+ 1.447, 1.447, 1.452, 1.457, 1.462, 1.468, 1.472, 1.472, 1.471, 1.471, 1.468, 1.466, 1.462, 1.459, 1.456, 1.455\n+ ]\n+ }\n+ ],\n+ \"luminance_lut\":\n [\n- 1.443, 1.444, 1.448, 1.453, 1.459, 1.463, 1.465, 1.467, 1.469, 1.469, 1.467, 1.466, 1.462, 1.457, 1.454, 1.451,\n- 1.443, 1.444, 1.445, 1.451, 1.459, 1.463, 1.465, 1.467, 1.469, 1.469, 1.467, 1.465, 1.461, 1.456, 1.452, 1.451,\n- 1.444, 1.444, 1.445, 1.451, 1.459, 1.463, 1.466, 1.468, 1.469, 1.469, 1.467, 1.465, 1.461, 1.456, 1.452, 1.449,\n- 1.444, 1.444, 1.447, 1.452, 1.459, 1.464, 1.467, 1.469, 1.471, 1.469, 1.467, 1.466, 1.461, 1.456, 1.452, 1.449,\n- 1.444, 1.445, 1.448, 1.452, 1.459, 1.465, 1.469, 1.471, 1.471, 1.471, 1.468, 1.465, 1.461, 1.455, 1.451, 1.449,\n- 1.445, 1.446, 1.449, 1.453, 1.461, 1.466, 1.469, 1.471, 1.472, 1.469, 1.467, 1.465, 1.459, 1.455, 1.451, 1.447,\n- 1.446, 1.446, 1.449, 1.453, 1.461, 1.466, 1.469, 1.469, 1.469, 1.469, 1.467, 1.465, 1.459, 1.455, 1.452, 1.449,\n- 1.446, 1.446, 1.447, 1.451, 1.459, 1.466, 1.469, 1.469, 1.469, 1.469, 1.467, 1.465, 1.461, 1.457, 1.454, 1.451,\n- 1.444, 1.444, 1.447, 1.451, 1.459, 1.466, 1.469, 1.469, 1.471, 1.471, 1.468, 1.466, 1.462, 1.458, 1.454, 1.452,\n- 1.444, 1.444, 1.448, 1.453, 1.459, 1.466, 1.469, 1.471, 1.472, 1.472, 1.468, 1.466, 1.462, 1.458, 1.454, 1.449,\n- 1.446, 1.447, 1.449, 1.454, 1.461, 1.466, 1.471, 1.471, 1.471, 1.471, 1.468, 1.466, 1.462, 1.459, 1.455, 1.449,\n- 1.447, 1.447, 1.452, 1.457, 1.462, 1.468, 1.472, 1.472, 1.471, 1.471, 1.468, 1.466, 1.462, 1.459, 1.456, 1.455\n- ]\n+ 1.548, 1.499, 1.387, 1.289, 1.223, 1.183, 1.164, 1.154, 1.153, 1.169, 1.211, 1.265, 1.345, 1.448, 1.581, 1.619,\n+ 1.513, 1.412, 1.307, 1.228, 1.169, 1.129, 1.105, 1.098, 1.103, 1.127, 1.157, 1.209, 1.272, 1.361, 1.481, 1.583,\n+ 1.449, 1.365, 1.257, 1.175, 1.124, 1.085, 1.062, 1.054, 1.059, 1.079, 1.113, 1.151, 1.211, 1.293, 1.407, 1.488,\n+ 1.424, 1.324, 1.222, 1.139, 1.089, 1.056, 1.034, 1.031, 1.034, 1.049, 1.075, 1.115, 1.164, 1.241, 1.351, 1.446,\n+ 1.412, 1.297, 1.203, 1.119, 1.069, 1.039, 1.021, 1.016, 1.022, 1.032, 1.052, 1.086, 1.135, 1.212, 1.321, 1.439,\n+ 1.406, 1.287, 1.195, 1.115, 1.059, 1.028, 1.014, 1.012, 1.015, 1.026, 1.041, 1.074, 1.125, 1.201, 1.302, 1.425,\n+ 1.406, 1.294, 1.205, 1.126, 1.062, 1.031, 1.013, 1.009, 1.011, 1.019, 1.042, 1.079, 1.129, 1.203, 1.302, 1.435,\n+ 1.415, 1.318, 1.229, 1.146, 1.076, 1.039, 1.019, 1.014, 1.017, 1.031, 1.053, 1.093, 1.144, 1.219, 1.314, 1.436,\n+ 1.435, 1.348, 1.246, 1.164, 1.094, 1.059, 1.036, 1.032, 1.037, 1.049, 1.072, 1.114, 1.167, 1.257, 1.343, 1.462,\n+ 1.471, 1.385, 1.278, 1.189, 1.124, 1.084, 1.064, 1.061, 1.069, 1.078, 1.101, 1.146, 1.207, 1.298, 1.415, 1.496,\n+ 1.522, 1.436, 1.323, 1.228, 1.169, 1.118, 1.101, 1.094, 1.099, 1.113, 1.146, 1.194, 1.265, 1.353, 1.474, 1.571,\n+ 1.578, 1.506, 1.378, 1.281, 1.211, 1.156, 1.135, 1.134, 1.139, 1.158, 1.194, 1.251, 1.327, 1.427, 1.559, 1.611\n+ ],\n+ \"sigma\": 0.00121,\n+ \"sigma_Cb\": 0.00115\n }\n- ],\n- \"luminance_lut\":\n- [\n- 1.548, 1.499, 1.387, 1.289, 1.223, 1.183, 1.164, 1.154, 1.153, 1.169, 1.211, 1.265, 1.345, 1.448, 1.581, 1.619,\n- 1.513, 1.412, 1.307, 1.228, 1.169, 1.129, 1.105, 1.098, 1.103, 1.127, 1.157, 1.209, 1.272, 1.361, 1.481, 1.583,\n- 1.449, 1.365, 1.257, 1.175, 1.124, 1.085, 1.062, 1.054, 1.059, 1.079, 1.113, 1.151, 1.211, 1.293, 1.407, 1.488,\n- 1.424, 1.324, 1.222, 1.139, 1.089, 1.056, 1.034, 1.031, 1.034, 1.049, 1.075, 1.115, 1.164, 1.241, 1.351, 1.446,\n- 1.412, 1.297, 1.203, 1.119, 1.069, 1.039, 1.021, 1.016, 1.022, 1.032, 1.052, 1.086, 1.135, 1.212, 1.321, 1.439,\n- 1.406, 1.287, 1.195, 1.115, 1.059, 1.028, 1.014, 1.012, 1.015, 1.026, 1.041, 1.074, 1.125, 1.201, 1.302, 1.425,\n- 1.406, 1.294, 1.205, 1.126, 1.062, 1.031, 1.013, 1.009, 1.011, 1.019, 1.042, 1.079, 1.129, 1.203, 1.302, 1.435,\n- 1.415, 1.318, 1.229, 1.146, 1.076, 1.039, 1.019, 1.014, 1.017, 1.031, 1.053, 1.093, 1.144, 1.219, 1.314, 1.436,\n- 1.435, 1.348, 1.246, 1.164, 1.094, 1.059, 1.036, 1.032, 1.037, 1.049, 1.072, 1.114, 1.167, 1.257, 1.343, 1.462,\n- 1.471, 1.385, 1.278, 1.189, 1.124, 1.084, 1.064, 1.061, 1.069, 1.078, 1.101, 1.146, 1.207, 1.298, 1.415, 1.496,\n- 1.522, 1.436, 1.323, 1.228, 1.169, 1.118, 1.101, 1.094, 1.099, 1.113, 1.146, 1.194, 1.265, 1.353, 1.474, 1.571,\n- 1.578, 1.506, 1.378, 1.281, 1.211, 1.156, 1.135, 1.134, 1.139, 1.158, 1.194, 1.251, 1.327, 1.427, 1.559, 1.611\n- ],\n- \"sigma\": 0.00121,\n- \"sigma_Cb\": 0.00115\n- },\n- \"rpi.contrast\":\n- {\n- \"ce_enable\": 1,\n- \"gamma_curve\":\n- [\n- 0, 0, 1024, 5040, 2048, 9338, 3072, 12356, 4096, 15312, 5120, 18051, 6144, 20790, 7168, 23193,\n- 8192, 25744, 9216, 27942, 10240, 30035, 11264, 32005, 12288, 33975, 13312, 35815, 14336, 37600, 15360, 39168,\n- 16384, 40642, 18432, 43379, 20480, 45749, 22528, 47753, 24576, 49621, 26624, 51253, 28672, 52698, 30720, 53796,\n- 32768, 54876, 36864, 57012, 40960, 58656, 45056, 59954, 49152, 61183, 53248, 62355, 57344, 63419, 61440, 64476,\n- 65535, 65535\n- ]\n- },\n- \"rpi.ccm\":\n- {\n- \"ccms\":\n- [\n- {\n- \"ct\": 2360, \"ccm\":\n- [\n- 1.66078, -0.23588, -0.42491, -0.47456, 1.82763, -0.35307, -0.00545, -1.44729, 2.45273\n- ]\n- },\n- {\n- \"ct\": 2870, \"ccm\":\n- [\n- 1.78373, -0.55344, -0.23029, -0.39951, 1.69701, -0.29751, 0.01986, -1.06525, 2.04539\n- ]\n- },\n- {\n- \"ct\": 2970, \"ccm\":\n- [\n- 1.73511, -0.56973, -0.16537, -0.36338, 1.69878, -0.33539, -0.02354, -0.76813, 1.79168\n- ]\n- },\n- {\n- \"ct\": 3000, \"ccm\":\n- [\n- 2.06374, -0.92218, -0.14156, -0.41721, 1.69289, -0.27568, -0.00554, -0.92741, 1.93295\n- ]\n- },\n- {\n- \"ct\": 3700, \"ccm\":\n- [\n- 2.13792, -1.08136, -0.05655, -0.34739, 1.58989, -0.24249, -0.00349, -0.76789, 1.77138\n- ]\n- },\n- {\n- \"ct\": 3870, \"ccm\":\n- [\n- 1.83834, -0.70528, -0.13307, -0.30499, 1.60523, -0.30024, -0.05701, -0.58313, 1.64014\n- ]\n- },\n- {\n- \"ct\": 4000, \"ccm\":\n- [\n- 2.15741, -1.10295, -0.05447, -0.34631, 1.61158, -0.26528, -0.02723, -0.70288, 1.73011\n- ]\n- },\n- {\n- \"ct\": 4400, \"ccm\":\n- [\n- 2.05729, -0.95007, -0.10723, -0.41712, 1.78606, -0.36894, -0.11899, -0.55727, 1.67626\n- ]\n- },\n-\n- {\n- \"ct\": 4715, \"ccm\":\n- [\n- 1.90255, -0.77478, -0.12777, -0.31338, 1.88197, -0.56858, -0.06001, -0.61785, 1.67786\n- ]\n- },\n+ },\n+ {\n+ \"rpi.contrast\":\n {\n- \"ct\": 5920, \"ccm\":\n+ \"ce_enable\": 1,\n+ \"gamma_curve\":\n [\n- 1.98691, -0.84671, -0.14019, -0.26581, 1.70615, -0.44035, -0.09532, -0.47332, 1.56864\n+ 0, 0,\n+ 1024, 5040,\n+ 2048, 9338,\n+ 3072, 12356,\n+ 4096, 15312,\n+ 5120, 18051,\n+ 6144, 20790,\n+ 7168, 23193,\n+ 8192, 25744,\n+ 9216, 27942,\n+ 10240, 30035,\n+ 11264, 32005,\n+ 12288, 33975,\n+ 13312, 35815,\n+ 14336, 37600,\n+ 15360, 39168,\n+ 16384, 40642,\n+ 18432, 43379,\n+ 20480, 45749,\n+ 22528, 47753,\n+ 24576, 49621,\n+ 26624, 51253,\n+ 28672, 52698,\n+ 30720, 53796,\n+ 32768, 54876,\n+ 36864, 57012,\n+ 40960, 58656,\n+ 45056, 59954,\n+ 49152, 61183,\n+ 53248, 62355,\n+ 57344, 63419,\n+ 61440, 64476,\n+ 65535, 65535\n ]\n- },\n+ }\n+ },\n+ {\n+ \"rpi.ccm\":\n {\n- \"ct\": 9050, \"ccm\":\n- [\n- 2.09255, -0.76541, -0.32714, -0.28973, 2.27462, -0.98489, -0.17299, -0.61275, 1.78574\n+ \"ccms\": [\n+ {\n+ \"ct\": 2360,\n+ \"ccm\":\n+ [\n+ 1.66078, -0.23588, -0.42491,\n+ -0.47456, 1.82763, -0.35307,\n+ -0.00545, -1.44729, 2.45273\n+ ]\n+ },\n+ {\n+ \"ct\": 2870,\n+ \"ccm\":\n+ [\n+ 1.78373, -0.55344, -0.23029,\n+ -0.39951, 1.69701, -0.29751,\n+ 0.01986, -1.06525, 2.04539\n+ ]\n+ },\n+ {\n+ \"ct\": 2970,\n+ \"ccm\":\n+ [\n+ 1.73511, -0.56973, -0.16537,\n+ -0.36338, 1.69878, -0.33539,\n+ -0.02354, -0.76813, 1.79168\n+ ]\n+ },\n+ {\n+ \"ct\": 3000,\n+ \"ccm\":\n+ [\n+ 2.06374, -0.92218, -0.14156,\n+ -0.41721, 1.69289, -0.27568,\n+ -0.00554, -0.92741, 1.93295\n+ ]\n+ },\n+ {\n+ \"ct\": 3700,\n+ \"ccm\":\n+ [\n+ 2.13792, -1.08136, -0.05655,\n+ -0.34739, 1.58989, -0.24249,\n+ -0.00349, -0.76789, 1.77138\n+ ]\n+ },\n+ {\n+ \"ct\": 3870,\n+ \"ccm\":\n+ [\n+ 1.83834, -0.70528, -0.13307,\n+ -0.30499, 1.60523, -0.30024,\n+ -0.05701, -0.58313, 1.64014\n+ ]\n+ },\n+ {\n+ \"ct\": 4000,\n+ \"ccm\":\n+ [\n+ 2.15741, -1.10295, -0.05447,\n+ -0.34631, 1.61158, -0.26528,\n+ -0.02723, -0.70288, 1.73011\n+ ]\n+ },\n+ {\n+ \"ct\": 4400,\n+ \"ccm\":\n+ [\n+ 2.05729, -0.95007, -0.10723,\n+ -0.41712, 1.78606, -0.36894,\n+ -0.11899, -0.55727, 1.67626\n+ ]\n+ },\n+ {\n+ \"ct\": 4715,\n+ \"ccm\":\n+ [\n+ 1.90255, -0.77478, -0.12777,\n+ -0.31338, 1.88197, -0.56858,\n+ -0.06001, -0.61785, 1.67786\n+ ]\n+ },\n+ {\n+ \"ct\": 5920,\n+ \"ccm\":\n+ [\n+ 1.98691, -0.84671, -0.14019,\n+ -0.26581, 1.70615, -0.44035,\n+ -0.09532, -0.47332, 1.56864\n+ ]\n+ },\n+ {\n+ \"ct\": 9050,\n+ \"ccm\":\n+ [\n+ 2.09255, -0.76541, -0.32714,\n+ -0.28973, 2.27462, -0.98489,\n+ -0.17299, -0.61275, 1.78574\n+ ]\n+ }\n ]\n }\n- ]\n- },\n- \"rpi.sharpen\":\n- {\n-\n- },\n- \"rpi.focus\":\n- {\n- }\n-}\n+ },\n+ {\n+ \"rpi.sharpen\": { }\n+ },\n+ {\n+ \"rpi.focus\": { }\n+ }\n+ ]\n+}\n\\ No newline at end of file\ndiff --git a/src/ipa/raspberrypi/data/imx519.json b/src/ipa/raspberrypi/data/imx519.json\nindex 2ce6a08c029d..8ccfd3a631ff 100644\n--- a/src/ipa/raspberrypi/data/imx519.json\n+++ b/src/ipa/raspberrypi/data/imx519.json\n@@ -1,338 +1,413 @@\n {\n- \"rpi.black_level\":\n- {\n- \"black_level\": 4096\n- },\n- \"rpi.dpc\":\n- {\n- },\n- \"rpi.lux\":\n- {\n- \"reference_shutter_speed\": 13841,\n- \"reference_gain\": 2.0,\n- \"reference_aperture\": 1.0,\n- \"reference_lux\": 900,\n- \"reference_Y\": 12064\n- },\n- \"rpi.noise\":\n- {\n- \"reference_constant\": 0,\n- \"reference_slope\": 2.776\n- },\n- \"rpi.geq\":\n- {\n- \"offset\": 189,\n- \"slope\": 0.01495\n- },\n- \"rpi.sdn\":\n- {\n- },\n- \"rpi.awb\":\n- {\n- \"priors\":\n- [\n- {\n- \"lux\": 0, \"prior\":\n- [\n- 2000, 1.0, 3000, 0.0, 13000, 0.0\n- ]\n- },\n- {\n- \"lux\": 800, \"prior\":\n- [\n- 2000, 0.0, 6000, 2.0, 13000, 2.0\n- ]\n- },\n+ \"version\": 2.0,\n+ \"target\": \"bcm2835\",\n+ \"algorithms\": [\n+ {\n+ \"rpi.black_level\":\n {\n- \"lux\": 1500, \"prior\":\n- [\n- 2000, 0.0, 4000, 1.0, 6000, 6.0, 6500, 7.0, 7000, 1.0, 13000, 1.0\n- ]\n+ \"black_level\": 4096\n }\n- ],\n- \"modes\":\n+ },\n {\n- \"auto\":\n- {\n- \"lo\": 2500,\n- \"hi\": 7900\n- },\n- \"incandescent\":\n- {\n- \"lo\": 2500,\n- \"hi\": 3000\n- },\n- \"tungsten\":\n- {\n- \"lo\": 3000,\n- \"hi\": 3500\n- },\n- \"fluorescent\":\n- {\n- \"lo\": 4000,\n- \"hi\": 4700\n- },\n- \"indoor\":\n- {\n- \"lo\": 3000,\n- \"hi\": 5000\n- },\n- \"daylight\":\n- {\n- \"lo\": 5500,\n- \"hi\": 6500\n- },\n- \"cloudy\":\n+ \"rpi.dpc\": { }\n+ },\n+ {\n+ \"rpi.lux\":\n {\n- \"lo\": 7000,\n- \"hi\": 8000\n+ \"reference_shutter_speed\": 13841,\n+ \"reference_gain\": 2.0,\n+ \"reference_aperture\": 1.0,\n+ \"reference_lux\": 900,\n+ \"reference_Y\": 12064\n }\n },\n- \"bayes\": 1,\n- \"ct_curve\":\n- [\n- 2890.0, 0.7328, 0.3734, 3550.0, 0.6228, 0.4763, 4500.0, 0.5208, 0.5825, 5700.0, 0.4467, 0.6671, 7900.0, 0.3858, 0.7411\n- ],\n- \"sensitivity_r\": 1.0,\n- \"sensitivity_b\": 1.0,\n- \"transverse_pos\": 0.02027,\n- \"transverse_neg\": 0.01935\n- },\n- \"rpi.agc\":\n- {\n- \"metering_modes\":\n {\n- \"centre-weighted\":\n+ \"rpi.noise\":\n {\n- \"weights\":\n- [\n- 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0\n- ]\n- },\n- \"spot\":\n- {\n- \"weights\":\n- [\n- 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0\n- ]\n- },\n- \"matrix\":\n+ \"reference_constant\": 0,\n+ \"reference_slope\": 2.776\n+ }\n+ },\n+ {\n+ \"rpi.geq\":\n {\n- \"weights\":\n- [\n- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1\n- ]\n+ \"offset\": 189,\n+ \"slope\": 0.01495\n }\n },\n- \"exposure_modes\":\n {\n- \"normal\":\n+ \"rpi.sdn\": { }\n+ },\n+ {\n+ \"rpi.awb\":\n {\n- \"shutter\":\n- [\n- 100, 10000, 30000, 60000, 120000\n+ \"priors\": [\n+ {\n+ \"lux\": 0,\n+ \"prior\":\n+ [\n+ 2000, 1.0,\n+ 3000, 0.0,\n+ 13000, 0.0\n+ ]\n+ },\n+ {\n+ \"lux\": 800,\n+ \"prior\":\n+ [\n+ 2000, 0.0,\n+ 6000, 2.0,\n+ 13000, 2.0\n+ ]\n+ },\n+ {\n+ \"lux\": 1500,\n+ \"prior\":\n+ [\n+ 2000, 0.0,\n+ 4000, 1.0,\n+ 6000, 6.0,\n+ 6500, 7.0,\n+ 7000, 1.0,\n+ 13000, 1.0\n+ ]\n+ }\n ],\n- \"gain\":\n- [\n- 1.0, 2.0, 4.0, 6.0, 8.0\n- ]\n- },\n- \"short\":\n- {\n- \"shutter\":\n+ \"modes\":\n+ {\n+ \"auto\":\n+ {\n+ \"lo\": 2500,\n+ \"hi\": 7900\n+ },\n+ \"incandescent\":\n+ {\n+ \"lo\": 2500,\n+ \"hi\": 3000\n+ },\n+ \"tungsten\":\n+ {\n+ \"lo\": 3000,\n+ \"hi\": 3500\n+ },\n+ \"fluorescent\":\n+ {\n+ \"lo\": 4000,\n+ \"hi\": 4700\n+ },\n+ \"indoor\":\n+ {\n+ \"lo\": 3000,\n+ \"hi\": 5000\n+ },\n+ \"daylight\":\n+ {\n+ \"lo\": 5500,\n+ \"hi\": 6500\n+ },\n+ \"cloudy\":\n+ {\n+ \"lo\": 7000,\n+ \"hi\": 8000\n+ }\n+ },\n+ \"bayes\": 1,\n+ \"ct_curve\":\n [\n- 100, 5000, 10000, 20000, 120000\n+ 2890.0, 0.7328, 0.3734,\n+ 3550.0, 0.6228, 0.4763,\n+ 4500.0, 0.5208, 0.5825,\n+ 5700.0, 0.4467, 0.6671,\n+ 7900.0, 0.3858, 0.7411\n ],\n- \"gain\":\n- [\n- 1.0, 2.0, 4.0, 6.0, 8.0\n- ]\n+ \"sensitivity_r\": 1.0,\n+ \"sensitivity_b\": 1.0,\n+ \"transverse_pos\": 0.02027,\n+ \"transverse_neg\": 0.01935\n }\n },\n- \"constraint_modes\":\n {\n- \"normal\":\n- [\n+ \"rpi.agc\":\n+ {\n+ \"metering_modes\":\n {\n- \"bound\": \"LOWER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.5, 1000, 0.5\n- ]\n- }\n- ],\n- \"highlight\":\n- [\n+ \"centre-weighted\":\n+ {\n+ \"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+ },\n+ \"spot\":\n+ {\n+ \"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+ },\n+ \"matrix\":\n+ {\n+ \"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+ }\n+ },\n+ \"exposure_modes\":\n {\n- \"bound\": \"LOWER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.5, 1000, 0.5\n- ]\n+ \"normal\":\n+ {\n+ \"shutter\": [ 100, 10000, 30000, 60000, 120000 ],\n+ \"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+ },\n+ \"short\":\n+ {\n+ \"shutter\": [ 100, 5000, 10000, 20000, 120000 ],\n+ \"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+ }\n },\n+ \"constraint_modes\":\n {\n- \"bound\": \"UPPER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.8, 1000, 0.8\n+ \"normal\": [\n+ {\n+ \"bound\": \"LOWER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.5,\n+ 1000, 0.5\n+ ]\n+ }\n+ ],\n+ \"highlight\": [\n+ {\n+ \"bound\": \"LOWER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.5,\n+ 1000, 0.5\n+ ]\n+ },\n+ {\n+ \"bound\": \"UPPER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.8,\n+ 1000, 0.8\n+ ]\n+ }\n ]\n- }\n- ]\n- },\n- \"y_target\":\n- [\n- 0, 0.16, 1000, 0.165, 10000, 0.17\n- ]\n- },\n- \"rpi.alsc\":\n- {\n- \"omega\": 1.3,\n- \"n_iter\": 100,\n- \"luminance_strength\": 0.5,\n- \"calibrations_Cr\":\n- [\n- {\n- \"ct\": 3000, \"table\":\n- [\n- 1.527, 1.521, 1.508, 1.493, 1.476, 1.455, 1.442, 1.441, 1.441, 1.441, 1.448, 1.467, 1.483, 1.494, 1.503, 1.504,\n- 1.525, 1.513, 1.496, 1.477, 1.461, 1.434, 1.418, 1.409, 1.409, 1.416, 1.429, 1.449, 1.469, 1.485, 1.495, 1.503,\n- 1.517, 1.506, 1.485, 1.461, 1.434, 1.412, 1.388, 1.376, 1.376, 1.386, 1.405, 1.429, 1.449, 1.471, 1.488, 1.495,\n- 1.512, 1.496, 1.471, 1.442, 1.412, 1.388, 1.361, 1.344, 1.344, 1.358, 1.384, 1.405, 1.431, 1.456, 1.479, 1.489,\n- 1.508, 1.488, 1.458, 1.425, 1.393, 1.361, 1.343, 1.322, 1.321, 1.342, 1.358, 1.385, 1.416, 1.445, 1.471, 1.484,\n- 1.507, 1.482, 1.453, 1.418, 1.382, 1.349, 1.322, 1.318, 1.318, 1.321, 1.345, 1.373, 1.405, 1.437, 1.465, 1.483,\n- 1.507, 1.482, 1.453, 1.418, 1.382, 1.349, 1.322, 1.313, 1.313, 1.321, 1.345, 1.373, 1.405, 1.437, 1.465, 1.483,\n- 1.507, 1.485, 1.455, 1.422, 1.387, 1.355, 1.333, 1.319, 1.321, 1.333, 1.351, 1.381, 1.411, 1.441, 1.467, 1.483,\n- 1.508, 1.489, 1.463, 1.432, 1.401, 1.372, 1.355, 1.333, 1.333, 1.351, 1.369, 1.393, 1.422, 1.448, 1.471, 1.484,\n- 1.511, 1.494, 1.472, 1.444, 1.416, 1.398, 1.372, 1.361, 1.361, 1.369, 1.393, 1.411, 1.436, 1.458, 1.477, 1.487,\n- 1.511, 1.496, 1.478, 1.455, 1.436, 1.416, 1.399, 1.391, 1.391, 1.397, 1.411, 1.429, 1.451, 1.466, 1.479, 1.487,\n- 1.511, 1.495, 1.478, 1.462, 1.448, 1.432, 1.419, 1.419, 1.419, 1.419, 1.429, 1.445, 1.459, 1.471, 1.482, 1.487\n- ]\n- },\n- {\n- \"ct\": 6000, \"table\":\n+ },\n+ \"y_target\":\n [\n- 2.581, 2.573, 2.558, 2.539, 2.514, 2.487, 2.473, 2.471, 2.471, 2.471, 2.479, 2.499, 2.517, 2.532, 2.543, 2.544,\n- 2.575, 2.559, 2.539, 2.521, 2.491, 2.458, 2.435, 2.421, 2.421, 2.429, 2.449, 2.477, 2.499, 2.519, 2.534, 2.543,\n- 2.561, 2.549, 2.521, 2.491, 2.457, 2.423, 2.393, 2.375, 2.375, 2.387, 2.412, 2.444, 2.475, 2.499, 2.519, 2.532,\n- 2.552, 2.531, 2.498, 2.459, 2.423, 2.391, 2.349, 2.325, 2.325, 2.344, 2.374, 2.412, 2.444, 2.476, 2.505, 2.519,\n- 2.543, 2.518, 2.479, 2.435, 2.392, 2.349, 2.324, 2.285, 2.283, 2.313, 2.344, 2.374, 2.417, 2.457, 2.489, 2.506,\n- 2.541, 2.511, 2.469, 2.421, 2.372, 2.326, 2.284, 2.277, 2.279, 2.283, 2.313, 2.357, 2.401, 2.443, 2.479, 2.504,\n- 2.541, 2.511, 2.469, 2.421, 2.372, 2.326, 2.284, 2.267, 2.267, 2.281, 2.313, 2.357, 2.401, 2.443, 2.479, 2.504,\n- 2.541, 2.512, 2.472, 2.425, 2.381, 2.338, 2.302, 2.278, 2.279, 2.301, 2.324, 2.364, 2.407, 2.447, 2.481, 2.504,\n- 2.544, 2.519, 2.483, 2.441, 2.401, 2.363, 2.338, 2.302, 2.302, 2.324, 2.355, 2.385, 2.423, 2.459, 2.488, 2.506,\n- 2.549, 2.527, 2.497, 2.463, 2.427, 2.401, 2.363, 2.345, 2.345, 2.355, 2.385, 2.412, 2.444, 2.473, 2.497, 2.509,\n- 2.552, 2.532, 2.507, 2.481, 2.459, 2.427, 2.402, 2.389, 2.389, 2.394, 2.412, 2.444, 2.465, 2.481, 2.499, 2.511,\n- 2.553, 2.533, 2.508, 2.489, 2.475, 2.454, 2.429, 2.429, 2.429, 2.429, 2.439, 2.463, 2.481, 2.492, 2.504, 2.511\n+ 0, 0.16,\n+ 1000, 0.165,\n+ 10000, 0.17\n ]\n }\n- ],\n- \"calibrations_Cb\":\n- [\n- {\n- \"ct\": 3000, \"table\":\n- [\n- 3.132, 3.126, 3.116, 3.103, 3.097, 3.091, 3.087, 3.086, 3.088, 3.091, 3.092, 3.102, 3.113, 3.121, 3.141, 3.144,\n- 3.149, 3.132, 3.123, 3.108, 3.101, 3.096, 3.091, 3.089, 3.091, 3.092, 3.101, 3.107, 3.116, 3.129, 3.144, 3.153,\n- 3.161, 3.149, 3.129, 3.121, 3.108, 3.103, 3.101, 3.101, 3.101, 3.103, 3.107, 3.116, 3.125, 3.134, 3.153, 3.159,\n- 3.176, 3.161, 3.144, 3.129, 3.124, 3.121, 3.117, 3.118, 3.118, 3.119, 3.122, 3.125, 3.134, 3.146, 3.159, 3.171,\n- 3.183, 3.176, 3.157, 3.144, 3.143, 3.143, 3.139, 3.141, 3.141, 3.141, 3.141, 3.141, 3.146, 3.161, 3.171, 3.179,\n- 3.189, 3.183, 3.165, 3.157, 3.156, 3.157, 3.159, 3.163, 3.163, 3.163, 3.163, 3.161, 3.163, 3.169, 3.179, 3.187,\n- 3.199, 3.189, 3.171, 3.165, 3.164, 3.167, 3.171, 3.173, 3.173, 3.172, 3.171, 3.169, 3.169, 3.175, 3.187, 3.189,\n- 3.206, 3.196, 3.177, 3.171, 3.165, 3.167, 3.171, 3.173, 3.173, 3.172, 3.171, 3.171, 3.173, 3.177, 3.192, 3.194,\n- 3.209, 3.197, 3.178, 3.171, 3.164, 3.161, 3.159, 3.161, 3.162, 3.164, 3.167, 3.171, 3.173, 3.181, 3.193, 3.198,\n- 3.204, 3.194, 3.176, 3.165, 3.161, 3.156, 3.154, 3.154, 3.159, 3.161, 3.164, 3.168, 3.173, 3.182, 3.198, 3.199,\n- 3.199, 3.191, 3.176, 3.169, 3.161, 3.157, 3.153, 3.153, 3.156, 3.161, 3.164, 3.168, 3.173, 3.186, 3.196, 3.199,\n- 3.199, 3.188, 3.179, 3.173, 3.165, 3.157, 3.153, 3.154, 3.156, 3.159, 3.167, 3.171, 3.176, 3.185, 3.193, 3.198\n- ]\n- },\n+ },\n+ {\n+ \"rpi.alsc\":\n {\n- \"ct\": 6000, \"table\":\n+ \"omega\": 1.3,\n+ \"n_iter\": 100,\n+ \"luminance_strength\": 0.5,\n+ \"calibrations_Cr\": [\n+ {\n+ \"ct\": 3000,\n+ \"table\":\n+ [\n+ 1.527, 1.521, 1.508, 1.493, 1.476, 1.455, 1.442, 1.441, 1.441, 1.441, 1.448, 1.467, 1.483, 1.494, 1.503, 1.504,\n+ 1.525, 1.513, 1.496, 1.477, 1.461, 1.434, 1.418, 1.409, 1.409, 1.416, 1.429, 1.449, 1.469, 1.485, 1.495, 1.503,\n+ 1.517, 1.506, 1.485, 1.461, 1.434, 1.412, 1.388, 1.376, 1.376, 1.386, 1.405, 1.429, 1.449, 1.471, 1.488, 1.495,\n+ 1.512, 1.496, 1.471, 1.442, 1.412, 1.388, 1.361, 1.344, 1.344, 1.358, 1.384, 1.405, 1.431, 1.456, 1.479, 1.489,\n+ 1.508, 1.488, 1.458, 1.425, 1.393, 1.361, 1.343, 1.322, 1.321, 1.342, 1.358, 1.385, 1.416, 1.445, 1.471, 1.484,\n+ 1.507, 1.482, 1.453, 1.418, 1.382, 1.349, 1.322, 1.318, 1.318, 1.321, 1.345, 1.373, 1.405, 1.437, 1.465, 1.483,\n+ 1.507, 1.482, 1.453, 1.418, 1.382, 1.349, 1.322, 1.313, 1.313, 1.321, 1.345, 1.373, 1.405, 1.437, 1.465, 1.483,\n+ 1.507, 1.485, 1.455, 1.422, 1.387, 1.355, 1.333, 1.319, 1.321, 1.333, 1.351, 1.381, 1.411, 1.441, 1.467, 1.483,\n+ 1.508, 1.489, 1.463, 1.432, 1.401, 1.372, 1.355, 1.333, 1.333, 1.351, 1.369, 1.393, 1.422, 1.448, 1.471, 1.484,\n+ 1.511, 1.494, 1.472, 1.444, 1.416, 1.398, 1.372, 1.361, 1.361, 1.369, 1.393, 1.411, 1.436, 1.458, 1.477, 1.487,\n+ 1.511, 1.496, 1.478, 1.455, 1.436, 1.416, 1.399, 1.391, 1.391, 1.397, 1.411, 1.429, 1.451, 1.466, 1.479, 1.487,\n+ 1.511, 1.495, 1.478, 1.462, 1.448, 1.432, 1.419, 1.419, 1.419, 1.419, 1.429, 1.445, 1.459, 1.471, 1.482, 1.487\n+ ]\n+ },\n+ {\n+ \"ct\": 6000,\n+ \"table\":\n+ [\n+ 2.581, 2.573, 2.558, 2.539, 2.514, 2.487, 2.473, 2.471, 2.471, 2.471, 2.479, 2.499, 2.517, 2.532, 2.543, 2.544,\n+ 2.575, 2.559, 2.539, 2.521, 2.491, 2.458, 2.435, 2.421, 2.421, 2.429, 2.449, 2.477, 2.499, 2.519, 2.534, 2.543,\n+ 2.561, 2.549, 2.521, 2.491, 2.457, 2.423, 2.393, 2.375, 2.375, 2.387, 2.412, 2.444, 2.475, 2.499, 2.519, 2.532,\n+ 2.552, 2.531, 2.498, 2.459, 2.423, 2.391, 2.349, 2.325, 2.325, 2.344, 2.374, 2.412, 2.444, 2.476, 2.505, 2.519,\n+ 2.543, 2.518, 2.479, 2.435, 2.392, 2.349, 2.324, 2.285, 2.283, 2.313, 2.344, 2.374, 2.417, 2.457, 2.489, 2.506,\n+ 2.541, 2.511, 2.469, 2.421, 2.372, 2.326, 2.284, 2.277, 2.279, 2.283, 2.313, 2.357, 2.401, 2.443, 2.479, 2.504,\n+ 2.541, 2.511, 2.469, 2.421, 2.372, 2.326, 2.284, 2.267, 2.267, 2.281, 2.313, 2.357, 2.401, 2.443, 2.479, 2.504,\n+ 2.541, 2.512, 2.472, 2.425, 2.381, 2.338, 2.302, 2.278, 2.279, 2.301, 2.324, 2.364, 2.407, 2.447, 2.481, 2.504,\n+ 2.544, 2.519, 2.483, 2.441, 2.401, 2.363, 2.338, 2.302, 2.302, 2.324, 2.355, 2.385, 2.423, 2.459, 2.488, 2.506,\n+ 2.549, 2.527, 2.497, 2.463, 2.427, 2.401, 2.363, 2.345, 2.345, 2.355, 2.385, 2.412, 2.444, 2.473, 2.497, 2.509,\n+ 2.552, 2.532, 2.507, 2.481, 2.459, 2.427, 2.402, 2.389, 2.389, 2.394, 2.412, 2.444, 2.465, 2.481, 2.499, 2.511,\n+ 2.553, 2.533, 2.508, 2.489, 2.475, 2.454, 2.429, 2.429, 2.429, 2.429, 2.439, 2.463, 2.481, 2.492, 2.504, 2.511\n+ ]\n+ }\n+ ],\n+ \"calibrations_Cb\": [\n+ {\n+ \"ct\": 3000,\n+ \"table\":\n+ [\n+ 3.132, 3.126, 3.116, 3.103, 3.097, 3.091, 3.087, 3.086, 3.088, 3.091, 3.092, 3.102, 3.113, 3.121, 3.141, 3.144,\n+ 3.149, 3.132, 3.123, 3.108, 3.101, 3.096, 3.091, 3.089, 3.091, 3.092, 3.101, 3.107, 3.116, 3.129, 3.144, 3.153,\n+ 3.161, 3.149, 3.129, 3.121, 3.108, 3.103, 3.101, 3.101, 3.101, 3.103, 3.107, 3.116, 3.125, 3.134, 3.153, 3.159,\n+ 3.176, 3.161, 3.144, 3.129, 3.124, 3.121, 3.117, 3.118, 3.118, 3.119, 3.122, 3.125, 3.134, 3.146, 3.159, 3.171,\n+ 3.183, 3.176, 3.157, 3.144, 3.143, 3.143, 3.139, 3.141, 3.141, 3.141, 3.141, 3.141, 3.146, 3.161, 3.171, 3.179,\n+ 3.189, 3.183, 3.165, 3.157, 3.156, 3.157, 3.159, 3.163, 3.163, 3.163, 3.163, 3.161, 3.163, 3.169, 3.179, 3.187,\n+ 3.199, 3.189, 3.171, 3.165, 3.164, 3.167, 3.171, 3.173, 3.173, 3.172, 3.171, 3.169, 3.169, 3.175, 3.187, 3.189,\n+ 3.206, 3.196, 3.177, 3.171, 3.165, 3.167, 3.171, 3.173, 3.173, 3.172, 3.171, 3.171, 3.173, 3.177, 3.192, 3.194,\n+ 3.209, 3.197, 3.178, 3.171, 3.164, 3.161, 3.159, 3.161, 3.162, 3.164, 3.167, 3.171, 3.173, 3.181, 3.193, 3.198,\n+ 3.204, 3.194, 3.176, 3.165, 3.161, 3.156, 3.154, 3.154, 3.159, 3.161, 3.164, 3.168, 3.173, 3.182, 3.198, 3.199,\n+ 3.199, 3.191, 3.176, 3.169, 3.161, 3.157, 3.153, 3.153, 3.156, 3.161, 3.164, 3.168, 3.173, 3.186, 3.196, 3.199,\n+ 3.199, 3.188, 3.179, 3.173, 3.165, 3.157, 3.153, 3.154, 3.156, 3.159, 3.167, 3.171, 3.176, 3.185, 3.193, 3.198\n+ ]\n+ },\n+ {\n+ \"ct\": 6000,\n+ \"table\":\n+ [\n+ 1.579, 1.579, 1.577, 1.574, 1.573, 1.571, 1.571, 1.571, 1.571, 1.569, 1.569, 1.571, 1.572, 1.574, 1.577, 1.578,\n+ 1.584, 1.579, 1.578, 1.575, 1.573, 1.572, 1.571, 1.572, 1.572, 1.571, 1.571, 1.572, 1.573, 1.576, 1.578, 1.579,\n+ 1.587, 1.584, 1.579, 1.578, 1.575, 1.573, 1.573, 1.575, 1.575, 1.574, 1.573, 1.574, 1.576, 1.578, 1.581, 1.581,\n+ 1.591, 1.587, 1.584, 1.579, 1.578, 1.579, 1.579, 1.581, 1.581, 1.581, 1.578, 1.577, 1.578, 1.581, 1.585, 1.586,\n+ 1.595, 1.591, 1.587, 1.585, 1.585, 1.586, 1.587, 1.587, 1.588, 1.588, 1.585, 1.584, 1.584, 1.586, 1.589, 1.589,\n+ 1.597, 1.595, 1.591, 1.589, 1.591, 1.593, 1.595, 1.596, 1.597, 1.597, 1.595, 1.594, 1.592, 1.592, 1.593, 1.593,\n+ 1.601, 1.597, 1.593, 1.592, 1.593, 1.595, 1.598, 1.599, 1.602, 1.601, 1.598, 1.596, 1.595, 1.596, 1.595, 1.595,\n+ 1.601, 1.599, 1.594, 1.593, 1.593, 1.595, 1.598, 1.599, 1.602, 1.601, 1.598, 1.597, 1.597, 1.597, 1.597, 1.597,\n+ 1.602, 1.599, 1.594, 1.593, 1.592, 1.593, 1.595, 1.597, 1.597, 1.598, 1.598, 1.597, 1.597, 1.597, 1.598, 1.598,\n+ 1.599, 1.598, 1.594, 1.592, 1.591, 1.591, 1.592, 1.595, 1.596, 1.597, 1.597, 1.597, 1.597, 1.599, 1.599, 1.599,\n+ 1.598, 1.596, 1.594, 1.593, 1.592, 1.592, 1.592, 1.594, 1.595, 1.597, 1.597, 1.597, 1.598, 1.599, 1.599, 1.599,\n+ 1.597, 1.595, 1.594, 1.594, 1.593, 1.592, 1.593, 1.595, 1.595, 1.597, 1.598, 1.598, 1.598, 1.599, 1.599, 1.599\n+ ]\n+ }\n+ ],\n+ \"luminance_lut\":\n [\n- 1.579, 1.579, 1.577, 1.574, 1.573, 1.571, 1.571, 1.571, 1.571, 1.569, 1.569, 1.571, 1.572, 1.574, 1.577, 1.578,\n- 1.584, 1.579, 1.578, 1.575, 1.573, 1.572, 1.571, 1.572, 1.572, 1.571, 1.571, 1.572, 1.573, 1.576, 1.578, 1.579,\n- 1.587, 1.584, 1.579, 1.578, 1.575, 1.573, 1.573, 1.575, 1.575, 1.574, 1.573, 1.574, 1.576, 1.578, 1.581, 1.581,\n- 1.591, 1.587, 1.584, 1.579, 1.578, 1.579, 1.579, 1.581, 1.581, 1.581, 1.578, 1.577, 1.578, 1.581, 1.585, 1.586,\n- 1.595, 1.591, 1.587, 1.585, 1.585, 1.586, 1.587, 1.587, 1.588, 1.588, 1.585, 1.584, 1.584, 1.586, 1.589, 1.589,\n- 1.597, 1.595, 1.591, 1.589, 1.591, 1.593, 1.595, 1.596, 1.597, 1.597, 1.595, 1.594, 1.592, 1.592, 1.593, 1.593,\n- 1.601, 1.597, 1.593, 1.592, 1.593, 1.595, 1.598, 1.599, 1.602, 1.601, 1.598, 1.596, 1.595, 1.596, 1.595, 1.595,\n- 1.601, 1.599, 1.594, 1.593, 1.593, 1.595, 1.598, 1.599, 1.602, 1.601, 1.598, 1.597, 1.597, 1.597, 1.597, 1.597,\n- 1.602, 1.599, 1.594, 1.593, 1.592, 1.593, 1.595, 1.597, 1.597, 1.598, 1.598, 1.597, 1.597, 1.597, 1.598, 1.598,\n- 1.599, 1.598, 1.594, 1.592, 1.591, 1.591, 1.592, 1.595, 1.596, 1.597, 1.597, 1.597, 1.597, 1.599, 1.599, 1.599,\n- 1.598, 1.596, 1.594, 1.593, 1.592, 1.592, 1.592, 1.594, 1.595, 1.597, 1.597, 1.597, 1.598, 1.599, 1.599, 1.599,\n- 1.597, 1.595, 1.594, 1.594, 1.593, 1.592, 1.593, 1.595, 1.595, 1.597, 1.598, 1.598, 1.598, 1.599, 1.599, 1.599\n- ]\n+ 2.887, 2.754, 2.381, 2.105, 1.859, 1.678, 1.625, 1.623, 1.623, 1.624, 1.669, 1.849, 2.092, 2.362, 2.723, 2.838,\n+ 2.754, 2.443, 2.111, 1.905, 1.678, 1.542, 1.455, 1.412, 1.412, 1.452, 1.535, 1.665, 1.893, 2.096, 2.413, 2.723,\n+ 2.443, 2.216, 1.911, 1.678, 1.537, 1.372, 1.288, 1.245, 1.245, 1.283, 1.363, 1.527, 1.665, 1.895, 2.193, 2.413,\n+ 2.318, 2.057, 1.764, 1.541, 1.372, 1.282, 1.159, 1.113, 1.113, 1.151, 1.269, 1.363, 1.527, 1.749, 2.034, 2.278,\n+ 2.259, 1.953, 1.671, 1.452, 1.283, 1.159, 1.107, 1.018, 1.017, 1.097, 1.151, 1.269, 1.437, 1.655, 1.931, 2.222,\n+ 2.257, 1.902, 1.624, 1.408, 1.239, 1.111, 1.019, 1.011, 1.005, 1.014, 1.098, 1.227, 1.395, 1.608, 1.883, 2.222,\n+ 2.257, 1.902, 1.624, 1.408, 1.239, 1.111, 1.016, 1.001, 1.001, 1.007, 1.098, 1.227, 1.395, 1.608, 1.883, 2.222,\n+ 2.257, 1.946, 1.666, 1.448, 1.281, 1.153, 1.093, 1.013, 1.008, 1.089, 1.143, 1.269, 1.437, 1.654, 1.934, 2.226,\n+ 2.309, 2.044, 1.756, 1.532, 1.363, 1.259, 1.153, 1.093, 1.093, 1.143, 1.264, 1.354, 1.524, 1.746, 2.035, 2.284,\n+ 2.425, 2.201, 1.896, 1.662, 1.519, 1.363, 1.259, 1.214, 1.214, 1.264, 1.354, 1.519, 1.655, 1.888, 2.191, 2.413,\n+ 2.724, 2.417, 2.091, 1.888, 1.662, 1.519, 1.419, 1.373, 1.373, 1.425, 1.521, 1.655, 1.885, 2.089, 2.409, 2.722,\n+ 2.858, 2.724, 2.356, 2.085, 1.842, 1.658, 1.581, 1.577, 1.577, 1.579, 1.653, 1.838, 2.084, 2.359, 2.722, 2.842\n+ ],\n+ \"sigma\": 0.00372,\n+ \"sigma_Cb\": 0.00244\n }\n- ],\n- \"luminance_lut\":\n- [\n- 2.887, 2.754, 2.381, 2.105, 1.859, 1.678, 1.625, 1.623, 1.623, 1.624, 1.669, 1.849, 2.092, 2.362, 2.723, 2.838,\n- 2.754, 2.443, 2.111, 1.905, 1.678, 1.542, 1.455, 1.412, 1.412, 1.452, 1.535, 1.665, 1.893, 2.096, 2.413, 2.723,\n- 2.443, 2.216, 1.911, 1.678, 1.537, 1.372, 1.288, 1.245, 1.245, 1.283, 1.363, 1.527, 1.665, 1.895, 2.193, 2.413,\n- 2.318, 2.057, 1.764, 1.541, 1.372, 1.282, 1.159, 1.113, 1.113, 1.151, 1.269, 1.363, 1.527, 1.749, 2.034, 2.278,\n- 2.259, 1.953, 1.671, 1.452, 1.283, 1.159, 1.107, 1.018, 1.017, 1.097, 1.151, 1.269, 1.437, 1.655, 1.931, 2.222,\n- 2.257, 1.902, 1.624, 1.408, 1.239, 1.111, 1.019, 1.011, 1.005, 1.014, 1.098, 1.227, 1.395, 1.608, 1.883, 2.222,\n- 2.257, 1.902, 1.624, 1.408, 1.239, 1.111, 1.016, 1.001, 1.001, 1.007, 1.098, 1.227, 1.395, 1.608, 1.883, 2.222,\n- 2.257, 1.946, 1.666, 1.448, 1.281, 1.153, 1.093, 1.013, 1.008, 1.089, 1.143, 1.269, 1.437, 1.654, 1.934, 2.226,\n- 2.309, 2.044, 1.756, 1.532, 1.363, 1.259, 1.153, 1.093, 1.093, 1.143, 1.264, 1.354, 1.524, 1.746, 2.035, 2.284,\n- 2.425, 2.201, 1.896, 1.662, 1.519, 1.363, 1.259, 1.214, 1.214, 1.264, 1.354, 1.519, 1.655, 1.888, 2.191, 2.413,\n- 2.724, 2.417, 2.091, 1.888, 1.662, 1.519, 1.419, 1.373, 1.373, 1.425, 1.521, 1.655, 1.885, 2.089, 2.409, 2.722,\n- 2.858, 2.724, 2.356, 2.085, 1.842, 1.658, 1.581, 1.577, 1.577, 1.579, 1.653, 1.838, 2.084, 2.359, 2.722, 2.842\n- ],\n- \"sigma\": 0.00372,\n- \"sigma_Cb\": 0.00244\n- },\n- \"rpi.contrast\":\n- {\n- \"ce_enable\": 1,\n- \"gamma_curve\":\n- [\n- 0, 0, 1024, 5040, 2048, 9338, 3072, 12356, 4096, 15312, 5120, 18051, 6144, 20790, 7168, 23193,\n- 8192, 25744, 9216, 27942, 10240, 30035, 11264, 32005, 12288, 33975, 13312, 35815, 14336, 37600, 15360, 39168,\n- 16384, 40642, 18432, 43379, 20480, 45749, 22528, 47753, 24576, 49621, 26624, 51253, 28672, 52698, 30720, 53796,\n- 32768, 54876, 36864, 57012, 40960, 58656, 45056, 59954, 49152, 61183, 53248, 62355, 57344, 63419, 61440, 64476,\n- 65535, 65535\n- ]\n- },\n- \"rpi.ccm\":\n- {\n- \"ccms\":\n- [\n- {\n- \"ct\": 2890, \"ccm\":\n- [\n- 1.36754, -0.18448, -0.18306, -0.32356, 1.44826, -0.12471, -0.00412, -0.69936, 1.70348\n- ]\n- },\n- {\n- \"ct\": 2920, \"ccm\":\n- [\n- 1.26704, 0.01624, -0.28328, -0.28516, 1.38934, -0.10419, -0.04854, -0.82211, 1.87066\n- ]\n- },\n- {\n- \"ct\": 3550, \"ccm\":\n- [\n- 1.42836, -0.27235, -0.15601, -0.28751, 1.41075, -0.12325, -0.01812, -0.54849, 1.56661\n- ]\n- },\n- {\n- \"ct\": 4500, \"ccm\":\n- [\n- 1.36328, -0.19569, -0.16759, -0.25254, 1.52248, -0.26994, -0.01575, -0.53155, 1.54729\n- ]\n- },\n+ },\n+ {\n+ \"rpi.contrast\":\n {\n- \"ct\": 5700, \"ccm\":\n+ \"ce_enable\": 1,\n+ \"gamma_curve\":\n [\n- 1.49207, -0.37245, -0.11963, -0.21493, 1.40005, -0.18512, -0.03781, -0.38779, 1.42561\n+ 0, 0,\n+ 1024, 5040,\n+ 2048, 9338,\n+ 3072, 12356,\n+ 4096, 15312,\n+ 5120, 18051,\n+ 6144, 20790,\n+ 7168, 23193,\n+ 8192, 25744,\n+ 9216, 27942,\n+ 10240, 30035,\n+ 11264, 32005,\n+ 12288, 33975,\n+ 13312, 35815,\n+ 14336, 37600,\n+ 15360, 39168,\n+ 16384, 40642,\n+ 18432, 43379,\n+ 20480, 45749,\n+ 22528, 47753,\n+ 24576, 49621,\n+ 26624, 51253,\n+ 28672, 52698,\n+ 30720, 53796,\n+ 32768, 54876,\n+ 36864, 57012,\n+ 40960, 58656,\n+ 45056, 59954,\n+ 49152, 61183,\n+ 53248, 62355,\n+ 57344, 63419,\n+ 61440, 64476,\n+ 65535, 65535\n ]\n- },\n+ }\n+ },\n+ {\n+ \"rpi.ccm\":\n {\n- \"ct\": 7900, \"ccm\":\n- [\n- 1.34849, -0.05425, -0.29424, -0.22182, 1.77684, -0.55502, -0.07403, -0.55336, 1.62739\n+ \"ccms\": [\n+ {\n+ \"ct\": 2890,\n+ \"ccm\":\n+ [\n+ 1.36754, -0.18448, -0.18306,\n+ -0.32356, 1.44826, -0.12471,\n+ -0.00412, -0.69936, 1.70348\n+ ]\n+ },\n+ {\n+ \"ct\": 2920,\n+ \"ccm\":\n+ [\n+ 1.26704, 0.01624, -0.28328,\n+ -0.28516, 1.38934, -0.10419,\n+ -0.04854, -0.82211, 1.87066\n+ ]\n+ },\n+ {\n+ \"ct\": 3550,\n+ \"ccm\":\n+ [\n+ 1.42836, -0.27235, -0.15601,\n+ -0.28751, 1.41075, -0.12325,\n+ -0.01812, -0.54849, 1.56661\n+ ]\n+ },\n+ {\n+ \"ct\": 4500,\n+ \"ccm\":\n+ [\n+ 1.36328, -0.19569, -0.16759,\n+ -0.25254, 1.52248, -0.26994,\n+ -0.01575, -0.53155, 1.54729\n+ ]\n+ },\n+ {\n+ \"ct\": 5700,\n+ \"ccm\":\n+ [\n+ 1.49207, -0.37245, -0.11963,\n+ -0.21493, 1.40005, -0.18512,\n+ -0.03781, -0.38779, 1.42561\n+ ]\n+ },\n+ {\n+ \"ct\": 7900,\n+ \"ccm\":\n+ [\n+ 1.34849, -0.05425, -0.29424,\n+ -0.22182, 1.77684, -0.55502,\n+ -0.07403, -0.55336, 1.62739\n+ ]\n+ }\n ]\n }\n- ]\n- },\n- \"rpi.sharpen\":\n- {\n- }\n-}\n+ },\n+ {\n+ \"rpi.sharpen\": { }\n+ }\n+ ]\n+}\n\\ No newline at end of file\ndiff --git a/src/ipa/raspberrypi/data/ov5647.json b/src/ipa/raspberrypi/data/ov5647.json\nindex e65f9385d970..d770e44f08ba 100644\n--- a/src/ipa/raspberrypi/data/ov5647.json\n+++ b/src/ipa/raspberrypi/data/ov5647.json\n@@ -1,409 +1,487 @@\n {\n- \"rpi.black_level\":\n- {\n- \"black_level\": 1024\n- },\n- \"rpi.dpc\":\n- {\n-\n- },\n- \"rpi.lux\":\n- {\n- \"reference_shutter_speed\": 21663,\n- \"reference_gain\": 1.0,\n- \"reference_aperture\": 1.0,\n- \"reference_lux\": 987,\n- \"reference_Y\": 8961\n- },\n- \"rpi.noise\":\n- {\n- \"reference_constant\": 0,\n- \"reference_slope\": 4.25\n- },\n- \"rpi.geq\":\n- {\n- \"offset\": 401,\n- \"slope\": 0.05619\n- },\n- \"rpi.sdn\":\n- {\n-\n- },\n- \"rpi.awb\":\n- {\n- \"priors\":\n- [\n- {\n- \"lux\": 0, \"prior\":\n- [\n- 2000, 1.0, 3000, 0.0, 13000, 0.0\n- ]\n- },\n- {\n- \"lux\": 800, \"prior\":\n- [\n- 2000, 0.0, 6000, 2.0, 13000, 2.0\n- ]\n- },\n+ \"version\": 2.0,\n+ \"target\": \"bcm2835\",\n+ \"algorithms\": [\n+ {\n+ \"rpi.black_level\":\n {\n- \"lux\": 1500, \"prior\":\n- [\n- 2000, 0.0, 4000, 1.0, 6000, 6.0, 6500, 7.0, 7000, 1.0, 13000, 1.0\n- ]\n+ \"black_level\": 1024\n }\n- ],\n- \"modes\":\n+ },\n {\n- \"auto\":\n- {\n- \"lo\": 2500,\n- \"hi\": 8000\n- },\n- \"incandescent\":\n- {\n- \"lo\": 2500,\n- \"hi\": 3000\n- },\n- \"tungsten\":\n- {\n- \"lo\": 3000,\n- \"hi\": 3500\n- },\n- \"fluorescent\":\n- {\n- \"lo\": 4000,\n- \"hi\": 4700\n- },\n- \"indoor\":\n- {\n- \"lo\": 3000,\n- \"hi\": 5000\n- },\n- \"daylight\":\n- {\n- \"lo\": 5500,\n- \"hi\": 6500\n- },\n- \"cloudy\":\n+ \"rpi.dpc\": { }\n+ },\n+ {\n+ \"rpi.lux\":\n {\n- \"lo\": 7000,\n- \"hi\": 8600\n+ \"reference_shutter_speed\": 21663,\n+ \"reference_gain\": 1.0,\n+ \"reference_aperture\": 1.0,\n+ \"reference_lux\": 987,\n+ \"reference_Y\": 8961\n }\n },\n- \"bayes\": 1,\n- \"ct_curve\":\n- [\n- 2500.0, 1.0289, 0.4503, 2803.0, 0.9428, 0.5108, 2914.0, 0.9406, 0.5127, 3605.0, 0.8261, 0.6249, 4540.0, 0.7331, 0.7533, 5699.0,\n- 0.6715, 0.8627, 8625.0, 0.6081, 1.0012\n- ],\n- \"sensitivity_r\": 1.05,\n- \"sensitivity_b\": 1.05,\n- \"transverse_pos\": 0.0321,\n- \"transverse_neg\": 0.04313\n- },\n- \"rpi.agc\":\n- {\n- \"metering_modes\":\n {\n- \"centre-weighted\":\n- {\n- \"weights\":\n- [\n- 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0\n- ]\n- },\n- \"spot\":\n- {\n- \"weights\":\n- [\n- 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0\n- ]\n- },\n- \"matrix\":\n+ \"rpi.noise\":\n {\n- \"weights\":\n- [\n- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1\n- ]\n+ \"reference_constant\": 0,\n+ \"reference_slope\": 4.25\n }\n },\n- \"exposure_modes\":\n {\n- \"normal\":\n+ \"rpi.geq\":\n {\n- \"shutter\":\n- [\n- 100, 10000, 30000, 60000, 66666\n- ],\n- \"gain\":\n- [\n- 1.0, 2.0, 4.0, 6.0, 8.0\n- ]\n- },\n- \"short\":\n+ \"offset\": 401,\n+ \"slope\": 0.05619\n+ }\n+ },\n+ {\n+ \"rpi.sdn\": { }\n+ },\n+ {\n+ \"rpi.awb\":\n {\n- \"shutter\":\n- [\n- 100, 5000, 10000, 20000, 33333\n+ \"priors\": [\n+ {\n+ \"lux\": 0,\n+ \"prior\":\n+ [\n+ 2000, 1.0,\n+ 3000, 0.0,\n+ 13000, 0.0\n+ ]\n+ },\n+ {\n+ \"lux\": 800,\n+ \"prior\":\n+ [\n+ 2000, 0.0,\n+ 6000, 2.0,\n+ 13000, 2.0\n+ ]\n+ },\n+ {\n+ \"lux\": 1500,\n+ \"prior\":\n+ [\n+ 2000, 0.0,\n+ 4000, 1.0,\n+ 6000, 6.0,\n+ 6500, 7.0,\n+ 7000, 1.0,\n+ 13000, 1.0\n+ ]\n+ }\n ],\n- \"gain\":\n- [\n- 1.0, 2.0, 4.0, 6.0, 8.0\n- ]\n- },\n- \"long\":\n- {\n- \"shutter\":\n+ \"modes\":\n+ {\n+ \"auto\":\n+ {\n+ \"lo\": 2500,\n+ \"hi\": 8000\n+ },\n+ \"incandescent\":\n+ {\n+ \"lo\": 2500,\n+ \"hi\": 3000\n+ },\n+ \"tungsten\":\n+ {\n+ \"lo\": 3000,\n+ \"hi\": 3500\n+ },\n+ \"fluorescent\":\n+ {\n+ \"lo\": 4000,\n+ \"hi\": 4700\n+ },\n+ \"indoor\":\n+ {\n+ \"lo\": 3000,\n+ \"hi\": 5000\n+ },\n+ \"daylight\":\n+ {\n+ \"lo\": 5500,\n+ \"hi\": 6500\n+ },\n+ \"cloudy\":\n+ {\n+ \"lo\": 7000,\n+ \"hi\": 8600\n+ }\n+ },\n+ \"bayes\": 1,\n+ \"ct_curve\":\n [\n- 100, 10000, 30000, 60000, 120000\n+ 2500.0, 1.0289, 0.4503,\n+ 2803.0, 0.9428, 0.5108,\n+ 2914.0, 0.9406, 0.5127,\n+ 3605.0, 0.8261, 0.6249,\n+ 4540.0, 0.7331, 0.7533,\n+ 5699.0, 0.6715, 0.8627,\n+ 8625.0, 0.6081, 1.0012\n ],\n- \"gain\":\n- [\n- 1.0, 2.0, 4.0, 6.0, 12.0\n- ]\n+ \"sensitivity_r\": 1.05,\n+ \"sensitivity_b\": 1.05,\n+ \"transverse_pos\": 0.0321,\n+ \"transverse_neg\": 0.04313\n }\n },\n- \"constraint_modes\":\n {\n- \"normal\":\n- [\n- {\n- \"bound\": \"LOWER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.5, 1000, 0.5\n- ]\n- }\n- ],\n- \"highlight\":\n- [\n+ \"rpi.agc\":\n+ {\n+ \"metering_modes\":\n {\n- \"bound\": \"LOWER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.5, 1000, 0.5\n- ]\n+ \"centre-weighted\":\n+ {\n+ \"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+ },\n+ \"spot\":\n+ {\n+ \"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+ },\n+ \"matrix\":\n+ {\n+ \"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+ }\n },\n+ \"exposure_modes\":\n {\n- \"bound\": \"UPPER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.8, 1000, 0.8\n- ]\n- }\n- ],\n- \"shadows\":\n- [\n+ \"normal\":\n+ {\n+ \"shutter\": [ 100, 10000, 30000, 60000, 66666 ],\n+ \"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+ },\n+ \"short\":\n+ {\n+ \"shutter\": [ 100, 5000, 10000, 20000, 33333 ],\n+ \"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+ },\n+ \"long\":\n+ {\n+ \"shutter\": [ 100, 10000, 30000, 60000, 120000 ],\n+ \"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+ }\n+ },\n+ \"constraint_modes\":\n {\n- \"bound\": \"LOWER\", \"q_lo\": 0.0, \"q_hi\": 0.5, \"y_target\":\n- [\n- 0, 0.17, 1000, 0.17\n+ \"normal\": [\n+ {\n+ \"bound\": \"LOWER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.5,\n+ 1000, 0.5\n+ ]\n+ }\n+ ],\n+ \"highlight\": [\n+ {\n+ \"bound\": \"LOWER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.5,\n+ 1000, 0.5\n+ ]\n+ },\n+ {\n+ \"bound\": \"UPPER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.8,\n+ 1000, 0.8\n+ ]\n+ }\n+ ],\n+ \"shadows\": [\n+ {\n+ \"bound\": \"LOWER\",\n+ \"q_lo\": 0.0,\n+ \"q_hi\": 0.5,\n+ \"y_target\":\n+ [\n+ 0, 0.17,\n+ 1000, 0.17\n+ ]\n+ }\n ]\n- }\n- ]\n- },\n- \"y_target\":\n- [\n- 0, 0.16, 1000, 0.165, 10000, 0.17\n- ],\n- \"base_ev\": 1.25\n- },\n- \"rpi.alsc\":\n- {\n- \"omega\": 1.3,\n- \"n_iter\": 100,\n- \"luminance_strength\": 0.5,\n- \"calibrations_Cr\":\n- [\n- {\n- \"ct\": 3000, \"table\":\n- [\n- 1.105, 1.103, 1.093, 1.083, 1.071, 1.065, 1.065, 1.065, 1.066, 1.069, 1.072, 1.077, 1.084, 1.089, 1.093, 1.093,\n- 1.103, 1.096, 1.084, 1.072, 1.059, 1.051, 1.047, 1.047, 1.051, 1.053, 1.059, 1.067, 1.075, 1.082, 1.085, 1.086,\n- 1.096, 1.084, 1.072, 1.059, 1.051, 1.045, 1.039, 1.038, 1.039, 1.045, 1.049, 1.057, 1.063, 1.072, 1.081, 1.082,\n- 1.092, 1.075, 1.061, 1.052, 1.045, 1.039, 1.036, 1.035, 1.035, 1.039, 1.044, 1.049, 1.056, 1.063, 1.072, 1.081,\n- 1.092, 1.073, 1.058, 1.048, 1.043, 1.038, 1.035, 1.033, 1.033, 1.035, 1.039, 1.044, 1.051, 1.057, 1.069, 1.078,\n- 1.091, 1.068, 1.054, 1.045, 1.041, 1.038, 1.035, 1.032, 1.032, 1.032, 1.036, 1.041, 1.045, 1.055, 1.069, 1.078,\n- 1.091, 1.068, 1.052, 1.043, 1.041, 1.038, 1.035, 1.032, 1.031, 1.032, 1.034, 1.036, 1.043, 1.055, 1.069, 1.078,\n- 1.092, 1.068, 1.052, 1.047, 1.042, 1.041, 1.038, 1.035, 1.032, 1.032, 1.035, 1.039, 1.043, 1.055, 1.071, 1.079,\n- 1.092, 1.073, 1.057, 1.051, 1.047, 1.047, 1.044, 1.041, 1.038, 1.038, 1.039, 1.043, 1.051, 1.059, 1.076, 1.083,\n- 1.092, 1.081, 1.068, 1.058, 1.056, 1.056, 1.053, 1.052, 1.049, 1.048, 1.048, 1.051, 1.059, 1.066, 1.083, 1.085,\n- 1.091, 1.087, 1.081, 1.068, 1.065, 1.064, 1.062, 1.062, 1.061, 1.056, 1.056, 1.056, 1.064, 1.069, 1.084, 1.089,\n- 1.091, 1.089, 1.085, 1.079, 1.069, 1.068, 1.067, 1.067, 1.067, 1.063, 1.061, 1.063, 1.068, 1.069, 1.081, 1.092\n- ]\n- },\n- {\n- \"ct\": 5000, \"table\":\n- [\n- 1.486, 1.484, 1.468, 1.449, 1.427, 1.403, 1.399, 1.399, 1.399, 1.404, 1.413, 1.433, 1.454, 1.473, 1.482, 1.488,\n- 1.484, 1.472, 1.454, 1.431, 1.405, 1.381, 1.365, 1.365, 1.367, 1.373, 1.392, 1.411, 1.438, 1.458, 1.476, 1.481,\n- 1.476, 1.458, 1.433, 1.405, 1.381, 1.361, 1.339, 1.334, 1.334, 1.346, 1.362, 1.391, 1.411, 1.438, 1.462, 1.474,\n- 1.471, 1.443, 1.417, 1.388, 1.361, 1.339, 1.321, 1.313, 1.313, 1.327, 1.346, 1.362, 1.391, 1.422, 1.453, 1.473,\n- 1.469, 1.439, 1.408, 1.377, 1.349, 1.321, 1.312, 1.299, 1.299, 1.311, 1.327, 1.348, 1.378, 1.415, 1.446, 1.468,\n- 1.468, 1.434, 1.402, 1.371, 1.341, 1.316, 1.299, 1.296, 1.295, 1.299, 1.314, 1.338, 1.371, 1.408, 1.441, 1.466,\n- 1.468, 1.434, 1.401, 1.371, 1.341, 1.316, 1.301, 1.296, 1.295, 1.297, 1.314, 1.338, 1.369, 1.408, 1.441, 1.465,\n- 1.469, 1.436, 1.401, 1.374, 1.348, 1.332, 1.315, 1.301, 1.301, 1.313, 1.324, 1.342, 1.372, 1.409, 1.442, 1.465,\n- 1.471, 1.444, 1.413, 1.388, 1.371, 1.348, 1.332, 1.323, 1.323, 1.324, 1.342, 1.362, 1.386, 1.418, 1.449, 1.467,\n- 1.473, 1.454, 1.431, 1.407, 1.388, 1.371, 1.359, 1.352, 1.351, 1.351, 1.362, 1.383, 1.404, 1.433, 1.462, 1.472,\n- 1.474, 1.461, 1.447, 1.424, 1.407, 1.394, 1.385, 1.381, 1.379, 1.381, 1.383, 1.401, 1.419, 1.444, 1.466, 1.481,\n- 1.474, 1.464, 1.455, 1.442, 1.421, 1.408, 1.403, 1.403, 1.403, 1.399, 1.402, 1.415, 1.432, 1.446, 1.467, 1.483\n- ]\n- },\n- {\n- \"ct\": 6500, \"table\":\n+ },\n+ \"y_target\":\n [\n- 1.567, 1.565, 1.555, 1.541, 1.525, 1.518, 1.518, 1.518, 1.521, 1.527, 1.532, 1.541, 1.551, 1.559, 1.567, 1.569,\n- 1.565, 1.557, 1.542, 1.527, 1.519, 1.515, 1.511, 1.516, 1.519, 1.524, 1.528, 1.533, 1.542, 1.553, 1.559, 1.562,\n- 1.561, 1.546, 1.532, 1.521, 1.518, 1.515, 1.511, 1.516, 1.519, 1.524, 1.528, 1.529, 1.533, 1.542, 1.554, 1.559,\n- 1.561, 1.539, 1.526, 1.524, 1.521, 1.521, 1.522, 1.524, 1.525, 1.531, 1.529, 1.529, 1.531, 1.538, 1.549, 1.558,\n- 1.559, 1.538, 1.526, 1.525, 1.524, 1.528, 1.534, 1.536, 1.536, 1.536, 1.532, 1.529, 1.531, 1.537, 1.548, 1.556,\n- 1.561, 1.537, 1.525, 1.524, 1.526, 1.532, 1.537, 1.539, 1.538, 1.537, 1.532, 1.529, 1.529, 1.537, 1.546, 1.556,\n- 1.561, 1.536, 1.524, 1.522, 1.525, 1.532, 1.538, 1.538, 1.537, 1.533, 1.528, 1.526, 1.527, 1.536, 1.546, 1.555,\n- 1.561, 1.537, 1.522, 1.521, 1.524, 1.531, 1.536, 1.537, 1.534, 1.529, 1.526, 1.522, 1.523, 1.534, 1.547, 1.555,\n- 1.561, 1.538, 1.524, 1.522, 1.526, 1.531, 1.535, 1.535, 1.534, 1.527, 1.524, 1.522, 1.522, 1.535, 1.549, 1.556,\n- 1.558, 1.543, 1.532, 1.526, 1.526, 1.529, 1.534, 1.535, 1.533, 1.526, 1.523, 1.522, 1.524, 1.537, 1.552, 1.557,\n- 1.555, 1.546, 1.541, 1.528, 1.527, 1.528, 1.531, 1.533, 1.531, 1.527, 1.522, 1.522, 1.526, 1.536, 1.552, 1.561,\n- 1.555, 1.547, 1.542, 1.538, 1.526, 1.526, 1.529, 1.531, 1.529, 1.528, 1.519, 1.519, 1.527, 1.531, 1.543, 1.561\n- ]\n+ 0, 0.16,\n+ 1000, 0.165,\n+ 10000, 0.17\n+ ],\n+ \"base_ev\": 1.25\n }\n- ],\n- \"calibrations_Cb\":\n- [\n- {\n- \"ct\": 3000, \"table\":\n- [\n- 1.684, 1.688, 1.691, 1.697, 1.709, 1.722, 1.735, 1.745, 1.747, 1.745, 1.731, 1.719, 1.709, 1.705, 1.699, 1.699,\n- 1.684, 1.689, 1.694, 1.708, 1.721, 1.735, 1.747, 1.762, 1.762, 1.758, 1.745, 1.727, 1.716, 1.707, 1.701, 1.699,\n- 1.684, 1.691, 1.704, 1.719, 1.734, 1.755, 1.772, 1.786, 1.789, 1.788, 1.762, 1.745, 1.724, 1.709, 1.702, 1.698,\n- 1.682, 1.694, 1.709, 1.729, 1.755, 1.773, 1.798, 1.815, 1.817, 1.808, 1.788, 1.762, 1.733, 1.714, 1.704, 1.699,\n- 1.682, 1.693, 1.713, 1.742, 1.772, 1.798, 1.815, 1.829, 1.831, 1.821, 1.807, 1.773, 1.742, 1.716, 1.703, 1.699,\n- 1.681, 1.693, 1.713, 1.742, 1.772, 1.799, 1.828, 1.839, 1.839, 1.828, 1.807, 1.774, 1.742, 1.715, 1.699, 1.695,\n- 1.679, 1.691, 1.712, 1.739, 1.771, 1.798, 1.825, 1.829, 1.831, 1.818, 1.801, 1.774, 1.738, 1.712, 1.695, 1.691,\n- 1.676, 1.685, 1.703, 1.727, 1.761, 1.784, 1.801, 1.817, 1.817, 1.801, 1.779, 1.761, 1.729, 1.706, 1.691, 1.684,\n- 1.669, 1.678, 1.692, 1.714, 1.741, 1.764, 1.784, 1.795, 1.795, 1.779, 1.761, 1.738, 1.713, 1.696, 1.683, 1.679,\n- 1.664, 1.671, 1.679, 1.693, 1.716, 1.741, 1.762, 1.769, 1.769, 1.753, 1.738, 1.713, 1.701, 1.687, 1.681, 1.676,\n- 1.661, 1.664, 1.671, 1.679, 1.693, 1.714, 1.732, 1.739, 1.739, 1.729, 1.708, 1.701, 1.685, 1.679, 1.676, 1.677,\n- 1.659, 1.661, 1.664, 1.671, 1.679, 1.693, 1.712, 1.714, 1.714, 1.708, 1.701, 1.687, 1.679, 1.672, 1.673, 1.677\n- ]\n- },\n- {\n- \"ct\": 5000, \"table\":\n- [\n- 1.177, 1.183, 1.187, 1.191, 1.197, 1.206, 1.213, 1.215, 1.215, 1.215, 1.211, 1.204, 1.196, 1.191, 1.183, 1.182,\n- 1.179, 1.185, 1.191, 1.196, 1.206, 1.217, 1.224, 1.229, 1.229, 1.226, 1.221, 1.212, 1.202, 1.195, 1.188, 1.182,\n- 1.183, 1.191, 1.196, 1.206, 1.217, 1.229, 1.239, 1.245, 1.245, 1.245, 1.233, 1.221, 1.212, 1.199, 1.193, 1.187,\n- 1.183, 1.192, 1.201, 1.212, 1.229, 1.241, 1.252, 1.259, 1.259, 1.257, 1.245, 1.233, 1.217, 1.201, 1.194, 1.192,\n- 1.183, 1.192, 1.202, 1.219, 1.238, 1.252, 1.261, 1.269, 1.268, 1.261, 1.257, 1.241, 1.223, 1.204, 1.194, 1.191,\n- 1.182, 1.192, 1.202, 1.219, 1.239, 1.255, 1.266, 1.271, 1.271, 1.265, 1.258, 1.242, 1.223, 1.205, 1.192, 1.191,\n- 1.181, 1.189, 1.199, 1.218, 1.239, 1.254, 1.262, 1.268, 1.268, 1.258, 1.253, 1.241, 1.221, 1.204, 1.191, 1.187,\n- 1.179, 1.184, 1.193, 1.211, 1.232, 1.243, 1.254, 1.257, 1.256, 1.253, 1.242, 1.232, 1.216, 1.199, 1.187, 1.183,\n- 1.174, 1.179, 1.187, 1.202, 1.218, 1.232, 1.243, 1.246, 1.246, 1.239, 1.232, 1.218, 1.207, 1.191, 1.183, 1.179,\n- 1.169, 1.175, 1.181, 1.189, 1.202, 1.218, 1.229, 1.232, 1.232, 1.224, 1.218, 1.207, 1.199, 1.185, 1.181, 1.174,\n- 1.164, 1.168, 1.175, 1.179, 1.189, 1.201, 1.209, 1.213, 1.213, 1.209, 1.201, 1.198, 1.186, 1.181, 1.174, 1.173,\n- 1.161, 1.166, 1.171, 1.175, 1.179, 1.189, 1.197, 1.198, 1.198, 1.197, 1.196, 1.186, 1.182, 1.175, 1.173, 1.173\n- ]\n- },\n+ },\n+ {\n+ \"rpi.alsc\":\n {\n- \"ct\": 6500, \"table\":\n+ \"omega\": 1.3,\n+ \"n_iter\": 100,\n+ \"luminance_strength\": 0.5,\n+ \"calibrations_Cr\": [\n+ {\n+ \"ct\": 3000,\n+ \"table\":\n+ [\n+ 1.105, 1.103, 1.093, 1.083, 1.071, 1.065, 1.065, 1.065, 1.066, 1.069, 1.072, 1.077, 1.084, 1.089, 1.093, 1.093,\n+ 1.103, 1.096, 1.084, 1.072, 1.059, 1.051, 1.047, 1.047, 1.051, 1.053, 1.059, 1.067, 1.075, 1.082, 1.085, 1.086,\n+ 1.096, 1.084, 1.072, 1.059, 1.051, 1.045, 1.039, 1.038, 1.039, 1.045, 1.049, 1.057, 1.063, 1.072, 1.081, 1.082,\n+ 1.092, 1.075, 1.061, 1.052, 1.045, 1.039, 1.036, 1.035, 1.035, 1.039, 1.044, 1.049, 1.056, 1.063, 1.072, 1.081,\n+ 1.092, 1.073, 1.058, 1.048, 1.043, 1.038, 1.035, 1.033, 1.033, 1.035, 1.039, 1.044, 1.051, 1.057, 1.069, 1.078,\n+ 1.091, 1.068, 1.054, 1.045, 1.041, 1.038, 1.035, 1.032, 1.032, 1.032, 1.036, 1.041, 1.045, 1.055, 1.069, 1.078,\n+ 1.091, 1.068, 1.052, 1.043, 1.041, 1.038, 1.035, 1.032, 1.031, 1.032, 1.034, 1.036, 1.043, 1.055, 1.069, 1.078,\n+ 1.092, 1.068, 1.052, 1.047, 1.042, 1.041, 1.038, 1.035, 1.032, 1.032, 1.035, 1.039, 1.043, 1.055, 1.071, 1.079,\n+ 1.092, 1.073, 1.057, 1.051, 1.047, 1.047, 1.044, 1.041, 1.038, 1.038, 1.039, 1.043, 1.051, 1.059, 1.076, 1.083,\n+ 1.092, 1.081, 1.068, 1.058, 1.056, 1.056, 1.053, 1.052, 1.049, 1.048, 1.048, 1.051, 1.059, 1.066, 1.083, 1.085,\n+ 1.091, 1.087, 1.081, 1.068, 1.065, 1.064, 1.062, 1.062, 1.061, 1.056, 1.056, 1.056, 1.064, 1.069, 1.084, 1.089,\n+ 1.091, 1.089, 1.085, 1.079, 1.069, 1.068, 1.067, 1.067, 1.067, 1.063, 1.061, 1.063, 1.068, 1.069, 1.081, 1.092\n+ ]\n+ },\n+ {\n+ \"ct\": 5000,\n+ \"table\":\n+ [\n+ 1.486, 1.484, 1.468, 1.449, 1.427, 1.403, 1.399, 1.399, 1.399, 1.404, 1.413, 1.433, 1.454, 1.473, 1.482, 1.488,\n+ 1.484, 1.472, 1.454, 1.431, 1.405, 1.381, 1.365, 1.365, 1.367, 1.373, 1.392, 1.411, 1.438, 1.458, 1.476, 1.481,\n+ 1.476, 1.458, 1.433, 1.405, 1.381, 1.361, 1.339, 1.334, 1.334, 1.346, 1.362, 1.391, 1.411, 1.438, 1.462, 1.474,\n+ 1.471, 1.443, 1.417, 1.388, 1.361, 1.339, 1.321, 1.313, 1.313, 1.327, 1.346, 1.362, 1.391, 1.422, 1.453, 1.473,\n+ 1.469, 1.439, 1.408, 1.377, 1.349, 1.321, 1.312, 1.299, 1.299, 1.311, 1.327, 1.348, 1.378, 1.415, 1.446, 1.468,\n+ 1.468, 1.434, 1.402, 1.371, 1.341, 1.316, 1.299, 1.296, 1.295, 1.299, 1.314, 1.338, 1.371, 1.408, 1.441, 1.466,\n+ 1.468, 1.434, 1.401, 1.371, 1.341, 1.316, 1.301, 1.296, 1.295, 1.297, 1.314, 1.338, 1.369, 1.408, 1.441, 1.465,\n+ 1.469, 1.436, 1.401, 1.374, 1.348, 1.332, 1.315, 1.301, 1.301, 1.313, 1.324, 1.342, 1.372, 1.409, 1.442, 1.465,\n+ 1.471, 1.444, 1.413, 1.388, 1.371, 1.348, 1.332, 1.323, 1.323, 1.324, 1.342, 1.362, 1.386, 1.418, 1.449, 1.467,\n+ 1.473, 1.454, 1.431, 1.407, 1.388, 1.371, 1.359, 1.352, 1.351, 1.351, 1.362, 1.383, 1.404, 1.433, 1.462, 1.472,\n+ 1.474, 1.461, 1.447, 1.424, 1.407, 1.394, 1.385, 1.381, 1.379, 1.381, 1.383, 1.401, 1.419, 1.444, 1.466, 1.481,\n+ 1.474, 1.464, 1.455, 1.442, 1.421, 1.408, 1.403, 1.403, 1.403, 1.399, 1.402, 1.415, 1.432, 1.446, 1.467, 1.483\n+ ]\n+ },\n+ {\n+ \"ct\": 6500,\n+ \"table\":\n+ [\n+ 1.567, 1.565, 1.555, 1.541, 1.525, 1.518, 1.518, 1.518, 1.521, 1.527, 1.532, 1.541, 1.551, 1.559, 1.567, 1.569,\n+ 1.565, 1.557, 1.542, 1.527, 1.519, 1.515, 1.511, 1.516, 1.519, 1.524, 1.528, 1.533, 1.542, 1.553, 1.559, 1.562,\n+ 1.561, 1.546, 1.532, 1.521, 1.518, 1.515, 1.511, 1.516, 1.519, 1.524, 1.528, 1.529, 1.533, 1.542, 1.554, 1.559,\n+ 1.561, 1.539, 1.526, 1.524, 1.521, 1.521, 1.522, 1.524, 1.525, 1.531, 1.529, 1.529, 1.531, 1.538, 1.549, 1.558,\n+ 1.559, 1.538, 1.526, 1.525, 1.524, 1.528, 1.534, 1.536, 1.536, 1.536, 1.532, 1.529, 1.531, 1.537, 1.548, 1.556,\n+ 1.561, 1.537, 1.525, 1.524, 1.526, 1.532, 1.537, 1.539, 1.538, 1.537, 1.532, 1.529, 1.529, 1.537, 1.546, 1.556,\n+ 1.561, 1.536, 1.524, 1.522, 1.525, 1.532, 1.538, 1.538, 1.537, 1.533, 1.528, 1.526, 1.527, 1.536, 1.546, 1.555,\n+ 1.561, 1.537, 1.522, 1.521, 1.524, 1.531, 1.536, 1.537, 1.534, 1.529, 1.526, 1.522, 1.523, 1.534, 1.547, 1.555,\n+ 1.561, 1.538, 1.524, 1.522, 1.526, 1.531, 1.535, 1.535, 1.534, 1.527, 1.524, 1.522, 1.522, 1.535, 1.549, 1.556,\n+ 1.558, 1.543, 1.532, 1.526, 1.526, 1.529, 1.534, 1.535, 1.533, 1.526, 1.523, 1.522, 1.524, 1.537, 1.552, 1.557,\n+ 1.555, 1.546, 1.541, 1.528, 1.527, 1.528, 1.531, 1.533, 1.531, 1.527, 1.522, 1.522, 1.526, 1.536, 1.552, 1.561,\n+ 1.555, 1.547, 1.542, 1.538, 1.526, 1.526, 1.529, 1.531, 1.529, 1.528, 1.519, 1.519, 1.527, 1.531, 1.543, 1.561\n+ ]\n+ }\n+ ],\n+ \"calibrations_Cb\": [\n+ {\n+ \"ct\": 3000,\n+ \"table\":\n+ [\n+ 1.684, 1.688, 1.691, 1.697, 1.709, 1.722, 1.735, 1.745, 1.747, 1.745, 1.731, 1.719, 1.709, 1.705, 1.699, 1.699,\n+ 1.684, 1.689, 1.694, 1.708, 1.721, 1.735, 1.747, 1.762, 1.762, 1.758, 1.745, 1.727, 1.716, 1.707, 1.701, 1.699,\n+ 1.684, 1.691, 1.704, 1.719, 1.734, 1.755, 1.772, 1.786, 1.789, 1.788, 1.762, 1.745, 1.724, 1.709, 1.702, 1.698,\n+ 1.682, 1.694, 1.709, 1.729, 1.755, 1.773, 1.798, 1.815, 1.817, 1.808, 1.788, 1.762, 1.733, 1.714, 1.704, 1.699,\n+ 1.682, 1.693, 1.713, 1.742, 1.772, 1.798, 1.815, 1.829, 1.831, 1.821, 1.807, 1.773, 1.742, 1.716, 1.703, 1.699,\n+ 1.681, 1.693, 1.713, 1.742, 1.772, 1.799, 1.828, 1.839, 1.839, 1.828, 1.807, 1.774, 1.742, 1.715, 1.699, 1.695,\n+ 1.679, 1.691, 1.712, 1.739, 1.771, 1.798, 1.825, 1.829, 1.831, 1.818, 1.801, 1.774, 1.738, 1.712, 1.695, 1.691,\n+ 1.676, 1.685, 1.703, 1.727, 1.761, 1.784, 1.801, 1.817, 1.817, 1.801, 1.779, 1.761, 1.729, 1.706, 1.691, 1.684,\n+ 1.669, 1.678, 1.692, 1.714, 1.741, 1.764, 1.784, 1.795, 1.795, 1.779, 1.761, 1.738, 1.713, 1.696, 1.683, 1.679,\n+ 1.664, 1.671, 1.679, 1.693, 1.716, 1.741, 1.762, 1.769, 1.769, 1.753, 1.738, 1.713, 1.701, 1.687, 1.681, 1.676,\n+ 1.661, 1.664, 1.671, 1.679, 1.693, 1.714, 1.732, 1.739, 1.739, 1.729, 1.708, 1.701, 1.685, 1.679, 1.676, 1.677,\n+ 1.659, 1.661, 1.664, 1.671, 1.679, 1.693, 1.712, 1.714, 1.714, 1.708, 1.701, 1.687, 1.679, 1.672, 1.673, 1.677\n+ ]\n+ },\n+ {\n+ \"ct\": 5000,\n+ \"table\":\n+ [\n+ 1.177, 1.183, 1.187, 1.191, 1.197, 1.206, 1.213, 1.215, 1.215, 1.215, 1.211, 1.204, 1.196, 1.191, 1.183, 1.182,\n+ 1.179, 1.185, 1.191, 1.196, 1.206, 1.217, 1.224, 1.229, 1.229, 1.226, 1.221, 1.212, 1.202, 1.195, 1.188, 1.182,\n+ 1.183, 1.191, 1.196, 1.206, 1.217, 1.229, 1.239, 1.245, 1.245, 1.245, 1.233, 1.221, 1.212, 1.199, 1.193, 1.187,\n+ 1.183, 1.192, 1.201, 1.212, 1.229, 1.241, 1.252, 1.259, 1.259, 1.257, 1.245, 1.233, 1.217, 1.201, 1.194, 1.192,\n+ 1.183, 1.192, 1.202, 1.219, 1.238, 1.252, 1.261, 1.269, 1.268, 1.261, 1.257, 1.241, 1.223, 1.204, 1.194, 1.191,\n+ 1.182, 1.192, 1.202, 1.219, 1.239, 1.255, 1.266, 1.271, 1.271, 1.265, 1.258, 1.242, 1.223, 1.205, 1.192, 1.191,\n+ 1.181, 1.189, 1.199, 1.218, 1.239, 1.254, 1.262, 1.268, 1.268, 1.258, 1.253, 1.241, 1.221, 1.204, 1.191, 1.187,\n+ 1.179, 1.184, 1.193, 1.211, 1.232, 1.243, 1.254, 1.257, 1.256, 1.253, 1.242, 1.232, 1.216, 1.199, 1.187, 1.183,\n+ 1.174, 1.179, 1.187, 1.202, 1.218, 1.232, 1.243, 1.246, 1.246, 1.239, 1.232, 1.218, 1.207, 1.191, 1.183, 1.179,\n+ 1.169, 1.175, 1.181, 1.189, 1.202, 1.218, 1.229, 1.232, 1.232, 1.224, 1.218, 1.207, 1.199, 1.185, 1.181, 1.174,\n+ 1.164, 1.168, 1.175, 1.179, 1.189, 1.201, 1.209, 1.213, 1.213, 1.209, 1.201, 1.198, 1.186, 1.181, 1.174, 1.173,\n+ 1.161, 1.166, 1.171, 1.175, 1.179, 1.189, 1.197, 1.198, 1.198, 1.197, 1.196, 1.186, 1.182, 1.175, 1.173, 1.173\n+ ]\n+ },\n+ {\n+ \"ct\": 6500,\n+ \"table\":\n+ [\n+ 1.166, 1.171, 1.173, 1.178, 1.187, 1.193, 1.201, 1.205, 1.205, 1.205, 1.199, 1.191, 1.184, 1.179, 1.174, 1.171,\n+ 1.166, 1.172, 1.176, 1.184, 1.195, 1.202, 1.209, 1.216, 1.216, 1.213, 1.208, 1.201, 1.189, 1.182, 1.176, 1.171,\n+ 1.166, 1.173, 1.183, 1.195, 1.202, 1.214, 1.221, 1.228, 1.229, 1.228, 1.221, 1.209, 1.201, 1.186, 1.179, 1.174,\n+ 1.165, 1.174, 1.187, 1.201, 1.214, 1.223, 1.235, 1.241, 1.242, 1.241, 1.229, 1.221, 1.205, 1.188, 1.181, 1.177,\n+ 1.165, 1.174, 1.189, 1.207, 1.223, 1.235, 1.242, 1.253, 1.252, 1.245, 1.241, 1.228, 1.211, 1.189, 1.181, 1.178,\n+ 1.164, 1.173, 1.189, 1.207, 1.224, 1.238, 1.249, 1.255, 1.255, 1.249, 1.242, 1.228, 1.211, 1.191, 1.179, 1.176,\n+ 1.163, 1.172, 1.187, 1.207, 1.223, 1.237, 1.245, 1.253, 1.252, 1.243, 1.237, 1.228, 1.207, 1.188, 1.176, 1.173,\n+ 1.159, 1.167, 1.179, 1.199, 1.217, 1.227, 1.237, 1.241, 1.241, 1.237, 1.228, 1.217, 1.201, 1.184, 1.174, 1.169,\n+ 1.156, 1.164, 1.172, 1.189, 1.205, 1.217, 1.226, 1.229, 1.229, 1.222, 1.217, 1.204, 1.192, 1.177, 1.171, 1.166,\n+ 1.154, 1.159, 1.166, 1.177, 1.189, 1.205, 1.213, 1.216, 1.216, 1.209, 1.204, 1.192, 1.183, 1.172, 1.168, 1.162,\n+ 1.152, 1.155, 1.161, 1.166, 1.177, 1.188, 1.195, 1.198, 1.199, 1.196, 1.187, 1.183, 1.173, 1.168, 1.163, 1.162,\n+ 1.151, 1.154, 1.158, 1.162, 1.168, 1.177, 1.183, 1.184, 1.184, 1.184, 1.182, 1.172, 1.168, 1.165, 1.162, 1.161\n+ ]\n+ }\n+ ],\n+ \"luminance_lut\":\n [\n- 1.166, 1.171, 1.173, 1.178, 1.187, 1.193, 1.201, 1.205, 1.205, 1.205, 1.199, 1.191, 1.184, 1.179, 1.174, 1.171,\n- 1.166, 1.172, 1.176, 1.184, 1.195, 1.202, 1.209, 1.216, 1.216, 1.213, 1.208, 1.201, 1.189, 1.182, 1.176, 1.171,\n- 1.166, 1.173, 1.183, 1.195, 1.202, 1.214, 1.221, 1.228, 1.229, 1.228, 1.221, 1.209, 1.201, 1.186, 1.179, 1.174,\n- 1.165, 1.174, 1.187, 1.201, 1.214, 1.223, 1.235, 1.241, 1.242, 1.241, 1.229, 1.221, 1.205, 1.188, 1.181, 1.177,\n- 1.165, 1.174, 1.189, 1.207, 1.223, 1.235, 1.242, 1.253, 1.252, 1.245, 1.241, 1.228, 1.211, 1.189, 1.181, 1.178,\n- 1.164, 1.173, 1.189, 1.207, 1.224, 1.238, 1.249, 1.255, 1.255, 1.249, 1.242, 1.228, 1.211, 1.191, 1.179, 1.176,\n- 1.163, 1.172, 1.187, 1.207, 1.223, 1.237, 1.245, 1.253, 1.252, 1.243, 1.237, 1.228, 1.207, 1.188, 1.176, 1.173,\n- 1.159, 1.167, 1.179, 1.199, 1.217, 1.227, 1.237, 1.241, 1.241, 1.237, 1.228, 1.217, 1.201, 1.184, 1.174, 1.169,\n- 1.156, 1.164, 1.172, 1.189, 1.205, 1.217, 1.226, 1.229, 1.229, 1.222, 1.217, 1.204, 1.192, 1.177, 1.171, 1.166,\n- 1.154, 1.159, 1.166, 1.177, 1.189, 1.205, 1.213, 1.216, 1.216, 1.209, 1.204, 1.192, 1.183, 1.172, 1.168, 1.162,\n- 1.152, 1.155, 1.161, 1.166, 1.177, 1.188, 1.195, 1.198, 1.199, 1.196, 1.187, 1.183, 1.173, 1.168, 1.163, 1.162,\n- 1.151, 1.154, 1.158, 1.162, 1.168, 1.177, 1.183, 1.184, 1.184, 1.184, 1.182, 1.172, 1.168, 1.165, 1.162, 1.161\n- ]\n+ 2.236, 2.111, 1.912, 1.741, 1.579, 1.451, 1.379, 1.349, 1.349, 1.361, 1.411, 1.505, 1.644, 1.816, 2.034, 2.159,\n+ 2.139, 1.994, 1.796, 1.625, 1.467, 1.361, 1.285, 1.248, 1.239, 1.265, 1.321, 1.408, 1.536, 1.703, 1.903, 2.087,\n+ 2.047, 1.898, 1.694, 1.511, 1.373, 1.254, 1.186, 1.152, 1.142, 1.166, 1.226, 1.309, 1.441, 1.598, 1.799, 1.978,\n+ 1.999, 1.824, 1.615, 1.429, 1.281, 1.179, 1.113, 1.077, 1.071, 1.096, 1.153, 1.239, 1.357, 1.525, 1.726, 1.915,\n+ 1.976, 1.773, 1.563, 1.374, 1.222, 1.119, 1.064, 1.032, 1.031, 1.049, 1.099, 1.188, 1.309, 1.478, 1.681, 1.893,\n+ 1.973, 1.756, 1.542, 1.351, 1.196, 1.088, 1.028, 1.011, 1.004, 1.029, 1.077, 1.169, 1.295, 1.459, 1.663, 1.891,\n+ 1.973, 1.761, 1.541, 1.349, 1.193, 1.087, 1.031, 1.006, 1.006, 1.023, 1.075, 1.169, 1.298, 1.463, 1.667, 1.891,\n+ 1.982, 1.789, 1.568, 1.373, 1.213, 1.111, 1.051, 1.029, 1.024, 1.053, 1.106, 1.199, 1.329, 1.495, 1.692, 1.903,\n+ 2.015, 1.838, 1.621, 1.426, 1.268, 1.159, 1.101, 1.066, 1.068, 1.099, 1.166, 1.259, 1.387, 1.553, 1.751, 1.937,\n+ 2.076, 1.911, 1.692, 1.507, 1.346, 1.236, 1.169, 1.136, 1.139, 1.174, 1.242, 1.349, 1.475, 1.641, 1.833, 2.004,\n+ 2.193, 2.011, 1.798, 1.604, 1.444, 1.339, 1.265, 1.235, 1.237, 1.273, 1.351, 1.461, 1.598, 1.758, 1.956, 2.125,\n+ 2.263, 2.154, 1.916, 1.711, 1.549, 1.432, 1.372, 1.356, 1.356, 1.383, 1.455, 1.578, 1.726, 1.914, 2.119, 2.211\n+ ],\n+ \"sigma\": 0.006,\n+ \"sigma_Cb\": 0.00208\n }\n- ],\n- \"luminance_lut\":\n- [\n- 2.236, 2.111, 1.912, 1.741, 1.579, 1.451, 1.379, 1.349, 1.349, 1.361, 1.411, 1.505, 1.644, 1.816, 2.034, 2.159,\n- 2.139, 1.994, 1.796, 1.625, 1.467, 1.361, 1.285, 1.248, 1.239, 1.265, 1.321, 1.408, 1.536, 1.703, 1.903, 2.087,\n- 2.047, 1.898, 1.694, 1.511, 1.373, 1.254, 1.186, 1.152, 1.142, 1.166, 1.226, 1.309, 1.441, 1.598, 1.799, 1.978,\n- 1.999, 1.824, 1.615, 1.429, 1.281, 1.179, 1.113, 1.077, 1.071, 1.096, 1.153, 1.239, 1.357, 1.525, 1.726, 1.915,\n- 1.976, 1.773, 1.563, 1.374, 1.222, 1.119, 1.064, 1.032, 1.031, 1.049, 1.099, 1.188, 1.309, 1.478, 1.681, 1.893,\n- 1.973, 1.756, 1.542, 1.351, 1.196, 1.088, 1.028, 1.011, 1.004, 1.029, 1.077, 1.169, 1.295, 1.459, 1.663, 1.891,\n- 1.973, 1.761, 1.541, 1.349, 1.193, 1.087, 1.031, 1.006, 1.006, 1.023, 1.075, 1.169, 1.298, 1.463, 1.667, 1.891,\n- 1.982, 1.789, 1.568, 1.373, 1.213, 1.111, 1.051, 1.029, 1.024, 1.053, 1.106, 1.199, 1.329, 1.495, 1.692, 1.903,\n- 2.015, 1.838, 1.621, 1.426, 1.268, 1.159, 1.101, 1.066, 1.068, 1.099, 1.166, 1.259, 1.387, 1.553, 1.751, 1.937,\n- 2.076, 1.911, 1.692, 1.507, 1.346, 1.236, 1.169, 1.136, 1.139, 1.174, 1.242, 1.349, 1.475, 1.641, 1.833, 2.004,\n- 2.193, 2.011, 1.798, 1.604, 1.444, 1.339, 1.265, 1.235, 1.237, 1.273, 1.351, 1.461, 1.598, 1.758, 1.956, 2.125,\n- 2.263, 2.154, 1.916, 1.711, 1.549, 1.432, 1.372, 1.356, 1.356, 1.383, 1.455, 1.578, 1.726, 1.914, 2.119, 2.211\n- ],\n- \"sigma\": 0.006,\n- \"sigma_Cb\": 0.00208\n- },\n- \"rpi.contrast\":\n- {\n- \"ce_enable\": 1,\n- \"gamma_curve\":\n- [\n- 0, 0, 1024, 5040, 2048, 9338, 3072, 12356, 4096, 15312, 5120, 18051, 6144, 20790, 7168, 23193,\n- 8192, 25744, 9216, 27942, 10240, 30035, 11264, 32005, 12288, 33975, 13312, 35815, 14336, 37600, 15360, 39168,\n- 16384, 40642, 18432, 43379, 20480, 45749, 22528, 47753, 24576, 49621, 26624, 51253, 28672, 52698, 30720, 53796,\n- 32768, 54876, 36864, 57012, 40960, 58656, 45056, 59954, 49152, 61183, 53248, 62355, 57344, 63419, 61440, 64476,\n- 65535, 65535\n- ]\n- },\n- \"rpi.ccm\":\n- {\n- \"ccms\":\n- [\n- {\n- \"ct\": 2500, \"ccm\":\n- [\n- 1.70741, -0.05307, -0.65433, -0.62822, 1.68836, -0.06014, -0.04452, -1.87628, 2.92079\n- ]\n- },\n- {\n- \"ct\": 2803, \"ccm\":\n- [\n- 1.74383, -0.18731, -0.55652, -0.56491, 1.67772, -0.11281, -0.01522, -1.60635, 2.62157\n- ]\n- },\n- {\n- \"ct\": 2912, \"ccm\":\n- [\n- 1.75215, -0.22221, -0.52995, -0.54568, 1.63522, -0.08954, 0.02633, -1.56997, 2.54364\n- ]\n- },\n- {\n- \"ct\": 2914, \"ccm\":\n- [\n- 1.72423, -0.28939, -0.43484, -0.55188, 1.62925, -0.07737, 0.01959, -1.28661, 2.26702\n- ]\n- },\n- {\n- \"ct\": 3605, \"ccm\":\n- [\n- 1.80381, -0.43646, -0.36735, -0.46505, 1.56814, -0.10309, 0.00929, -1.00424, 1.99495\n- ]\n- },\n- {\n- \"ct\": 4540, \"ccm\":\n- [\n- 1.85263, -0.46545, -0.38719, -0.44136, 1.68443, -0.24307, 0.04108, -0.85599, 1.81491\n- ]\n- },\n+ },\n+ {\n+ \"rpi.contrast\":\n {\n- \"ct\": 5699, \"ccm\":\n+ \"ce_enable\": 1,\n+ \"gamma_curve\":\n [\n- 1.98595, -0.63542, -0.35054, -0.34623, 1.54146, -0.19522, 0.00411, -0.70936, 1.70525\n+ 0, 0,\n+ 1024, 5040,\n+ 2048, 9338,\n+ 3072, 12356,\n+ 4096, 15312,\n+ 5120, 18051,\n+ 6144, 20790,\n+ 7168, 23193,\n+ 8192, 25744,\n+ 9216, 27942,\n+ 10240, 30035,\n+ 11264, 32005,\n+ 12288, 33975,\n+ 13312, 35815,\n+ 14336, 37600,\n+ 15360, 39168,\n+ 16384, 40642,\n+ 18432, 43379,\n+ 20480, 45749,\n+ 22528, 47753,\n+ 24576, 49621,\n+ 26624, 51253,\n+ 28672, 52698,\n+ 30720, 53796,\n+ 32768, 54876,\n+ 36864, 57012,\n+ 40960, 58656,\n+ 45056, 59954,\n+ 49152, 61183,\n+ 53248, 62355,\n+ 57344, 63419,\n+ 61440, 64476,\n+ 65535, 65535\n ]\n- },\n+ }\n+ },\n+ {\n+ \"rpi.ccm\":\n {\n- \"ct\": 8625, \"ccm\":\n- [\n- 2.21637, -0.56663, -0.64974, -0.41133, 1.96625, -0.55492, -0.02307, -0.83529, 1.85837\n+ \"ccms\": [\n+ {\n+ \"ct\": 2500,\n+ \"ccm\":\n+ [\n+ 1.70741, -0.05307, -0.65433,\n+ -0.62822, 1.68836, -0.06014,\n+ -0.04452, -1.87628, 2.92079\n+ ]\n+ },\n+ {\n+ \"ct\": 2803,\n+ \"ccm\":\n+ [\n+ 1.74383, -0.18731, -0.55652,\n+ -0.56491, 1.67772, -0.11281,\n+ -0.01522, -1.60635, 2.62157\n+ ]\n+ },\n+ {\n+ \"ct\": 2912,\n+ \"ccm\":\n+ [\n+ 1.75215, -0.22221, -0.52995,\n+ -0.54568, 1.63522, -0.08954,\n+ 0.02633, -1.56997, 2.54364\n+ ]\n+ },\n+ {\n+ \"ct\": 2914,\n+ \"ccm\":\n+ [\n+ 1.72423, -0.28939, -0.43484,\n+ -0.55188, 1.62925, -0.07737,\n+ 0.01959, -1.28661, 2.26702\n+ ]\n+ },\n+ {\n+ \"ct\": 3605,\n+ \"ccm\":\n+ [\n+ 1.80381, -0.43646, -0.36735,\n+ -0.46505, 1.56814, -0.10309,\n+ 0.00929, -1.00424, 1.99495\n+ ]\n+ },\n+ {\n+ \"ct\": 4540,\n+ \"ccm\":\n+ [\n+ 1.85263, -0.46545, -0.38719,\n+ -0.44136, 1.68443, -0.24307,\n+ 0.04108, -0.85599, 1.81491\n+ ]\n+ },\n+ {\n+ \"ct\": 5699,\n+ \"ccm\":\n+ [\n+ 1.98595, -0.63542, -0.35054,\n+ -0.34623, 1.54146, -0.19522,\n+ 0.00411, -0.70936, 1.70525\n+ ]\n+ },\n+ {\n+ \"ct\": 8625,\n+ \"ccm\":\n+ [\n+ 2.21637, -0.56663, -0.64974,\n+ -0.41133, 1.96625, -0.55492,\n+ -0.02307, -0.83529, 1.85837\n+ ]\n+ }\n ]\n }\n- ]\n- },\n- \"rpi.sharpen\":\n- {\n-\n- }\n-}\n+ },\n+ {\n+ \"rpi.sharpen\": { }\n+ }\n+ ]\n+}\n\\ No newline at end of file\ndiff --git a/src/ipa/raspberrypi/data/ov5647_noir.json b/src/ipa/raspberrypi/data/ov5647_noir.json\nindex dad73a5e8cd9..a6c6722f12a6 100644\n--- a/src/ipa/raspberrypi/data/ov5647_noir.json\n+++ b/src/ipa/raspberrypi/data/ov5647_noir.json\n@@ -1,341 +1,403 @@\n {\n- \"rpi.black_level\":\n- {\n- \"black_level\": 1024\n- },\n- \"rpi.dpc\":\n- {\n-\n- },\n- \"rpi.lux\":\n- {\n- \"reference_shutter_speed\": 21663,\n- \"reference_gain\": 1.0,\n- \"reference_aperture\": 1.0,\n- \"reference_lux\": 987,\n- \"reference_Y\": 8961\n- },\n- \"rpi.noise\":\n- {\n- \"reference_constant\": 0,\n- \"reference_slope\": 4.25\n- },\n- \"rpi.geq\":\n- {\n- \"offset\": 401,\n- \"slope\": 0.05619\n- },\n- \"rpi.sdn\":\n- {\n-\n- },\n- \"rpi.awb\":\n- {\n- \"bayes\": 0\n- },\n- \"rpi.agc\":\n- {\n- \"metering_modes\":\n+ \"version\": 2.0,\n+ \"target\": \"bcm2835\",\n+ \"algorithms\": [\n {\n- \"centre-weighted\":\n+ \"rpi.black_level\":\n {\n- \"weights\":\n- [\n- 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0\n- ]\n- },\n- \"spot\":\n- {\n- \"weights\":\n- [\n- 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0\n- ]\n- },\n- \"matrix\":\n+ \"black_level\": 1024\n+ }\n+ },\n+ {\n+ \"rpi.dpc\": { }\n+ },\n+ {\n+ \"rpi.lux\":\n {\n- \"weights\":\n- [\n- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1\n- ]\n+ \"reference_shutter_speed\": 21663,\n+ \"reference_gain\": 1.0,\n+ \"reference_aperture\": 1.0,\n+ \"reference_lux\": 987,\n+ \"reference_Y\": 8961\n }\n },\n- \"exposure_modes\":\n {\n- \"normal\":\n+ \"rpi.noise\":\n {\n- \"shutter\":\n- [\n- 100, 10000, 30000, 60000, 66666\n- ],\n- \"gain\":\n- [\n- 1.0, 2.0, 4.0, 6.0, 8.0\n- ]\n- },\n- \"short\":\n+ \"reference_constant\": 0,\n+ \"reference_slope\": 4.25\n+ }\n+ },\n+ {\n+ \"rpi.geq\":\n {\n- \"shutter\":\n- [\n- 100, 5000, 10000, 20000, 33333\n- ],\n- \"gain\":\n- [\n- 1.0, 2.0, 4.0, 6.0, 8.0\n- ]\n- },\n- \"long\":\n+ \"offset\": 401,\n+ \"slope\": 0.05619\n+ }\n+ },\n+ {\n+ \"rpi.sdn\": { }\n+ },\n+ {\n+ \"rpi.awb\":\n {\n- \"shutter\":\n- [\n- 100, 10000, 30000, 60000, 120000\n- ],\n- \"gain\":\n- [\n- 1.0, 2.0, 4.0, 6.0, 12.0\n- ]\n+ \"bayes\": 0\n }\n },\n- \"constraint_modes\":\n {\n- \"normal\":\n- [\n- {\n- \"bound\": \"LOWER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.5, 1000, 0.5\n- ]\n- }\n- ],\n- \"highlight\":\n- [\n+ \"rpi.agc\":\n+ {\n+ \"metering_modes\":\n {\n- \"bound\": \"LOWER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.5, 1000, 0.5\n- ]\n+ \"centre-weighted\":\n+ {\n+ \"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+ },\n+ \"spot\":\n+ {\n+ \"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+ },\n+ \"matrix\":\n+ {\n+ \"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+ }\n },\n+ \"exposure_modes\":\n {\n- \"bound\": \"UPPER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.8, 1000, 0.8\n- ]\n- }\n- ],\n- \"shadows\":\n- [\n+ \"normal\":\n+ {\n+ \"shutter\": [ 100, 10000, 30000, 60000, 66666 ],\n+ \"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+ },\n+ \"short\":\n+ {\n+ \"shutter\": [ 100, 5000, 10000, 20000, 33333 ],\n+ \"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+ },\n+ \"long\":\n+ {\n+ \"shutter\": [ 100, 10000, 30000, 60000, 120000 ],\n+ \"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+ }\n+ },\n+ \"constraint_modes\":\n {\n- \"bound\": \"LOWER\", \"q_lo\": 0.0, \"q_hi\": 0.5, \"y_target\":\n- [\n- 0, 0.17, 1000, 0.17\n+ \"normal\": [\n+ {\n+ \"bound\": \"LOWER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.5,\n+ 1000, 0.5\n+ ]\n+ }\n+ ],\n+ \"highlight\": [\n+ {\n+ \"bound\": \"LOWER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.5,\n+ 1000, 0.5\n+ ]\n+ },\n+ {\n+ \"bound\": \"UPPER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.8,\n+ 1000, 0.8\n+ ]\n+ }\n+ ],\n+ \"shadows\": [\n+ {\n+ \"bound\": \"LOWER\",\n+ \"q_lo\": 0.0,\n+ \"q_hi\": 0.5,\n+ \"y_target\":\n+ [\n+ 0, 0.17,\n+ 1000, 0.17\n+ ]\n+ }\n ]\n- }\n- ]\n- },\n- \"y_target\":\n- [\n- 0, 0.16, 1000, 0.165, 10000, 0.17\n- ],\n- \"base_ev\": 1.25\n- },\n- \"rpi.alsc\":\n- {\n- \"omega\": 1.3,\n- \"n_iter\": 100,\n- \"luminance_strength\": 0.5,\n- \"calibrations_Cr\":\n- [\n- {\n- \"ct\": 3000, \"table\":\n- [\n- 1.105, 1.103, 1.093, 1.083, 1.071, 1.065, 1.065, 1.065, 1.066, 1.069, 1.072, 1.077, 1.084, 1.089, 1.093, 1.093,\n- 1.103, 1.096, 1.084, 1.072, 1.059, 1.051, 1.047, 1.047, 1.051, 1.053, 1.059, 1.067, 1.075, 1.082, 1.085, 1.086,\n- 1.096, 1.084, 1.072, 1.059, 1.051, 1.045, 1.039, 1.038, 1.039, 1.045, 1.049, 1.057, 1.063, 1.072, 1.081, 1.082,\n- 1.092, 1.075, 1.061, 1.052, 1.045, 1.039, 1.036, 1.035, 1.035, 1.039, 1.044, 1.049, 1.056, 1.063, 1.072, 1.081,\n- 1.092, 1.073, 1.058, 1.048, 1.043, 1.038, 1.035, 1.033, 1.033, 1.035, 1.039, 1.044, 1.051, 1.057, 1.069, 1.078,\n- 1.091, 1.068, 1.054, 1.045, 1.041, 1.038, 1.035, 1.032, 1.032, 1.032, 1.036, 1.041, 1.045, 1.055, 1.069, 1.078,\n- 1.091, 1.068, 1.052, 1.043, 1.041, 1.038, 1.035, 1.032, 1.031, 1.032, 1.034, 1.036, 1.043, 1.055, 1.069, 1.078,\n- 1.092, 1.068, 1.052, 1.047, 1.042, 1.041, 1.038, 1.035, 1.032, 1.032, 1.035, 1.039, 1.043, 1.055, 1.071, 1.079,\n- 1.092, 1.073, 1.057, 1.051, 1.047, 1.047, 1.044, 1.041, 1.038, 1.038, 1.039, 1.043, 1.051, 1.059, 1.076, 1.083,\n- 1.092, 1.081, 1.068, 1.058, 1.056, 1.056, 1.053, 1.052, 1.049, 1.048, 1.048, 1.051, 1.059, 1.066, 1.083, 1.085,\n- 1.091, 1.087, 1.081, 1.068, 1.065, 1.064, 1.062, 1.062, 1.061, 1.056, 1.056, 1.056, 1.064, 1.069, 1.084, 1.089,\n- 1.091, 1.089, 1.085, 1.079, 1.069, 1.068, 1.067, 1.067, 1.067, 1.063, 1.061, 1.063, 1.068, 1.069, 1.081, 1.092\n- ]\n- },\n- {\n- \"ct\": 5000, \"table\":\n- [\n- 1.486, 1.484, 1.468, 1.449, 1.427, 1.403, 1.399, 1.399, 1.399, 1.404, 1.413, 1.433, 1.454, 1.473, 1.482, 1.488,\n- 1.484, 1.472, 1.454, 1.431, 1.405, 1.381, 1.365, 1.365, 1.367, 1.373, 1.392, 1.411, 1.438, 1.458, 1.476, 1.481,\n- 1.476, 1.458, 1.433, 1.405, 1.381, 1.361, 1.339, 1.334, 1.334, 1.346, 1.362, 1.391, 1.411, 1.438, 1.462, 1.474,\n- 1.471, 1.443, 1.417, 1.388, 1.361, 1.339, 1.321, 1.313, 1.313, 1.327, 1.346, 1.362, 1.391, 1.422, 1.453, 1.473,\n- 1.469, 1.439, 1.408, 1.377, 1.349, 1.321, 1.312, 1.299, 1.299, 1.311, 1.327, 1.348, 1.378, 1.415, 1.446, 1.468,\n- 1.468, 1.434, 1.402, 1.371, 1.341, 1.316, 1.299, 1.296, 1.295, 1.299, 1.314, 1.338, 1.371, 1.408, 1.441, 1.466,\n- 1.468, 1.434, 1.401, 1.371, 1.341, 1.316, 1.301, 1.296, 1.295, 1.297, 1.314, 1.338, 1.369, 1.408, 1.441, 1.465,\n- 1.469, 1.436, 1.401, 1.374, 1.348, 1.332, 1.315, 1.301, 1.301, 1.313, 1.324, 1.342, 1.372, 1.409, 1.442, 1.465,\n- 1.471, 1.444, 1.413, 1.388, 1.371, 1.348, 1.332, 1.323, 1.323, 1.324, 1.342, 1.362, 1.386, 1.418, 1.449, 1.467,\n- 1.473, 1.454, 1.431, 1.407, 1.388, 1.371, 1.359, 1.352, 1.351, 1.351, 1.362, 1.383, 1.404, 1.433, 1.462, 1.472,\n- 1.474, 1.461, 1.447, 1.424, 1.407, 1.394, 1.385, 1.381, 1.379, 1.381, 1.383, 1.401, 1.419, 1.444, 1.466, 1.481,\n- 1.474, 1.464, 1.455, 1.442, 1.421, 1.408, 1.403, 1.403, 1.403, 1.399, 1.402, 1.415, 1.432, 1.446, 1.467, 1.483\n- ]\n- },\n- {\n- \"ct\": 6500, \"table\":\n+ },\n+ \"y_target\":\n [\n- 1.567, 1.565, 1.555, 1.541, 1.525, 1.518, 1.518, 1.518, 1.521, 1.527, 1.532, 1.541, 1.551, 1.559, 1.567, 1.569,\n- 1.565, 1.557, 1.542, 1.527, 1.519, 1.515, 1.511, 1.516, 1.519, 1.524, 1.528, 1.533, 1.542, 1.553, 1.559, 1.562,\n- 1.561, 1.546, 1.532, 1.521, 1.518, 1.515, 1.511, 1.516, 1.519, 1.524, 1.528, 1.529, 1.533, 1.542, 1.554, 1.559,\n- 1.561, 1.539, 1.526, 1.524, 1.521, 1.521, 1.522, 1.524, 1.525, 1.531, 1.529, 1.529, 1.531, 1.538, 1.549, 1.558,\n- 1.559, 1.538, 1.526, 1.525, 1.524, 1.528, 1.534, 1.536, 1.536, 1.536, 1.532, 1.529, 1.531, 1.537, 1.548, 1.556,\n- 1.561, 1.537, 1.525, 1.524, 1.526, 1.532, 1.537, 1.539, 1.538, 1.537, 1.532, 1.529, 1.529, 1.537, 1.546, 1.556,\n- 1.561, 1.536, 1.524, 1.522, 1.525, 1.532, 1.538, 1.538, 1.537, 1.533, 1.528, 1.526, 1.527, 1.536, 1.546, 1.555,\n- 1.561, 1.537, 1.522, 1.521, 1.524, 1.531, 1.536, 1.537, 1.534, 1.529, 1.526, 1.522, 1.523, 1.534, 1.547, 1.555,\n- 1.561, 1.538, 1.524, 1.522, 1.526, 1.531, 1.535, 1.535, 1.534, 1.527, 1.524, 1.522, 1.522, 1.535, 1.549, 1.556,\n- 1.558, 1.543, 1.532, 1.526, 1.526, 1.529, 1.534, 1.535, 1.533, 1.526, 1.523, 1.522, 1.524, 1.537, 1.552, 1.557,\n- 1.555, 1.546, 1.541, 1.528, 1.527, 1.528, 1.531, 1.533, 1.531, 1.527, 1.522, 1.522, 1.526, 1.536, 1.552, 1.561,\n- 1.555, 1.547, 1.542, 1.538, 1.526, 1.526, 1.529, 1.531, 1.529, 1.528, 1.519, 1.519, 1.527, 1.531, 1.543, 1.561\n- ]\n+ 0, 0.16,\n+ 1000, 0.165,\n+ 10000, 0.17\n+ ],\n+ \"base_ev\": 1.25\n }\n- ],\n- \"calibrations_Cb\":\n- [\n- {\n- \"ct\": 3000, \"table\":\n- [\n- 1.684, 1.688, 1.691, 1.697, 1.709, 1.722, 1.735, 1.745, 1.747, 1.745, 1.731, 1.719, 1.709, 1.705, 1.699, 1.699,\n- 1.684, 1.689, 1.694, 1.708, 1.721, 1.735, 1.747, 1.762, 1.762, 1.758, 1.745, 1.727, 1.716, 1.707, 1.701, 1.699,\n- 1.684, 1.691, 1.704, 1.719, 1.734, 1.755, 1.772, 1.786, 1.789, 1.788, 1.762, 1.745, 1.724, 1.709, 1.702, 1.698,\n- 1.682, 1.694, 1.709, 1.729, 1.755, 1.773, 1.798, 1.815, 1.817, 1.808, 1.788, 1.762, 1.733, 1.714, 1.704, 1.699,\n- 1.682, 1.693, 1.713, 1.742, 1.772, 1.798, 1.815, 1.829, 1.831, 1.821, 1.807, 1.773, 1.742, 1.716, 1.703, 1.699,\n- 1.681, 1.693, 1.713, 1.742, 1.772, 1.799, 1.828, 1.839, 1.839, 1.828, 1.807, 1.774, 1.742, 1.715, 1.699, 1.695,\n- 1.679, 1.691, 1.712, 1.739, 1.771, 1.798, 1.825, 1.829, 1.831, 1.818, 1.801, 1.774, 1.738, 1.712, 1.695, 1.691,\n- 1.676, 1.685, 1.703, 1.727, 1.761, 1.784, 1.801, 1.817, 1.817, 1.801, 1.779, 1.761, 1.729, 1.706, 1.691, 1.684,\n- 1.669, 1.678, 1.692, 1.714, 1.741, 1.764, 1.784, 1.795, 1.795, 1.779, 1.761, 1.738, 1.713, 1.696, 1.683, 1.679,\n- 1.664, 1.671, 1.679, 1.693, 1.716, 1.741, 1.762, 1.769, 1.769, 1.753, 1.738, 1.713, 1.701, 1.687, 1.681, 1.676,\n- 1.661, 1.664, 1.671, 1.679, 1.693, 1.714, 1.732, 1.739, 1.739, 1.729, 1.708, 1.701, 1.685, 1.679, 1.676, 1.677,\n- 1.659, 1.661, 1.664, 1.671, 1.679, 1.693, 1.712, 1.714, 1.714, 1.708, 1.701, 1.687, 1.679, 1.672, 1.673, 1.677\n- ]\n- },\n- {\n- \"ct\": 5000, \"table\":\n- [\n- 1.177, 1.183, 1.187, 1.191, 1.197, 1.206, 1.213, 1.215, 1.215, 1.215, 1.211, 1.204, 1.196, 1.191, 1.183, 1.182,\n- 1.179, 1.185, 1.191, 1.196, 1.206, 1.217, 1.224, 1.229, 1.229, 1.226, 1.221, 1.212, 1.202, 1.195, 1.188, 1.182,\n- 1.183, 1.191, 1.196, 1.206, 1.217, 1.229, 1.239, 1.245, 1.245, 1.245, 1.233, 1.221, 1.212, 1.199, 1.193, 1.187,\n- 1.183, 1.192, 1.201, 1.212, 1.229, 1.241, 1.252, 1.259, 1.259, 1.257, 1.245, 1.233, 1.217, 1.201, 1.194, 1.192,\n- 1.183, 1.192, 1.202, 1.219, 1.238, 1.252, 1.261, 1.269, 1.268, 1.261, 1.257, 1.241, 1.223, 1.204, 1.194, 1.191,\n- 1.182, 1.192, 1.202, 1.219, 1.239, 1.255, 1.266, 1.271, 1.271, 1.265, 1.258, 1.242, 1.223, 1.205, 1.192, 1.191,\n- 1.181, 1.189, 1.199, 1.218, 1.239, 1.254, 1.262, 1.268, 1.268, 1.258, 1.253, 1.241, 1.221, 1.204, 1.191, 1.187,\n- 1.179, 1.184, 1.193, 1.211, 1.232, 1.243, 1.254, 1.257, 1.256, 1.253, 1.242, 1.232, 1.216, 1.199, 1.187, 1.183,\n- 1.174, 1.179, 1.187, 1.202, 1.218, 1.232, 1.243, 1.246, 1.246, 1.239, 1.232, 1.218, 1.207, 1.191, 1.183, 1.179,\n- 1.169, 1.175, 1.181, 1.189, 1.202, 1.218, 1.229, 1.232, 1.232, 1.224, 1.218, 1.207, 1.199, 1.185, 1.181, 1.174,\n- 1.164, 1.168, 1.175, 1.179, 1.189, 1.201, 1.209, 1.213, 1.213, 1.209, 1.201, 1.198, 1.186, 1.181, 1.174, 1.173,\n- 1.161, 1.166, 1.171, 1.175, 1.179, 1.189, 1.197, 1.198, 1.198, 1.197, 1.196, 1.186, 1.182, 1.175, 1.173, 1.173\n- ]\n- },\n+ },\n+ {\n+ \"rpi.alsc\":\n {\n- \"ct\": 6500, \"table\":\n+ \"omega\": 1.3,\n+ \"n_iter\": 100,\n+ \"luminance_strength\": 0.5,\n+ \"calibrations_Cr\": [\n+ {\n+ \"ct\": 3000,\n+ \"table\":\n+ [\n+ 1.105, 1.103, 1.093, 1.083, 1.071, 1.065, 1.065, 1.065, 1.066, 1.069, 1.072, 1.077, 1.084, 1.089, 1.093, 1.093,\n+ 1.103, 1.096, 1.084, 1.072, 1.059, 1.051, 1.047, 1.047, 1.051, 1.053, 1.059, 1.067, 1.075, 1.082, 1.085, 1.086,\n+ 1.096, 1.084, 1.072, 1.059, 1.051, 1.045, 1.039, 1.038, 1.039, 1.045, 1.049, 1.057, 1.063, 1.072, 1.081, 1.082,\n+ 1.092, 1.075, 1.061, 1.052, 1.045, 1.039, 1.036, 1.035, 1.035, 1.039, 1.044, 1.049, 1.056, 1.063, 1.072, 1.081,\n+ 1.092, 1.073, 1.058, 1.048, 1.043, 1.038, 1.035, 1.033, 1.033, 1.035, 1.039, 1.044, 1.051, 1.057, 1.069, 1.078,\n+ 1.091, 1.068, 1.054, 1.045, 1.041, 1.038, 1.035, 1.032, 1.032, 1.032, 1.036, 1.041, 1.045, 1.055, 1.069, 1.078,\n+ 1.091, 1.068, 1.052, 1.043, 1.041, 1.038, 1.035, 1.032, 1.031, 1.032, 1.034, 1.036, 1.043, 1.055, 1.069, 1.078,\n+ 1.092, 1.068, 1.052, 1.047, 1.042, 1.041, 1.038, 1.035, 1.032, 1.032, 1.035, 1.039, 1.043, 1.055, 1.071, 1.079,\n+ 1.092, 1.073, 1.057, 1.051, 1.047, 1.047, 1.044, 1.041, 1.038, 1.038, 1.039, 1.043, 1.051, 1.059, 1.076, 1.083,\n+ 1.092, 1.081, 1.068, 1.058, 1.056, 1.056, 1.053, 1.052, 1.049, 1.048, 1.048, 1.051, 1.059, 1.066, 1.083, 1.085,\n+ 1.091, 1.087, 1.081, 1.068, 1.065, 1.064, 1.062, 1.062, 1.061, 1.056, 1.056, 1.056, 1.064, 1.069, 1.084, 1.089,\n+ 1.091, 1.089, 1.085, 1.079, 1.069, 1.068, 1.067, 1.067, 1.067, 1.063, 1.061, 1.063, 1.068, 1.069, 1.081, 1.092\n+ ]\n+ },\n+ {\n+ \"ct\": 5000,\n+ \"table\":\n+ [\n+ 1.486, 1.484, 1.468, 1.449, 1.427, 1.403, 1.399, 1.399, 1.399, 1.404, 1.413, 1.433, 1.454, 1.473, 1.482, 1.488,\n+ 1.484, 1.472, 1.454, 1.431, 1.405, 1.381, 1.365, 1.365, 1.367, 1.373, 1.392, 1.411, 1.438, 1.458, 1.476, 1.481,\n+ 1.476, 1.458, 1.433, 1.405, 1.381, 1.361, 1.339, 1.334, 1.334, 1.346, 1.362, 1.391, 1.411, 1.438, 1.462, 1.474,\n+ 1.471, 1.443, 1.417, 1.388, 1.361, 1.339, 1.321, 1.313, 1.313, 1.327, 1.346, 1.362, 1.391, 1.422, 1.453, 1.473,\n+ 1.469, 1.439, 1.408, 1.377, 1.349, 1.321, 1.312, 1.299, 1.299, 1.311, 1.327, 1.348, 1.378, 1.415, 1.446, 1.468,\n+ 1.468, 1.434, 1.402, 1.371, 1.341, 1.316, 1.299, 1.296, 1.295, 1.299, 1.314, 1.338, 1.371, 1.408, 1.441, 1.466,\n+ 1.468, 1.434, 1.401, 1.371, 1.341, 1.316, 1.301, 1.296, 1.295, 1.297, 1.314, 1.338, 1.369, 1.408, 1.441, 1.465,\n+ 1.469, 1.436, 1.401, 1.374, 1.348, 1.332, 1.315, 1.301, 1.301, 1.313, 1.324, 1.342, 1.372, 1.409, 1.442, 1.465,\n+ 1.471, 1.444, 1.413, 1.388, 1.371, 1.348, 1.332, 1.323, 1.323, 1.324, 1.342, 1.362, 1.386, 1.418, 1.449, 1.467,\n+ 1.473, 1.454, 1.431, 1.407, 1.388, 1.371, 1.359, 1.352, 1.351, 1.351, 1.362, 1.383, 1.404, 1.433, 1.462, 1.472,\n+ 1.474, 1.461, 1.447, 1.424, 1.407, 1.394, 1.385, 1.381, 1.379, 1.381, 1.383, 1.401, 1.419, 1.444, 1.466, 1.481,\n+ 1.474, 1.464, 1.455, 1.442, 1.421, 1.408, 1.403, 1.403, 1.403, 1.399, 1.402, 1.415, 1.432, 1.446, 1.467, 1.483\n+ ]\n+ },\n+ {\n+ \"ct\": 6500,\n+ \"table\":\n+ [\n+ 1.567, 1.565, 1.555, 1.541, 1.525, 1.518, 1.518, 1.518, 1.521, 1.527, 1.532, 1.541, 1.551, 1.559, 1.567, 1.569,\n+ 1.565, 1.557, 1.542, 1.527, 1.519, 1.515, 1.511, 1.516, 1.519, 1.524, 1.528, 1.533, 1.542, 1.553, 1.559, 1.562,\n+ 1.561, 1.546, 1.532, 1.521, 1.518, 1.515, 1.511, 1.516, 1.519, 1.524, 1.528, 1.529, 1.533, 1.542, 1.554, 1.559,\n+ 1.561, 1.539, 1.526, 1.524, 1.521, 1.521, 1.522, 1.524, 1.525, 1.531, 1.529, 1.529, 1.531, 1.538, 1.549, 1.558,\n+ 1.559, 1.538, 1.526, 1.525, 1.524, 1.528, 1.534, 1.536, 1.536, 1.536, 1.532, 1.529, 1.531, 1.537, 1.548, 1.556,\n+ 1.561, 1.537, 1.525, 1.524, 1.526, 1.532, 1.537, 1.539, 1.538, 1.537, 1.532, 1.529, 1.529, 1.537, 1.546, 1.556,\n+ 1.561, 1.536, 1.524, 1.522, 1.525, 1.532, 1.538, 1.538, 1.537, 1.533, 1.528, 1.526, 1.527, 1.536, 1.546, 1.555,\n+ 1.561, 1.537, 1.522, 1.521, 1.524, 1.531, 1.536, 1.537, 1.534, 1.529, 1.526, 1.522, 1.523, 1.534, 1.547, 1.555,\n+ 1.561, 1.538, 1.524, 1.522, 1.526, 1.531, 1.535, 1.535, 1.534, 1.527, 1.524, 1.522, 1.522, 1.535, 1.549, 1.556,\n+ 1.558, 1.543, 1.532, 1.526, 1.526, 1.529, 1.534, 1.535, 1.533, 1.526, 1.523, 1.522, 1.524, 1.537, 1.552, 1.557,\n+ 1.555, 1.546, 1.541, 1.528, 1.527, 1.528, 1.531, 1.533, 1.531, 1.527, 1.522, 1.522, 1.526, 1.536, 1.552, 1.561,\n+ 1.555, 1.547, 1.542, 1.538, 1.526, 1.526, 1.529, 1.531, 1.529, 1.528, 1.519, 1.519, 1.527, 1.531, 1.543, 1.561\n+ ]\n+ }\n+ ],\n+ \"calibrations_Cb\": [\n+ {\n+ \"ct\": 3000,\n+ \"table\":\n+ [\n+ 1.684, 1.688, 1.691, 1.697, 1.709, 1.722, 1.735, 1.745, 1.747, 1.745, 1.731, 1.719, 1.709, 1.705, 1.699, 1.699,\n+ 1.684, 1.689, 1.694, 1.708, 1.721, 1.735, 1.747, 1.762, 1.762, 1.758, 1.745, 1.727, 1.716, 1.707, 1.701, 1.699,\n+ 1.684, 1.691, 1.704, 1.719, 1.734, 1.755, 1.772, 1.786, 1.789, 1.788, 1.762, 1.745, 1.724, 1.709, 1.702, 1.698,\n+ 1.682, 1.694, 1.709, 1.729, 1.755, 1.773, 1.798, 1.815, 1.817, 1.808, 1.788, 1.762, 1.733, 1.714, 1.704, 1.699,\n+ 1.682, 1.693, 1.713, 1.742, 1.772, 1.798, 1.815, 1.829, 1.831, 1.821, 1.807, 1.773, 1.742, 1.716, 1.703, 1.699,\n+ 1.681, 1.693, 1.713, 1.742, 1.772, 1.799, 1.828, 1.839, 1.839, 1.828, 1.807, 1.774, 1.742, 1.715, 1.699, 1.695,\n+ 1.679, 1.691, 1.712, 1.739, 1.771, 1.798, 1.825, 1.829, 1.831, 1.818, 1.801, 1.774, 1.738, 1.712, 1.695, 1.691,\n+ 1.676, 1.685, 1.703, 1.727, 1.761, 1.784, 1.801, 1.817, 1.817, 1.801, 1.779, 1.761, 1.729, 1.706, 1.691, 1.684,\n+ 1.669, 1.678, 1.692, 1.714, 1.741, 1.764, 1.784, 1.795, 1.795, 1.779, 1.761, 1.738, 1.713, 1.696, 1.683, 1.679,\n+ 1.664, 1.671, 1.679, 1.693, 1.716, 1.741, 1.762, 1.769, 1.769, 1.753, 1.738, 1.713, 1.701, 1.687, 1.681, 1.676,\n+ 1.661, 1.664, 1.671, 1.679, 1.693, 1.714, 1.732, 1.739, 1.739, 1.729, 1.708, 1.701, 1.685, 1.679, 1.676, 1.677,\n+ 1.659, 1.661, 1.664, 1.671, 1.679, 1.693, 1.712, 1.714, 1.714, 1.708, 1.701, 1.687, 1.679, 1.672, 1.673, 1.677\n+ ]\n+ },\n+ {\n+ \"ct\": 5000,\n+ \"table\":\n+ [\n+ 1.177, 1.183, 1.187, 1.191, 1.197, 1.206, 1.213, 1.215, 1.215, 1.215, 1.211, 1.204, 1.196, 1.191, 1.183, 1.182,\n+ 1.179, 1.185, 1.191, 1.196, 1.206, 1.217, 1.224, 1.229, 1.229, 1.226, 1.221, 1.212, 1.202, 1.195, 1.188, 1.182,\n+ 1.183, 1.191, 1.196, 1.206, 1.217, 1.229, 1.239, 1.245, 1.245, 1.245, 1.233, 1.221, 1.212, 1.199, 1.193, 1.187,\n+ 1.183, 1.192, 1.201, 1.212, 1.229, 1.241, 1.252, 1.259, 1.259, 1.257, 1.245, 1.233, 1.217, 1.201, 1.194, 1.192,\n+ 1.183, 1.192, 1.202, 1.219, 1.238, 1.252, 1.261, 1.269, 1.268, 1.261, 1.257, 1.241, 1.223, 1.204, 1.194, 1.191,\n+ 1.182, 1.192, 1.202, 1.219, 1.239, 1.255, 1.266, 1.271, 1.271, 1.265, 1.258, 1.242, 1.223, 1.205, 1.192, 1.191,\n+ 1.181, 1.189, 1.199, 1.218, 1.239, 1.254, 1.262, 1.268, 1.268, 1.258, 1.253, 1.241, 1.221, 1.204, 1.191, 1.187,\n+ 1.179, 1.184, 1.193, 1.211, 1.232, 1.243, 1.254, 1.257, 1.256, 1.253, 1.242, 1.232, 1.216, 1.199, 1.187, 1.183,\n+ 1.174, 1.179, 1.187, 1.202, 1.218, 1.232, 1.243, 1.246, 1.246, 1.239, 1.232, 1.218, 1.207, 1.191, 1.183, 1.179,\n+ 1.169, 1.175, 1.181, 1.189, 1.202, 1.218, 1.229, 1.232, 1.232, 1.224, 1.218, 1.207, 1.199, 1.185, 1.181, 1.174,\n+ 1.164, 1.168, 1.175, 1.179, 1.189, 1.201, 1.209, 1.213, 1.213, 1.209, 1.201, 1.198, 1.186, 1.181, 1.174, 1.173,\n+ 1.161, 1.166, 1.171, 1.175, 1.179, 1.189, 1.197, 1.198, 1.198, 1.197, 1.196, 1.186, 1.182, 1.175, 1.173, 1.173\n+ ]\n+ },\n+ {\n+ \"ct\": 6500,\n+ \"table\":\n+ [\n+ 1.166, 1.171, 1.173, 1.178, 1.187, 1.193, 1.201, 1.205, 1.205, 1.205, 1.199, 1.191, 1.184, 1.179, 1.174, 1.171,\n+ 1.166, 1.172, 1.176, 1.184, 1.195, 1.202, 1.209, 1.216, 1.216, 1.213, 1.208, 1.201, 1.189, 1.182, 1.176, 1.171,\n+ 1.166, 1.173, 1.183, 1.195, 1.202, 1.214, 1.221, 1.228, 1.229, 1.228, 1.221, 1.209, 1.201, 1.186, 1.179, 1.174,\n+ 1.165, 1.174, 1.187, 1.201, 1.214, 1.223, 1.235, 1.241, 1.242, 1.241, 1.229, 1.221, 1.205, 1.188, 1.181, 1.177,\n+ 1.165, 1.174, 1.189, 1.207, 1.223, 1.235, 1.242, 1.253, 1.252, 1.245, 1.241, 1.228, 1.211, 1.189, 1.181, 1.178,\n+ 1.164, 1.173, 1.189, 1.207, 1.224, 1.238, 1.249, 1.255, 1.255, 1.249, 1.242, 1.228, 1.211, 1.191, 1.179, 1.176,\n+ 1.163, 1.172, 1.187, 1.207, 1.223, 1.237, 1.245, 1.253, 1.252, 1.243, 1.237, 1.228, 1.207, 1.188, 1.176, 1.173,\n+ 1.159, 1.167, 1.179, 1.199, 1.217, 1.227, 1.237, 1.241, 1.241, 1.237, 1.228, 1.217, 1.201, 1.184, 1.174, 1.169,\n+ 1.156, 1.164, 1.172, 1.189, 1.205, 1.217, 1.226, 1.229, 1.229, 1.222, 1.217, 1.204, 1.192, 1.177, 1.171, 1.166,\n+ 1.154, 1.159, 1.166, 1.177, 1.189, 1.205, 1.213, 1.216, 1.216, 1.209, 1.204, 1.192, 1.183, 1.172, 1.168, 1.162,\n+ 1.152, 1.155, 1.161, 1.166, 1.177, 1.188, 1.195, 1.198, 1.199, 1.196, 1.187, 1.183, 1.173, 1.168, 1.163, 1.162,\n+ 1.151, 1.154, 1.158, 1.162, 1.168, 1.177, 1.183, 1.184, 1.184, 1.184, 1.182, 1.172, 1.168, 1.165, 1.162, 1.161\n+ ]\n+ }\n+ ],\n+ \"luminance_lut\":\n [\n- 1.166, 1.171, 1.173, 1.178, 1.187, 1.193, 1.201, 1.205, 1.205, 1.205, 1.199, 1.191, 1.184, 1.179, 1.174, 1.171,\n- 1.166, 1.172, 1.176, 1.184, 1.195, 1.202, 1.209, 1.216, 1.216, 1.213, 1.208, 1.201, 1.189, 1.182, 1.176, 1.171,\n- 1.166, 1.173, 1.183, 1.195, 1.202, 1.214, 1.221, 1.228, 1.229, 1.228, 1.221, 1.209, 1.201, 1.186, 1.179, 1.174,\n- 1.165, 1.174, 1.187, 1.201, 1.214, 1.223, 1.235, 1.241, 1.242, 1.241, 1.229, 1.221, 1.205, 1.188, 1.181, 1.177,\n- 1.165, 1.174, 1.189, 1.207, 1.223, 1.235, 1.242, 1.253, 1.252, 1.245, 1.241, 1.228, 1.211, 1.189, 1.181, 1.178,\n- 1.164, 1.173, 1.189, 1.207, 1.224, 1.238, 1.249, 1.255, 1.255, 1.249, 1.242, 1.228, 1.211, 1.191, 1.179, 1.176,\n- 1.163, 1.172, 1.187, 1.207, 1.223, 1.237, 1.245, 1.253, 1.252, 1.243, 1.237, 1.228, 1.207, 1.188, 1.176, 1.173,\n- 1.159, 1.167, 1.179, 1.199, 1.217, 1.227, 1.237, 1.241, 1.241, 1.237, 1.228, 1.217, 1.201, 1.184, 1.174, 1.169,\n- 1.156, 1.164, 1.172, 1.189, 1.205, 1.217, 1.226, 1.229, 1.229, 1.222, 1.217, 1.204, 1.192, 1.177, 1.171, 1.166,\n- 1.154, 1.159, 1.166, 1.177, 1.189, 1.205, 1.213, 1.216, 1.216, 1.209, 1.204, 1.192, 1.183, 1.172, 1.168, 1.162,\n- 1.152, 1.155, 1.161, 1.166, 1.177, 1.188, 1.195, 1.198, 1.199, 1.196, 1.187, 1.183, 1.173, 1.168, 1.163, 1.162,\n- 1.151, 1.154, 1.158, 1.162, 1.168, 1.177, 1.183, 1.184, 1.184, 1.184, 1.182, 1.172, 1.168, 1.165, 1.162, 1.161\n- ]\n+ 2.236, 2.111, 1.912, 1.741, 1.579, 1.451, 1.379, 1.349, 1.349, 1.361, 1.411, 1.505, 1.644, 1.816, 2.034, 2.159,\n+ 2.139, 1.994, 1.796, 1.625, 1.467, 1.361, 1.285, 1.248, 1.239, 1.265, 1.321, 1.408, 1.536, 1.703, 1.903, 2.087,\n+ 2.047, 1.898, 1.694, 1.511, 1.373, 1.254, 1.186, 1.152, 1.142, 1.166, 1.226, 1.309, 1.441, 1.598, 1.799, 1.978,\n+ 1.999, 1.824, 1.615, 1.429, 1.281, 1.179, 1.113, 1.077, 1.071, 1.096, 1.153, 1.239, 1.357, 1.525, 1.726, 1.915,\n+ 1.976, 1.773, 1.563, 1.374, 1.222, 1.119, 1.064, 1.032, 1.031, 1.049, 1.099, 1.188, 1.309, 1.478, 1.681, 1.893,\n+ 1.973, 1.756, 1.542, 1.351, 1.196, 1.088, 1.028, 1.011, 1.004, 1.029, 1.077, 1.169, 1.295, 1.459, 1.663, 1.891,\n+ 1.973, 1.761, 1.541, 1.349, 1.193, 1.087, 1.031, 1.006, 1.006, 1.023, 1.075, 1.169, 1.298, 1.463, 1.667, 1.891,\n+ 1.982, 1.789, 1.568, 1.373, 1.213, 1.111, 1.051, 1.029, 1.024, 1.053, 1.106, 1.199, 1.329, 1.495, 1.692, 1.903,\n+ 2.015, 1.838, 1.621, 1.426, 1.268, 1.159, 1.101, 1.066, 1.068, 1.099, 1.166, 1.259, 1.387, 1.553, 1.751, 1.937,\n+ 2.076, 1.911, 1.692, 1.507, 1.346, 1.236, 1.169, 1.136, 1.139, 1.174, 1.242, 1.349, 1.475, 1.641, 1.833, 2.004,\n+ 2.193, 2.011, 1.798, 1.604, 1.444, 1.339, 1.265, 1.235, 1.237, 1.273, 1.351, 1.461, 1.598, 1.758, 1.956, 2.125,\n+ 2.263, 2.154, 1.916, 1.711, 1.549, 1.432, 1.372, 1.356, 1.356, 1.383, 1.455, 1.578, 1.726, 1.914, 2.119, 2.211\n+ ],\n+ \"sigma\": 0.006,\n+ \"sigma_Cb\": 0.00208\n }\n- ],\n- \"luminance_lut\":\n- [\n- 2.236, 2.111, 1.912, 1.741, 1.579, 1.451, 1.379, 1.349, 1.349, 1.361, 1.411, 1.505, 1.644, 1.816, 2.034, 2.159,\n- 2.139, 1.994, 1.796, 1.625, 1.467, 1.361, 1.285, 1.248, 1.239, 1.265, 1.321, 1.408, 1.536, 1.703, 1.903, 2.087,\n- 2.047, 1.898, 1.694, 1.511, 1.373, 1.254, 1.186, 1.152, 1.142, 1.166, 1.226, 1.309, 1.441, 1.598, 1.799, 1.978,\n- 1.999, 1.824, 1.615, 1.429, 1.281, 1.179, 1.113, 1.077, 1.071, 1.096, 1.153, 1.239, 1.357, 1.525, 1.726, 1.915,\n- 1.976, 1.773, 1.563, 1.374, 1.222, 1.119, 1.064, 1.032, 1.031, 1.049, 1.099, 1.188, 1.309, 1.478, 1.681, 1.893,\n- 1.973, 1.756, 1.542, 1.351, 1.196, 1.088, 1.028, 1.011, 1.004, 1.029, 1.077, 1.169, 1.295, 1.459, 1.663, 1.891,\n- 1.973, 1.761, 1.541, 1.349, 1.193, 1.087, 1.031, 1.006, 1.006, 1.023, 1.075, 1.169, 1.298, 1.463, 1.667, 1.891,\n- 1.982, 1.789, 1.568, 1.373, 1.213, 1.111, 1.051, 1.029, 1.024, 1.053, 1.106, 1.199, 1.329, 1.495, 1.692, 1.903,\n- 2.015, 1.838, 1.621, 1.426, 1.268, 1.159, 1.101, 1.066, 1.068, 1.099, 1.166, 1.259, 1.387, 1.553, 1.751, 1.937,\n- 2.076, 1.911, 1.692, 1.507, 1.346, 1.236, 1.169, 1.136, 1.139, 1.174, 1.242, 1.349, 1.475, 1.641, 1.833, 2.004,\n- 2.193, 2.011, 1.798, 1.604, 1.444, 1.339, 1.265, 1.235, 1.237, 1.273, 1.351, 1.461, 1.598, 1.758, 1.956, 2.125,\n- 2.263, 2.154, 1.916, 1.711, 1.549, 1.432, 1.372, 1.356, 1.356, 1.383, 1.455, 1.578, 1.726, 1.914, 2.119, 2.211\n- ],\n- \"sigma\": 0.006,\n- \"sigma_Cb\": 0.00208\n- },\n- \"rpi.contrast\":\n- {\n- \"ce_enable\": 1,\n- \"gamma_curve\":\n- [\n- 0, 0, 1024, 5040, 2048, 9338, 3072, 12356, 4096, 15312, 5120, 18051, 6144, 20790, 7168, 23193,\n- 8192, 25744, 9216, 27942, 10240, 30035, 11264, 32005, 12288, 33975, 13312, 35815, 14336, 37600, 15360, 39168,\n- 16384, 40642, 18432, 43379, 20480, 45749, 22528, 47753, 24576, 49621, 26624, 51253, 28672, 52698, 30720, 53796,\n- 32768, 54876, 36864, 57012, 40960, 58656, 45056, 59954, 49152, 61183, 53248, 62355, 57344, 63419, 61440, 64476,\n- 65535, 65535\n- ]\n- },\n- \"rpi.ccm\":\n- {\n- \"ccms\":\n- [\n- {\n- \"ct\": 2500, \"ccm\":\n- [\n- 1.70741, -0.05307, -0.65433, -0.62822, 1.68836, -0.06014, -0.04452, -1.87628, 2.92079\n- ]\n- },\n- {\n- \"ct\": 2803, \"ccm\":\n- [\n- 1.74383, -0.18731, -0.55652, -0.56491, 1.67772, -0.11281, -0.01522, -1.60635, 2.62157\n- ]\n- },\n- {\n- \"ct\": 2912, \"ccm\":\n- [\n- 1.75215, -0.22221, -0.52995, -0.54568, 1.63522, -0.08954, 0.02633, -1.56997, 2.54364\n- ]\n- },\n- {\n- \"ct\": 2914, \"ccm\":\n- [\n- 1.72423, -0.28939, -0.43484, -0.55188, 1.62925, -0.07737, 0.01959, -1.28661, 2.26702\n- ]\n- },\n- {\n- \"ct\": 3605, \"ccm\":\n- [\n- 1.80381, -0.43646, -0.36735, -0.46505, 1.56814, -0.10309, 0.00929, -1.00424, 1.99495\n- ]\n- },\n- {\n- \"ct\": 4540, \"ccm\":\n- [\n- 1.85263, -0.46545, -0.38719, -0.44136, 1.68443, -0.24307, 0.04108, -0.85599, 1.81491\n- ]\n- },\n+ },\n+ {\n+ \"rpi.contrast\":\n {\n- \"ct\": 5699, \"ccm\":\n+ \"ce_enable\": 1,\n+ \"gamma_curve\":\n [\n- 1.98595, -0.63542, -0.35054, -0.34623, 1.54146, -0.19522, 0.00411, -0.70936, 1.70525\n+ 0, 0,\n+ 1024, 5040,\n+ 2048, 9338,\n+ 3072, 12356,\n+ 4096, 15312,\n+ 5120, 18051,\n+ 6144, 20790,\n+ 7168, 23193,\n+ 8192, 25744,\n+ 9216, 27942,\n+ 10240, 30035,\n+ 11264, 32005,\n+ 12288, 33975,\n+ 13312, 35815,\n+ 14336, 37600,\n+ 15360, 39168,\n+ 16384, 40642,\n+ 18432, 43379,\n+ 20480, 45749,\n+ 22528, 47753,\n+ 24576, 49621,\n+ 26624, 51253,\n+ 28672, 52698,\n+ 30720, 53796,\n+ 32768, 54876,\n+ 36864, 57012,\n+ 40960, 58656,\n+ 45056, 59954,\n+ 49152, 61183,\n+ 53248, 62355,\n+ 57344, 63419,\n+ 61440, 64476,\n+ 65535, 65535\n ]\n- },\n+ }\n+ },\n+ {\n+ \"rpi.ccm\":\n {\n- \"ct\": 8625, \"ccm\":\n- [\n- 2.21637, -0.56663, -0.64974, -0.41133, 1.96625, -0.55492, -0.02307, -0.83529, 1.85837\n+ \"ccms\": [\n+ {\n+ \"ct\": 2500,\n+ \"ccm\":\n+ [\n+ 1.70741, -0.05307, -0.65433,\n+ -0.62822, 1.68836, -0.06014,\n+ -0.04452, -1.87628, 2.92079\n+ ]\n+ },\n+ {\n+ \"ct\": 2803,\n+ \"ccm\":\n+ [\n+ 1.74383, -0.18731, -0.55652,\n+ -0.56491, 1.67772, -0.11281,\n+ -0.01522, -1.60635, 2.62157\n+ ]\n+ },\n+ {\n+ \"ct\": 2912,\n+ \"ccm\":\n+ [\n+ 1.75215, -0.22221, -0.52995,\n+ -0.54568, 1.63522, -0.08954,\n+ 0.02633, -1.56997, 2.54364\n+ ]\n+ },\n+ {\n+ \"ct\": 2914,\n+ \"ccm\":\n+ [\n+ 1.72423, -0.28939, -0.43484,\n+ -0.55188, 1.62925, -0.07737,\n+ 0.01959, -1.28661, 2.26702\n+ ]\n+ },\n+ {\n+ \"ct\": 3605,\n+ \"ccm\":\n+ [\n+ 1.80381, -0.43646, -0.36735,\n+ -0.46505, 1.56814, -0.10309,\n+ 0.00929, -1.00424, 1.99495\n+ ]\n+ },\n+ {\n+ \"ct\": 4540,\n+ \"ccm\":\n+ [\n+ 1.85263, -0.46545, -0.38719,\n+ -0.44136, 1.68443, -0.24307,\n+ 0.04108, -0.85599, 1.81491\n+ ]\n+ },\n+ {\n+ \"ct\": 5699,\n+ \"ccm\":\n+ [\n+ 1.98595, -0.63542, -0.35054,\n+ -0.34623, 1.54146, -0.19522,\n+ 0.00411, -0.70936, 1.70525\n+ ]\n+ },\n+ {\n+ \"ct\": 8625,\n+ \"ccm\":\n+ [\n+ 2.21637, -0.56663, -0.64974,\n+ -0.41133, 1.96625, -0.55492,\n+ -0.02307, -0.83529, 1.85837\n+ ]\n+ }\n ]\n }\n- ]\n- },\n- \"rpi.sharpen\":\n- {\n-\n- }\n-}\n+ },\n+ {\n+ \"rpi.sharpen\": { }\n+ }\n+ ]\n+}\n\\ No newline at end of file\ndiff --git a/src/ipa/raspberrypi/data/ov9281.json b/src/ipa/raspberrypi/data/ov9281.json\nindex 2319448b1593..37944c63ad92 100644\n--- a/src/ipa/raspberrypi/data/ov9281.json\n+++ b/src/ipa/raspberrypi/data/ov9281.json\n@@ -1,92 +1,123 @@\n {\n- \"rpi.black_level\":\n- {\n- \"black_level\": 4096\n- },\n- \"rpi.lux\":\n- {\n- \"reference_shutter_speed\": 2000,\n- \"reference_gain\": 1.0,\n- \"reference_aperture\": 1.0,\n- \"reference_lux\": 800,\n- \"reference_Y\": 20000\n- },\n- \"rpi.noise\":\n- {\n- \"reference_constant\": 0,\n- \"reference_slope\": 2.5\n- },\n- \"rpi.sdn\":\n- {\n- },\n- \"rpi.agc\":\n- {\n- \"metering_modes\":\n+ \"version\": 2.0,\n+ \"target\": \"bcm2835\",\n+ \"algorithms\": [\n {\n- \"centre-weighted\": {\n- \"weights\": [4, 4, 4, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0]\n+ \"rpi.black_level\":\n+ {\n+ \"black_level\": 4096\n+ }\n+ },\n+ {\n+ \"rpi.lux\":\n+ {\n+ \"reference_shutter_speed\": 2000,\n+ \"reference_gain\": 1.0,\n+ \"reference_aperture\": 1.0,\n+ \"reference_lux\": 800,\n+ \"reference_Y\": 20000\n+ }\n+ },\n+ {\n+ \"rpi.noise\":\n+ {\n+ \"reference_constant\": 0,\n+ \"reference_slope\": 2.5\n }\n },\n- \"exposure_modes\":\n {\n- \"normal\":\n+ \"rpi.sdn\": { }\n+ },\n+ {\n+ \"rpi.agc\":\n {\n- \"shutter\": [ 100, 15000, 30000, 60000, 120000 ],\n- \"gain\": [ 1.0, 2.0, 3.0, 4.0, 8.0 ]\n+ \"metering_modes\":\n+ {\n+ \"centre-weighted\":\n+ {\n+ \"weights\": [ 4, 4, 4, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+ }\n+ },\n+ \"exposure_modes\":\n+ {\n+ \"normal\":\n+ {\n+ \"shutter\": [ 100, 15000, 30000, 60000, 120000 ],\n+ \"gain\": [ 1.0, 2.0, 3.0, 4.0, 8.0 ]\n+ }\n+ },\n+ \"constraint_modes\":\n+ {\n+ \"normal\": [\n+ {\n+ \"bound\": \"LOWER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.4,\n+ 1000, 0.4\n+ ]\n+ }\n+ ]\n+ },\n+ \"y_target\":\n+ [\n+ 0, 0.16,\n+ 1000, 0.165,\n+ 10000, 0.17\n+ ]\n }\n },\n- \"constraint_modes\":\n {\n- \"normal\":\n- [\n- { \"bound\": \"LOWER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\": [ 0, 0.4, 1000, 0.4 ] }\n- ]\n+ \"rpi.alsc\":\n+ {\n+ \"n_iter\": 0,\n+ \"luminance_strength\": 1.0,\n+ \"corner_strength\": 1.5\n+ }\n },\n- \"y_target\": [ 0, 0.16, 1000, 0.165, 10000, 0.17 ]\n- },\n- \"rpi.alsc\":\n- {\n- \"n_iter\": 0,\n- \"luminance_strength\": 1.0,\n- \"corner_strength\": 1.5\n- },\n- \"rpi.contrast\":\n- {\n- \"ce_enable\": 0,\n- \"gamma_curve\": [\n- 0, 0,\n- 1024, 5040,\n- 2048, 9338,\n- 3072, 12356,\n- 4096, 15312,\n- 5120, 18051,\n- 6144, 20790,\n- 7168, 23193,\n- 8192, 25744,\n- 9216, 27942,\n- 10240, 30035,\n- 11264, 32005,\n- 12288, 33975,\n- 13312, 35815,\n- 14336, 37600,\n- 15360, 39168,\n- 16384, 40642,\n- 18432, 43379,\n- 20480, 45749,\n- 22528, 47753,\n- 24576, 49621,\n- 26624, 51253,\n- 28672, 52698,\n- 30720, 53796,\n- 32768, 54876,\n- 36864, 57012,\n- 40960, 58656,\n- 45056, 59954,\n- 49152, 61183,\n- 53248, 62355,\n- 57344, 63419,\n- 61440, 64476,\n- 65535, 65535\n- ]\n- }\n-}\n+ {\n+ \"rpi.contrast\":\n+ {\n+ \"ce_enable\": 0,\n+ \"gamma_curve\":\n+ [\n+ 0, 0,\n+ 1024, 5040,\n+ 2048, 9338,\n+ 3072, 12356,\n+ 4096, 15312,\n+ 5120, 18051,\n+ 6144, 20790,\n+ 7168, 23193,\n+ 8192, 25744,\n+ 9216, 27942,\n+ 10240, 30035,\n+ 11264, 32005,\n+ 12288, 33975,\n+ 13312, 35815,\n+ 14336, 37600,\n+ 15360, 39168,\n+ 16384, 40642,\n+ 18432, 43379,\n+ 20480, 45749,\n+ 22528, 47753,\n+ 24576, 49621,\n+ 26624, 51253,\n+ 28672, 52698,\n+ 30720, 53796,\n+ 32768, 54876,\n+ 36864, 57012,\n+ 40960, 58656,\n+ 45056, 59954,\n+ 49152, 61183,\n+ 53248, 62355,\n+ 57344, 63419,\n+ 61440, 64476,\n+ 65535, 65535\n+ ]\n+ }\n+ }\n+ ]\n+}\n\\ No newline at end of file\ndiff --git a/src/ipa/raspberrypi/data/se327m12.json b/src/ipa/raspberrypi/data/se327m12.json\nindex 5b1ac2ce3bf8..ee69caea50c0 100644\n--- a/src/ipa/raspberrypi/data/se327m12.json\n+++ b/src/ipa/raspberrypi/data/se327m12.json\n@@ -1,341 +1,418 @@\n {\n- \"rpi.black_level\":\n- {\n- \"black_level\": 3840\n- },\n- \"rpi.dpc\":\n- {\n- },\n- \"rpi.lux\":\n- {\n- \"reference_shutter_speed\": 6873,\n- \"reference_gain\": 1.0,\n- \"reference_aperture\": 1.0,\n- \"reference_lux\": 800,\n- \"reference_Y\": 12293\n- },\n- \"rpi.noise\":\n- {\n- \"reference_constant\": 0,\n- \"reference_slope\": 1.986\n- },\n- \"rpi.geq\":\n- {\n- \"offset\": 207,\n- \"slope\": 0.00539\n- },\n- \"rpi.sdn\":\n- {\n- },\n- \"rpi.awb\":\n- {\n- \"priors\":\n- [\n- {\n- \"lux\": 0, \"prior\":\n- [\n- 2000, 1.0, 3000, 0.0, 13000, 0.0\n- ]\n- },\n- {\n- \"lux\": 800, \"prior\":\n- [\n- 2000, 0.0, 6000, 2.0, 13000, 2.0\n- ]\n- },\n+ \"version\": 2.0,\n+ \"target\": \"bcm2835\",\n+ \"algorithms\": [\n+ {\n+ \"rpi.black_level\":\n {\n- \"lux\": 1500, \"prior\":\n- [\n- 2000, 0.0, 4000, 1.0, 6000, 6.0, 6500, 7.0, 7000, 1.0, 13000, 1.0\n- ]\n+ \"black_level\": 3840\n }\n- ],\n- \"modes\":\n+ },\n {\n- \"auto\":\n- {\n- \"lo\": 2500,\n- \"hi\": 8000\n- },\n- \"incandescent\":\n- {\n- \"lo\": 2500,\n- \"hi\": 3000\n- },\n- \"tungsten\":\n- {\n- \"lo\": 3000,\n- \"hi\": 3500\n- },\n- \"fluorescent\":\n- {\n- \"lo\": 4000,\n- \"hi\": 4700\n- },\n- \"indoor\":\n- {\n- \"lo\": 3000,\n- \"hi\": 5000\n- },\n- \"daylight\":\n- {\n- \"lo\": 5500,\n- \"hi\": 6500\n- },\n- \"cloudy\":\n+ \"rpi.dpc\": { }\n+ },\n+ {\n+ \"rpi.lux\":\n {\n- \"lo\": 7000,\n- \"hi\": 8600\n+ \"reference_shutter_speed\": 6873,\n+ \"reference_gain\": 1.0,\n+ \"reference_aperture\": 1.0,\n+ \"reference_lux\": 800,\n+ \"reference_Y\": 12293\n }\n },\n- \"bayes\": 1,\n- \"ct_curve\":\n- [\n- 2900.0, 0.9217, 0.3657, 3600.0, 0.7876, 0.4651, 4600.0, 0.6807, 0.5684, 5800.0, 0.5937, 0.6724, 8100.0, 0.5447, 0.7403\n- ],\n- \"sensitivity_r\": 1.0,\n- \"sensitivity_b\": 1.0,\n- \"transverse_pos\": 0.0162,\n- \"transverse_neg\": 0.0204\n- },\n- \"rpi.agc\":\n- {\n- \"metering_modes\":\n {\n- \"centre-weighted\":\n+ \"rpi.noise\":\n {\n- \"weights\":\n- [\n- 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0\n- ]\n- },\n- \"spot\":\n- {\n- \"weights\":\n- [\n- 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0\n- ]\n- },\n- \"matrix\":\n+ \"reference_constant\": 0,\n+ \"reference_slope\": 1.986\n+ }\n+ },\n+ {\n+ \"rpi.geq\":\n {\n- \"weights\":\n- [\n- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1\n- ]\n+ \"offset\": 207,\n+ \"slope\": 0.00539\n }\n },\n- \"exposure_modes\":\n {\n- \"normal\":\n+ \"rpi.sdn\": { }\n+ },\n+ {\n+ \"rpi.awb\":\n {\n- \"shutter\":\n- [\n- 100, 10000, 30000, 60000, 120000\n+ \"priors\": [\n+ {\n+ \"lux\": 0,\n+ \"prior\":\n+ [\n+ 2000, 1.0,\n+ 3000, 0.0,\n+ 13000, 0.0\n+ ]\n+ },\n+ {\n+ \"lux\": 800,\n+ \"prior\":\n+ [\n+ 2000, 0.0,\n+ 6000, 2.0,\n+ 13000, 2.0\n+ ]\n+ },\n+ {\n+ \"lux\": 1500,\n+ \"prior\":\n+ [\n+ 2000, 0.0,\n+ 4000, 1.0,\n+ 6000, 6.0,\n+ 6500, 7.0,\n+ 7000, 1.0,\n+ 13000, 1.0\n+ ]\n+ }\n ],\n- \"gain\":\n- [\n- 1.0, 2.0, 4.0, 6.0, 8.0\n- ]\n- },\n- \"short\":\n- {\n- \"shutter\":\n+ \"modes\":\n+ {\n+ \"auto\":\n+ {\n+ \"lo\": 2500,\n+ \"hi\": 8000\n+ },\n+ \"incandescent\":\n+ {\n+ \"lo\": 2500,\n+ \"hi\": 3000\n+ },\n+ \"tungsten\":\n+ {\n+ \"lo\": 3000,\n+ \"hi\": 3500\n+ },\n+ \"fluorescent\":\n+ {\n+ \"lo\": 4000,\n+ \"hi\": 4700\n+ },\n+ \"indoor\":\n+ {\n+ \"lo\": 3000,\n+ \"hi\": 5000\n+ },\n+ \"daylight\":\n+ {\n+ \"lo\": 5500,\n+ \"hi\": 6500\n+ },\n+ \"cloudy\":\n+ {\n+ \"lo\": 7000,\n+ \"hi\": 8600\n+ }\n+ },\n+ \"bayes\": 1,\n+ \"ct_curve\":\n [\n- 100, 5000, 10000, 20000, 120000\n+ 2900.0, 0.9217, 0.3657,\n+ 3600.0, 0.7876, 0.4651,\n+ 4600.0, 0.6807, 0.5684,\n+ 5800.0, 0.5937, 0.6724,\n+ 8100.0, 0.5447, 0.7403\n ],\n- \"gain\":\n- [\n- 1.0, 2.0, 4.0, 6.0, 8.0\n- ]\n+ \"sensitivity_r\": 1.0,\n+ \"sensitivity_b\": 1.0,\n+ \"transverse_pos\": 0.0162,\n+ \"transverse_neg\": 0.0204\n }\n },\n- \"constraint_modes\":\n {\n- \"normal\":\n- [\n+ \"rpi.agc\":\n+ {\n+ \"metering_modes\":\n {\n- \"bound\": \"LOWER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.5, 1000, 0.5\n- ]\n- }\n- ],\n- \"highlight\":\n- [\n+ \"centre-weighted\":\n+ {\n+ \"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+ },\n+ \"spot\":\n+ {\n+ \"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+ },\n+ \"matrix\":\n+ {\n+ \"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+ }\n+ },\n+ \"exposure_modes\":\n {\n- \"bound\": \"LOWER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.5, 1000, 0.5\n- ]\n+ \"normal\":\n+ {\n+ \"shutter\": [ 100, 10000, 30000, 60000, 120000 ],\n+ \"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+ },\n+ \"short\":\n+ {\n+ \"shutter\": [ 100, 5000, 10000, 20000, 120000 ],\n+ \"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+ }\n },\n+ \"constraint_modes\":\n {\n- \"bound\": \"UPPER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\":\n- [\n- 0, 0.8, 1000, 0.8\n+ \"normal\": [\n+ {\n+ \"bound\": \"LOWER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.5,\n+ 1000, 0.5\n+ ]\n+ }\n+ ],\n+ \"highlight\": [\n+ {\n+ \"bound\": \"LOWER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.5,\n+ 1000, 0.5\n+ ]\n+ },\n+ {\n+ \"bound\": \"UPPER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.8,\n+ 1000, 0.8\n+ ]\n+ }\n ]\n- }\n- ]\n- },\n- \"y_target\":\n- [\n- 0, 0.16, 1000, 0.165, 10000, 0.17\n- ]\n- },\n- \"rpi.alsc\":\n- {\n- \"omega\": 1.3,\n- \"n_iter\": 100,\n- \"luminance_strength\": 0.5,\n- \"calibrations_Cr\":\n- [\n- {\n- \"ct\": 4000, \"table\":\n- [\n- 1.481, 1.471, 1.449, 1.429, 1.416, 1.404, 1.394, 1.389, 1.389, 1.389, 1.392, 1.397, 1.404, 1.416, 1.429, 1.437,\n- 1.472, 1.456, 1.436, 1.418, 1.405, 1.394, 1.389, 1.384, 1.382, 1.382, 1.386, 1.388, 1.398, 1.407, 1.422, 1.429,\n- 1.465, 1.443, 1.426, 1.411, 1.397, 1.389, 1.383, 1.377, 1.377, 1.377, 1.379, 1.384, 1.388, 1.398, 1.411, 1.422,\n- 1.462, 1.441, 1.423, 1.409, 1.395, 1.385, 1.379, 1.376, 1.374, 1.374, 1.375, 1.379, 1.384, 1.394, 1.407, 1.418,\n- 1.461, 1.439, 1.421, 1.407, 1.394, 1.385, 1.381, 1.376, 1.373, 1.373, 1.373, 1.376, 1.381, 1.389, 1.403, 1.415,\n- 1.461, 1.439, 1.419, 1.404, 1.392, 1.384, 1.379, 1.376, 1.373, 1.372, 1.374, 1.375, 1.379, 1.389, 1.401, 1.413,\n- 1.461, 1.438, 1.419, 1.402, 1.389, 1.383, 1.377, 1.375, 1.373, 1.372, 1.372, 1.375, 1.381, 1.388, 1.401, 1.414,\n- 1.462, 1.438, 1.419, 1.403, 1.391, 1.381, 1.377, 1.374, 1.373, 1.373, 1.374, 1.376, 1.381, 1.389, 1.401, 1.414,\n- 1.462, 1.441, 1.423, 1.405, 1.392, 1.383, 1.377, 1.374, 1.373, 1.372, 1.373, 1.376, 1.382, 1.391, 1.402, 1.414,\n- 1.465, 1.444, 1.424, 1.407, 1.393, 1.382, 1.378, 1.373, 1.369, 1.369, 1.372, 1.375, 1.381, 1.389, 1.402, 1.417,\n- 1.469, 1.449, 1.427, 1.413, 1.396, 1.384, 1.381, 1.375, 1.371, 1.371, 1.373, 1.377, 1.385, 1.393, 1.407, 1.422,\n- 1.474, 1.456, 1.436, 1.419, 1.407, 1.391, 1.383, 1.379, 1.377, 1.377, 1.378, 1.381, 1.391, 1.404, 1.422, 1.426\n- ]\n- },\n- {\n- \"ct\": 5000, \"table\":\n+ },\n+ \"y_target\":\n [\n- 1.742, 1.721, 1.689, 1.661, 1.639, 1.623, 1.613, 1.609, 1.607, 1.606, 1.609, 1.617, 1.626, 1.641, 1.665, 1.681,\n- 1.728, 1.703, 1.672, 1.645, 1.631, 1.614, 1.602, 1.599, 1.596, 1.597, 1.601, 1.608, 1.618, 1.631, 1.653, 1.671,\n- 1.713, 1.691, 1.658, 1.635, 1.618, 1.606, 1.595, 1.591, 1.588, 1.588, 1.591, 1.601, 1.608, 1.624, 1.641, 1.658,\n- 1.707, 1.681, 1.651, 1.627, 1.613, 1.599, 1.591, 1.585, 1.583, 1.584, 1.587, 1.591, 1.601, 1.615, 1.633, 1.655,\n- 1.699, 1.672, 1.644, 1.622, 1.606, 1.593, 1.586, 1.581, 1.579, 1.581, 1.583, 1.587, 1.597, 1.611, 1.631, 1.652,\n- 1.697, 1.665, 1.637, 1.617, 1.601, 1.589, 1.584, 1.579, 1.577, 1.578, 1.581, 1.585, 1.597, 1.607, 1.627, 1.652,\n- 1.697, 1.662, 1.634, 1.613, 1.599, 1.591, 1.583, 1.578, 1.576, 1.576, 1.579, 1.586, 1.597, 1.607, 1.628, 1.653,\n- 1.697, 1.662, 1.633, 1.613, 1.598, 1.589, 1.582, 1.578, 1.576, 1.577, 1.582, 1.589, 1.598, 1.611, 1.635, 1.655,\n- 1.701, 1.666, 1.636, 1.616, 1.602, 1.589, 1.583, 1.578, 1.577, 1.581, 1.583, 1.591, 1.601, 1.617, 1.639, 1.659,\n- 1.708, 1.671, 1.641, 1.618, 1.603, 1.591, 1.584, 1.581, 1.578, 1.581, 1.585, 1.594, 1.604, 1.622, 1.646, 1.666,\n- 1.714, 1.681, 1.648, 1.622, 1.608, 1.599, 1.591, 1.584, 1.583, 1.584, 1.589, 1.599, 1.614, 1.629, 1.653, 1.673,\n- 1.719, 1.691, 1.659, 1.631, 1.618, 1.606, 1.596, 1.591, 1.591, 1.593, 1.599, 1.608, 1.623, 1.642, 1.665, 1.681\n+ 0, 0.16,\n+ 1000, 0.165,\n+ 10000, 0.17\n ]\n }\n- ],\n- \"calibrations_Cb\":\n- [\n- {\n- \"ct\": 4000, \"table\":\n- [\n- 2.253, 2.267, 2.289, 2.317, 2.342, 2.359, 2.373, 2.381, 2.381, 2.378, 2.368, 2.361, 2.344, 2.337, 2.314, 2.301,\n- 2.262, 2.284, 2.314, 2.335, 2.352, 2.371, 2.383, 2.391, 2.393, 2.391, 2.381, 2.368, 2.361, 2.342, 2.322, 2.308,\n- 2.277, 2.303, 2.321, 2.346, 2.364, 2.381, 2.391, 2.395, 2.397, 2.397, 2.395, 2.381, 2.367, 2.354, 2.332, 2.321,\n- 2.277, 2.304, 2.327, 2.349, 2.369, 2.388, 2.393, 2.396, 2.396, 2.398, 2.396, 2.391, 2.376, 2.359, 2.339, 2.328,\n- 2.279, 2.311, 2.327, 2.354, 2.377, 2.389, 2.393, 2.397, 2.397, 2.398, 2.395, 2.393, 2.382, 2.363, 2.344, 2.332,\n- 2.282, 2.311, 2.329, 2.354, 2.377, 2.386, 2.396, 2.396, 2.395, 2.396, 2.397, 2.394, 2.383, 2.367, 2.346, 2.333,\n- 2.283, 2.314, 2.333, 2.353, 2.375, 2.389, 2.394, 2.395, 2.395, 2.395, 2.396, 2.394, 2.386, 2.368, 2.354, 2.336,\n- 2.287, 2.309, 2.331, 2.352, 2.373, 2.386, 2.394, 2.395, 2.395, 2.396, 2.396, 2.394, 2.384, 2.371, 2.354, 2.339,\n- 2.289, 2.307, 2.326, 2.347, 2.369, 2.385, 2.392, 2.397, 2.398, 2.398, 2.397, 2.392, 2.383, 2.367, 2.352, 2.337,\n- 2.286, 2.303, 2.322, 2.342, 2.361, 2.379, 2.389, 2.394, 2.397, 2.398, 2.396, 2.389, 2.381, 2.366, 2.346, 2.332,\n- 2.284, 2.291, 2.312, 2.329, 2.351, 2.372, 2.381, 2.389, 2.393, 2.394, 2.389, 2.385, 2.374, 2.362, 2.338, 2.325,\n- 2.283, 2.288, 2.305, 2.319, 2.339, 2.365, 2.374, 2.381, 2.384, 2.386, 2.385, 2.379, 2.368, 2.342, 2.325, 2.318\n- ]\n- },\n+ },\n+ {\n+ \"rpi.alsc\":\n {\n- \"ct\": 5000, \"table\":\n+ \"omega\": 1.3,\n+ \"n_iter\": 100,\n+ \"luminance_strength\": 0.5,\n+ \"calibrations_Cr\": [\n+ {\n+ \"ct\": 4000,\n+ \"table\":\n+ [\n+ 1.481, 1.471, 1.449, 1.429, 1.416, 1.404, 1.394, 1.389, 1.389, 1.389, 1.392, 1.397, 1.404, 1.416, 1.429, 1.437,\n+ 1.472, 1.456, 1.436, 1.418, 1.405, 1.394, 1.389, 1.384, 1.382, 1.382, 1.386, 1.388, 1.398, 1.407, 1.422, 1.429,\n+ 1.465, 1.443, 1.426, 1.411, 1.397, 1.389, 1.383, 1.377, 1.377, 1.377, 1.379, 1.384, 1.388, 1.398, 1.411, 1.422,\n+ 1.462, 1.441, 1.423, 1.409, 1.395, 1.385, 1.379, 1.376, 1.374, 1.374, 1.375, 1.379, 1.384, 1.394, 1.407, 1.418,\n+ 1.461, 1.439, 1.421, 1.407, 1.394, 1.385, 1.381, 1.376, 1.373, 1.373, 1.373, 1.376, 1.381, 1.389, 1.403, 1.415,\n+ 1.461, 1.439, 1.419, 1.404, 1.392, 1.384, 1.379, 1.376, 1.373, 1.372, 1.374, 1.375, 1.379, 1.389, 1.401, 1.413,\n+ 1.461, 1.438, 1.419, 1.402, 1.389, 1.383, 1.377, 1.375, 1.373, 1.372, 1.372, 1.375, 1.381, 1.388, 1.401, 1.414,\n+ 1.462, 1.438, 1.419, 1.403, 1.391, 1.381, 1.377, 1.374, 1.373, 1.373, 1.374, 1.376, 1.381, 1.389, 1.401, 1.414,\n+ 1.462, 1.441, 1.423, 1.405, 1.392, 1.383, 1.377, 1.374, 1.373, 1.372, 1.373, 1.376, 1.382, 1.391, 1.402, 1.414,\n+ 1.465, 1.444, 1.424, 1.407, 1.393, 1.382, 1.378, 1.373, 1.369, 1.369, 1.372, 1.375, 1.381, 1.389, 1.402, 1.417,\n+ 1.469, 1.449, 1.427, 1.413, 1.396, 1.384, 1.381, 1.375, 1.371, 1.371, 1.373, 1.377, 1.385, 1.393, 1.407, 1.422,\n+ 1.474, 1.456, 1.436, 1.419, 1.407, 1.391, 1.383, 1.379, 1.377, 1.377, 1.378, 1.381, 1.391, 1.404, 1.422, 1.426\n+ ]\n+ },\n+ {\n+ \"ct\": 5000,\n+ \"table\":\n+ [\n+ 1.742, 1.721, 1.689, 1.661, 1.639, 1.623, 1.613, 1.609, 1.607, 1.606, 1.609, 1.617, 1.626, 1.641, 1.665, 1.681,\n+ 1.728, 1.703, 1.672, 1.645, 1.631, 1.614, 1.602, 1.599, 1.596, 1.597, 1.601, 1.608, 1.618, 1.631, 1.653, 1.671,\n+ 1.713, 1.691, 1.658, 1.635, 1.618, 1.606, 1.595, 1.591, 1.588, 1.588, 1.591, 1.601, 1.608, 1.624, 1.641, 1.658,\n+ 1.707, 1.681, 1.651, 1.627, 1.613, 1.599, 1.591, 1.585, 1.583, 1.584, 1.587, 1.591, 1.601, 1.615, 1.633, 1.655,\n+ 1.699, 1.672, 1.644, 1.622, 1.606, 1.593, 1.586, 1.581, 1.579, 1.581, 1.583, 1.587, 1.597, 1.611, 1.631, 1.652,\n+ 1.697, 1.665, 1.637, 1.617, 1.601, 1.589, 1.584, 1.579, 1.577, 1.578, 1.581, 1.585, 1.597, 1.607, 1.627, 1.652,\n+ 1.697, 1.662, 1.634, 1.613, 1.599, 1.591, 1.583, 1.578, 1.576, 1.576, 1.579, 1.586, 1.597, 1.607, 1.628, 1.653,\n+ 1.697, 1.662, 1.633, 1.613, 1.598, 1.589, 1.582, 1.578, 1.576, 1.577, 1.582, 1.589, 1.598, 1.611, 1.635, 1.655,\n+ 1.701, 1.666, 1.636, 1.616, 1.602, 1.589, 1.583, 1.578, 1.577, 1.581, 1.583, 1.591, 1.601, 1.617, 1.639, 1.659,\n+ 1.708, 1.671, 1.641, 1.618, 1.603, 1.591, 1.584, 1.581, 1.578, 1.581, 1.585, 1.594, 1.604, 1.622, 1.646, 1.666,\n+ 1.714, 1.681, 1.648, 1.622, 1.608, 1.599, 1.591, 1.584, 1.583, 1.584, 1.589, 1.599, 1.614, 1.629, 1.653, 1.673,\n+ 1.719, 1.691, 1.659, 1.631, 1.618, 1.606, 1.596, 1.591, 1.591, 1.593, 1.599, 1.608, 1.623, 1.642, 1.665, 1.681\n+ ]\n+ }\n+ ],\n+ \"calibrations_Cb\": [\n+ {\n+ \"ct\": 4000,\n+ \"table\":\n+ [\n+ 2.253, 2.267, 2.289, 2.317, 2.342, 2.359, 2.373, 2.381, 2.381, 2.378, 2.368, 2.361, 2.344, 2.337, 2.314, 2.301,\n+ 2.262, 2.284, 2.314, 2.335, 2.352, 2.371, 2.383, 2.391, 2.393, 2.391, 2.381, 2.368, 2.361, 2.342, 2.322, 2.308,\n+ 2.277, 2.303, 2.321, 2.346, 2.364, 2.381, 2.391, 2.395, 2.397, 2.397, 2.395, 2.381, 2.367, 2.354, 2.332, 2.321,\n+ 2.277, 2.304, 2.327, 2.349, 2.369, 2.388, 2.393, 2.396, 2.396, 2.398, 2.396, 2.391, 2.376, 2.359, 2.339, 2.328,\n+ 2.279, 2.311, 2.327, 2.354, 2.377, 2.389, 2.393, 2.397, 2.397, 2.398, 2.395, 2.393, 2.382, 2.363, 2.344, 2.332,\n+ 2.282, 2.311, 2.329, 2.354, 2.377, 2.386, 2.396, 2.396, 2.395, 2.396, 2.397, 2.394, 2.383, 2.367, 2.346, 2.333,\n+ 2.283, 2.314, 2.333, 2.353, 2.375, 2.389, 2.394, 2.395, 2.395, 2.395, 2.396, 2.394, 2.386, 2.368, 2.354, 2.336,\n+ 2.287, 2.309, 2.331, 2.352, 2.373, 2.386, 2.394, 2.395, 2.395, 2.396, 2.396, 2.394, 2.384, 2.371, 2.354, 2.339,\n+ 2.289, 2.307, 2.326, 2.347, 2.369, 2.385, 2.392, 2.397, 2.398, 2.398, 2.397, 2.392, 2.383, 2.367, 2.352, 2.337,\n+ 2.286, 2.303, 2.322, 2.342, 2.361, 2.379, 2.389, 2.394, 2.397, 2.398, 2.396, 2.389, 2.381, 2.366, 2.346, 2.332,\n+ 2.284, 2.291, 2.312, 2.329, 2.351, 2.372, 2.381, 2.389, 2.393, 2.394, 2.389, 2.385, 2.374, 2.362, 2.338, 2.325,\n+ 2.283, 2.288, 2.305, 2.319, 2.339, 2.365, 2.374, 2.381, 2.384, 2.386, 2.385, 2.379, 2.368, 2.342, 2.325, 2.318\n+ ]\n+ },\n+ {\n+ \"ct\": 5000,\n+ \"table\":\n+ [\n+ 1.897, 1.919, 1.941, 1.969, 1.989, 2.003, 2.014, 2.019, 2.019, 2.017, 2.014, 2.008, 1.999, 1.988, 1.968, 1.944,\n+ 1.914, 1.932, 1.957, 1.982, 1.998, 2.014, 2.023, 2.029, 2.031, 2.029, 2.022, 2.014, 2.006, 1.995, 1.976, 1.955,\n+ 1.925, 1.951, 1.974, 1.996, 2.013, 2.027, 2.035, 2.039, 2.039, 2.038, 2.035, 2.026, 2.015, 2.002, 1.984, 1.963,\n+ 1.932, 1.958, 1.986, 2.007, 2.024, 2.034, 2.041, 2.041, 2.045, 2.045, 2.042, 2.033, 2.023, 2.009, 1.995, 1.971,\n+ 1.942, 1.964, 1.994, 2.012, 2.029, 2.038, 2.043, 2.046, 2.047, 2.046, 2.045, 2.039, 2.029, 2.014, 1.997, 1.977,\n+ 1.946, 1.974, 1.999, 2.015, 2.031, 2.041, 2.046, 2.047, 2.048, 2.047, 2.044, 2.041, 2.031, 2.019, 1.999, 1.978,\n+ 1.948, 1.975, 2.002, 2.018, 2.031, 2.041, 2.046, 2.047, 2.048, 2.048, 2.045, 2.041, 2.029, 2.019, 1.998, 1.978,\n+ 1.948, 1.973, 2.002, 2.018, 2.029, 2.042, 2.045, 2.048, 2.048, 2.048, 2.044, 2.037, 2.027, 2.014, 1.993, 1.978,\n+ 1.945, 1.969, 1.998, 2.015, 2.028, 2.037, 2.045, 2.046, 2.047, 2.044, 2.039, 2.033, 2.022, 2.008, 1.989, 1.971,\n+ 1.939, 1.964, 1.991, 2.011, 2.024, 2.032, 2.036, 2.042, 2.042, 2.039, 2.035, 2.024, 2.012, 1.998, 1.977, 1.964,\n+ 1.932, 1.953, 1.981, 2.006, 2.016, 2.024, 2.028, 2.031, 2.034, 2.031, 2.024, 2.015, 2.005, 1.989, 1.966, 1.955,\n+ 1.928, 1.944, 1.973, 1.999, 2.007, 2.016, 2.019, 2.025, 2.026, 2.025, 2.017, 2.008, 1.997, 1.975, 1.958, 1.947\n+ ]\n+ }\n+ ],\n+ \"luminance_lut\":\n [\n- 1.897, 1.919, 1.941, 1.969, 1.989, 2.003, 2.014, 2.019, 2.019, 2.017, 2.014, 2.008, 1.999, 1.988, 1.968, 1.944,\n- 1.914, 1.932, 1.957, 1.982, 1.998, 2.014, 2.023, 2.029, 2.031, 2.029, 2.022, 2.014, 2.006, 1.995, 1.976, 1.955,\n- 1.925, 1.951, 1.974, 1.996, 2.013, 2.027, 2.035, 2.039, 2.039, 2.038, 2.035, 2.026, 2.015, 2.002, 1.984, 1.963,\n- 1.932, 1.958, 1.986, 2.007, 2.024, 2.034, 2.041, 2.041, 2.045, 2.045, 2.042, 2.033, 2.023, 2.009, 1.995, 1.971,\n- 1.942, 1.964, 1.994, 2.012, 2.029, 2.038, 2.043, 2.046, 2.047, 2.046, 2.045, 2.039, 2.029, 2.014, 1.997, 1.977,\n- 1.946, 1.974, 1.999, 2.015, 2.031, 2.041, 2.046, 2.047, 2.048, 2.047, 2.044, 2.041, 2.031, 2.019, 1.999, 1.978,\n- 1.948, 1.975, 2.002, 2.018, 2.031, 2.041, 2.046, 2.047, 2.048, 2.048, 2.045, 2.041, 2.029, 2.019, 1.998, 1.978,\n- 1.948, 1.973, 2.002, 2.018, 2.029, 2.042, 2.045, 2.048, 2.048, 2.048, 2.044, 2.037, 2.027, 2.014, 1.993, 1.978,\n- 1.945, 1.969, 1.998, 2.015, 2.028, 2.037, 2.045, 2.046, 2.047, 2.044, 2.039, 2.033, 2.022, 2.008, 1.989, 1.971,\n- 1.939, 1.964, 1.991, 2.011, 2.024, 2.032, 2.036, 2.042, 2.042, 2.039, 2.035, 2.024, 2.012, 1.998, 1.977, 1.964,\n- 1.932, 1.953, 1.981, 2.006, 2.016, 2.024, 2.028, 2.031, 2.034, 2.031, 2.024, 2.015, 2.005, 1.989, 1.966, 1.955,\n- 1.928, 1.944, 1.973, 1.999, 2.007, 2.016, 2.019, 2.025, 2.026, 2.025, 2.017, 2.008, 1.997, 1.975, 1.958, 1.947\n- ]\n+ 1.877, 1.597, 1.397, 1.269, 1.191, 1.131, 1.093, 1.078, 1.071, 1.069, 1.086, 1.135, 1.221, 1.331, 1.474, 1.704,\n+ 1.749, 1.506, 1.334, 1.229, 1.149, 1.088, 1.058, 1.053, 1.051, 1.046, 1.053, 1.091, 1.163, 1.259, 1.387, 1.587,\n+ 1.661, 1.451, 1.295, 1.195, 1.113, 1.061, 1.049, 1.048, 1.047, 1.049, 1.049, 1.066, 1.124, 1.211, 1.333, 1.511,\n+ 1.615, 1.411, 1.267, 1.165, 1.086, 1.052, 1.047, 1.047, 1.047, 1.049, 1.052, 1.056, 1.099, 1.181, 1.303, 1.471,\n+ 1.576, 1.385, 1.252, 1.144, 1.068, 1.049, 1.044, 1.044, 1.045, 1.049, 1.053, 1.054, 1.083, 1.163, 1.283, 1.447,\n+ 1.561, 1.373, 1.245, 1.135, 1.064, 1.049, 1.044, 1.044, 1.044, 1.046, 1.048, 1.054, 1.073, 1.153, 1.271, 1.432,\n+ 1.571, 1.377, 1.242, 1.137, 1.066, 1.055, 1.052, 1.051, 1.051, 1.049, 1.047, 1.048, 1.068, 1.148, 1.271, 1.427,\n+ 1.582, 1.396, 1.259, 1.156, 1.085, 1.068, 1.059, 1.054, 1.049, 1.045, 1.041, 1.043, 1.074, 1.157, 1.284, 1.444,\n+ 1.623, 1.428, 1.283, 1.178, 1.105, 1.074, 1.069, 1.063, 1.056, 1.048, 1.046, 1.051, 1.094, 1.182, 1.311, 1.473,\n+ 1.691, 1.471, 1.321, 1.213, 1.135, 1.088, 1.073, 1.069, 1.063, 1.059, 1.053, 1.071, 1.129, 1.222, 1.351, 1.521,\n+ 1.808, 1.543, 1.371, 1.253, 1.174, 1.118, 1.085, 1.072, 1.067, 1.064, 1.071, 1.106, 1.176, 1.274, 1.398, 1.582,\n+ 1.969, 1.666, 1.447, 1.316, 1.223, 1.166, 1.123, 1.094, 1.089, 1.097, 1.118, 1.163, 1.239, 1.336, 1.471, 1.681\n+ ],\n+ \"sigma\": 0.00218,\n+ \"sigma_Cb\": 0.00194\n }\n- ],\n- \"luminance_lut\":\n- [\n- 1.877, 1.597, 1.397, 1.269, 1.191, 1.131, 1.093, 1.078, 1.071, 1.069, 1.086, 1.135, 1.221, 1.331, 1.474, 1.704,\n- 1.749, 1.506, 1.334, 1.229, 1.149, 1.088, 1.058, 1.053, 1.051, 1.046, 1.053, 1.091, 1.163, 1.259, 1.387, 1.587,\n- 1.661, 1.451, 1.295, 1.195, 1.113, 1.061, 1.049, 1.048, 1.047, 1.049, 1.049, 1.066, 1.124, 1.211, 1.333, 1.511,\n- 1.615, 1.411, 1.267, 1.165, 1.086, 1.052, 1.047, 1.047, 1.047, 1.049, 1.052, 1.056, 1.099, 1.181, 1.303, 1.471,\n- 1.576, 1.385, 1.252, 1.144, 1.068, 1.049, 1.044, 1.044, 1.045, 1.049, 1.053, 1.054, 1.083, 1.163, 1.283, 1.447,\n- 1.561, 1.373, 1.245, 1.135, 1.064, 1.049, 1.044, 1.044, 1.044, 1.046, 1.048, 1.054, 1.073, 1.153, 1.271, 1.432,\n- 1.571, 1.377, 1.242, 1.137, 1.066, 1.055, 1.052, 1.051, 1.051, 1.049, 1.047, 1.048, 1.068, 1.148, 1.271, 1.427,\n- 1.582, 1.396, 1.259, 1.156, 1.085, 1.068, 1.059, 1.054, 1.049, 1.045, 1.041, 1.043, 1.074, 1.157, 1.284, 1.444,\n- 1.623, 1.428, 1.283, 1.178, 1.105, 1.074, 1.069, 1.063, 1.056, 1.048, 1.046, 1.051, 1.094, 1.182, 1.311, 1.473,\n- 1.691, 1.471, 1.321, 1.213, 1.135, 1.088, 1.073, 1.069, 1.063, 1.059, 1.053, 1.071, 1.129, 1.222, 1.351, 1.521,\n- 1.808, 1.543, 1.371, 1.253, 1.174, 1.118, 1.085, 1.072, 1.067, 1.064, 1.071, 1.106, 1.176, 1.274, 1.398, 1.582,\n- 1.969, 1.666, 1.447, 1.316, 1.223, 1.166, 1.123, 1.094, 1.089, 1.097, 1.118, 1.163, 1.239, 1.336, 1.471, 1.681\n- ],\n- \"sigma\": 0.00218,\n- \"sigma_Cb\": 0.00194\n- },\n- \"rpi.contrast\":\n- {\n- \"ce_enable\": 1,\n- \"gamma_curve\":\n- [\n- 0, 0, 1024, 5040, 2048, 9338, 3072, 12356, 4096, 15312, 5120, 18051, 6144, 20790, 7168, 23193,\n- 8192, 25744, 9216, 27942, 10240, 30035, 11264, 32005, 12288, 33975, 13312, 35815, 14336, 37600, 15360, 39168,\n- 16384, 40642, 18432, 43379, 20480, 45749, 22528, 47753, 24576, 49621, 26624, 51253, 28672, 52698, 30720, 53796,\n- 32768, 54876, 36864, 57012, 40960, 58656, 45056, 59954, 49152, 61183, 53248, 62355, 57344, 63419, 61440, 64476,\n- 65535, 65535\n- ]\n- },\n- \"rpi.ccm\":\n- {\n- \"ccms\":\n- [\n- {\n- \"ct\": 2900, \"ccm\":\n- [\n- 1.44924, -0.12935, -0.31989, -0.65839, 1.95441, -0.29602, 0.18344, -1.22282, 2.03938\n- ]\n- },\n- {\n- \"ct\": 3000, \"ccm\":\n- [\n- 1.38736, 0.07714, -0.46451, -0.59691, 1.84335, -0.24644, 0.10092, -1.30441, 2.20349\n- ]\n- },\n- {\n- \"ct\": 3600, \"ccm\":\n- [\n- 1.51261, -0.27921, -0.23339, -0.55129, 1.83241, -0.28111, 0.11649, -0.93195, 1.81546\n- ]\n- },\n+ },\n+ {\n+ \"rpi.contrast\":\n {\n- \"ct\": 4600, \"ccm\":\n+ \"ce_enable\": 1,\n+ \"gamma_curve\":\n [\n- 1.47082, -0.18523, -0.28559, -0.48923, 1.95126, -0.46203, 0.07951, -0.83987, 1.76036\n+ 0, 0,\n+ 1024, 5040,\n+ 2048, 9338,\n+ 3072, 12356,\n+ 4096, 15312,\n+ 5120, 18051,\n+ 6144, 20790,\n+ 7168, 23193,\n+ 8192, 25744,\n+ 9216, 27942,\n+ 10240, 30035,\n+ 11264, 32005,\n+ 12288, 33975,\n+ 13312, 35815,\n+ 14336, 37600,\n+ 15360, 39168,\n+ 16384, 40642,\n+ 18432, 43379,\n+ 20480, 45749,\n+ 22528, 47753,\n+ 24576, 49621,\n+ 26624, 51253,\n+ 28672, 52698,\n+ 30720, 53796,\n+ 32768, 54876,\n+ 36864, 57012,\n+ 40960, 58656,\n+ 45056, 59954,\n+ 49152, 61183,\n+ 53248, 62355,\n+ 57344, 63419,\n+ 61440, 64476,\n+ 65535, 65535\n ]\n- },\n+ }\n+ },\n+ {\n+ \"rpi.ccm\":\n {\n- \"ct\": 5800, \"ccm\":\n- [\n- 1.57294, -0.36229, -0.21065, -0.42272, 1.80305, -0.38032, 0.03671, -0.66862, 1.63191\n+ \"ccms\": [\n+ {\n+ \"ct\": 2900,\n+ \"ccm\":\n+ [\n+ 1.44924, -0.12935, -0.31989,\n+ -0.65839, 1.95441, -0.29602,\n+ 0.18344, -1.22282, 2.03938\n+ ]\n+ },\n+ {\n+ \"ct\": 3000,\n+ \"ccm\":\n+ [\n+ 1.38736, 0.07714, -0.46451,\n+ -0.59691, 1.84335, -0.24644,\n+ 0.10092, -1.30441, 2.20349\n+ ]\n+ },\n+ {\n+ \"ct\": 3600,\n+ \"ccm\":\n+ [\n+ 1.51261, -0.27921, -0.23339,\n+ -0.55129, 1.83241, -0.28111,\n+ 0.11649, -0.93195, 1.81546\n+ ]\n+ },\n+ {\n+ \"ct\": 4600,\n+ \"ccm\":\n+ [\n+ 1.47082, -0.18523, -0.28559,\n+ -0.48923, 1.95126, -0.46203,\n+ 0.07951, -0.83987, 1.76036\n+ ]\n+ },\n+ {\n+ \"ct\": 5800,\n+ \"ccm\":\n+ [\n+ 1.57294, -0.36229, -0.21065,\n+ -0.42272, 1.80305, -0.38032,\n+ 0.03671, -0.66862, 1.63191\n+ ]\n+ },\n+ {\n+ \"ct\": 8100,\n+ \"ccm\":\n+ [\n+ 1.58803, -0.09912, -0.48891,\n+ -0.42594, 2.22303, -0.79709,\n+ -0.00621, -0.90516, 1.91137\n+ ]\n+ }\n ]\n- },\n+ }\n+ },\n+ {\n+ \"rpi.sharpen\":\n {\n- \"ct\": 8100, \"ccm\":\n- [\n- 1.58803, -0.09912, -0.48891, -0.42594, 2.22303, -0.79709, -0.00621, -0.90516, 1.91137\n- ]\n+ \"threshold\": 2.0,\n+ \"strength\": 0.5,\n+ \"limit\": 0.5\n }\n- ]\n- },\n- \"rpi.sharpen\":\n- {\n- \"threshold\": 2.0,\n- \"strength\": 0.5,\n- \"limit\": 0.5\n- }\n-}\n+ }\n+ ]\n+}\n\\ No newline at end of file\ndiff --git a/src/ipa/raspberrypi/data/uncalibrated.json b/src/ipa/raspberrypi/data/uncalibrated.json\nindex 16a01e940b42..13eb3f177302 100644\n--- a/src/ipa/raspberrypi/data/uncalibrated.json\n+++ b/src/ipa/raspberrypi/data/uncalibrated.json\n@@ -1,82 +1,118 @@\n {\n- \"rpi.black_level\":\n- {\n- \"black_level\": 4096\n- },\n- \"rpi.awb\":\n- {\n- \"use_derivatives\": 0,\n- \"bayes\": 0\n- },\n- \"rpi.agc\":\n- {\n- \"metering_modes\":\n+ \"version\": 2.0,\n+ \"target\": \"bcm2835\",\n+ \"algorithms\": [\n {\n- \"centre-weighted\": {\n- \"weights\": [4, 4, 4, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0]\n+ \"rpi.black_level\":\n+ {\n+ \"black_level\": 4096\n+ }\n+ },\n+ {\n+ \"rpi.awb\":\n+ {\n+ \"use_derivatives\": 0,\n+ \"bayes\": 0\n }\n },\n- \"exposure_modes\":\n {\n- \"normal\":\n+ \"rpi.agc\":\n {\n- \"shutter\": [ 100, 15000, 30000, 60000, 120000 ],\n- \"gain\": [ 1.0, 2.0, 3.0, 4.0, 6.0 ]\n+ \"metering_modes\":\n+ {\n+ \"centre-weighted\":\n+ {\n+ \"weights\": [ 4, 4, 4, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+ }\n+ },\n+ \"exposure_modes\":\n+ {\n+ \"normal\":\n+ {\n+ \"shutter\": [ 100, 15000, 30000, 60000, 120000 ],\n+ \"gain\": [ 1.0, 2.0, 3.0, 4.0, 6.0 ]\n+ }\n+ },\n+ \"constraint_modes\":\n+ {\n+ \"normal\": [\n+ {\n+ \"bound\": \"LOWER\",\n+ \"q_lo\": 0.98,\n+ \"q_hi\": 1.0,\n+ \"y_target\":\n+ [\n+ 0, 0.4,\n+ 1000, 0.4\n+ ]\n+ }\n+ ]\n+ },\n+ \"y_target\":\n+ [\n+ 0, 0.16,\n+ 1000, 0.165,\n+ 10000, 0.17\n+ ]\n }\n },\n- \"constraint_modes\":\n {\n- \"normal\":\n- [\n- { \"bound\": \"LOWER\", \"q_lo\": 0.98, \"q_hi\": 1.0, \"y_target\": [ 0, 0.4, 1000, 0.4 ] }\n- ]\n+ \"rpi.ccm\":\n+ {\n+ \"ccms\": [\n+ {\n+ \"ct\": 4000,\n+ \"ccm\":\n+ [\n+ 2.0, -1.0, 0.0,\n+ -0.5, 2.0, -0.5,\n+ 0, -1.0, 2.0\n+ ]\n+ }\n+ ]\n+ }\n },\n- \"y_target\": [ 0, 0.16, 1000, 0.165, 10000, 0.17 ]\n- },\n- \"rpi.ccm\":\n- {\n- \"ccms\":\n- [\n- { \"ct\": 4000, \"ccm\": [ 2.0, -1.0, 0.0, -0.5, 2.0, -0.5, 0, -1.0, 2.0 ] }\n- ]\n- },\n- \"rpi.contrast\":\n- {\n- \"ce_enable\": 0,\n- \"gamma_curve\": [\n- 0, 0,\n- 1024, 5040,\n- 2048, 9338,\n- 3072, 12356,\n- 4096, 15312,\n- 5120, 18051,\n- 6144, 20790,\n- 7168, 23193,\n- 8192, 25744,\n- 9216, 27942,\n- 10240, 30035,\n- 11264, 32005,\n- 12288, 33975,\n- 13312, 35815,\n- 14336, 37600,\n- 15360, 39168,\n- 16384, 40642,\n- 18432, 43379,\n- 20480, 45749,\n- 22528, 47753,\n- 24576, 49621,\n- 26624, 51253,\n- 28672, 52698,\n- 30720, 53796,\n- 32768, 54876,\n- 36864, 57012,\n- 40960, 58656,\n- 45056, 59954,\n- 49152, 61183,\n- 53248, 62355,\n- 57344, 63419,\n- 61440, 64476,\n- 65535, 65535\n- ]\n- }\n-}\n+ {\n+ \"rpi.contrast\":\n+ {\n+ \"ce_enable\": 0,\n+ \"gamma_curve\":\n+ [\n+ 0, 0,\n+ 1024, 5040,\n+ 2048, 9338,\n+ 3072, 12356,\n+ 4096, 15312,\n+ 5120, 18051,\n+ 6144, 20790,\n+ 7168, 23193,\n+ 8192, 25744,\n+ 9216, 27942,\n+ 10240, 30035,\n+ 11264, 32005,\n+ 12288, 33975,\n+ 13312, 35815,\n+ 14336, 37600,\n+ 15360, 39168,\n+ 16384, 40642,\n+ 18432, 43379,\n+ 20480, 45749,\n+ 22528, 47753,\n+ 24576, 49621,\n+ 26624, 51253,\n+ 28672, 52698,\n+ 30720, 53796,\n+ 32768, 54876,\n+ 36864, 57012,\n+ 40960, 58656,\n+ 45056, 59954,\n+ 49152, 61183,\n+ 53248, 62355,\n+ 57344, 63419,\n+ 61440, 64476,\n+ 65535, 65535\n+ ]\n+ }\n+ }\n+ ]\n+}\n\\ No newline at end of file\n", "prefixes": [ "libcamera-devel", "v7", "12/14" ] }