{"id":18917,"url":"https://patchwork.libcamera.org/api/1.1/patches/18917/?format=json","web_url":"https://patchwork.libcamera.org/patch/18917/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20230731134833.79687-3-david.plowman@raspberrypi.com>","date":"2023-07-31T13:48:33","name":"[libcamera-devel,2/2] ipa: rpi: vc4: data: Update tuning files for HDR","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"a5e9a58fa9db7913f65afc73f04e5679c07ab31b","submitter":{"id":42,"url":"https://patchwork.libcamera.org/api/1.1/people/42/?format=json","name":"David Plowman","email":"david.plowman@raspberrypi.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/18917/mbox/","series":[{"id":3998,"url":"https://patchwork.libcamera.org/api/1.1/series/3998/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3998","date":"2023-07-31T13:48:31","name":"HDR for Raspberry Pi","version":1,"mbox":"https://patchwork.libcamera.org/series/3998/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/18917/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/18917/checks/","tags":{},"headers":{"Return-Path":"","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 8C3E3BDCBF\n\tfor ;\n\tMon, 31 Jul 2023 13:48:44 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1E4D1627EB;\n\tMon, 31 Jul 2023 15:48:44 +0200 (CEST)","from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com\n\t[IPv6:2a00:1450:4864:20::32d])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1FA6F627E8\n\tfor ;\n\tMon, 31 Jul 2023 15:48:41 +0200 (CEST)","by mail-wm1-x32d.google.com with SMTP id\n\t5b1f17b1804b1-3fb4146e8fcso31326635e9.0\n\tfor ;\n\tMon, 31 Jul 2023 06:48:41 -0700 (PDT)","from pi4-davidp.pitowers.org\n\t([2a00:1098:3142:14:2bce:64d6:1a5c:49a2])\n\tby smtp.gmail.com with ESMTPSA id\n\tt20-20020a7bc3d4000000b003fe146fae45sm7046097wmj.46.2023.07.31.06.48.38\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 31 Jul 2023 06:48:38 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1690811324;\n\tbh=QOHCDYRGnltw9WeKoxgrlv1gkc87MXr7oCNGrtjmqso=;\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=DnjUe/y0DYg29XUuDoPvMlAeqmzSWyzZ+wGfqhkTPNW3u75GdSGD7lL6iSJuQZ+cw\n\tWJDKBy8d+M5EGATHbO/nW/62zexQ0OvT8ax6QS4MmkM7YV9eJzFcQ6DasAfnpU70bH\n\t6iT+DXDH5dWP9P9870oYNifGqgd5KfI+vufXJXP+d1uivRQx+DKxAFjahh6g9llXJ5\n\tolrlA8xeJn6rFRgAbzpScCjwj1mgnhtIxySRifaG9kZUcCtmVOWNcnRVDue1WaW7Ra\n\tbJjbeNCjO3v6/5dSkyCz/GUEA4mUSBXSvvnanhGhFbF4ypZQf6nLIUSSm33ytrh4Bx\n\tt0me6N7mBZ7NQ==","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google; t=1690811320; x=1691416120;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=LkIMdJ3eLZj5aH+k9LGXUdnWU3Jit63XrS52uvt3qB4=;\n\tb=MWgzdQodNsjla+CaCzv8EW15Zw1LaDkBeAE/Pu9GHsRoZ1jwDnFv2dJ2g4TYwnWzTz\n\tjlMCGeyKcXZmIOJdWzbrcEk/3qhggRp8vzbX3Dj/R0HfHH/dahLoYYTOG2ipeYZPAP7B\n\t9/TqLzISrFlL+KXVvuZn67vHIxavi5sUF7gxc8FugCyrl/idmj2Fy98XpHK+D54L9/Dj\n\t4gSeVrfCFua8hHKX2j0vnGT1YBT0VJd/K1HjcMps7x2kjf1m+CGOn3pHu3f/+Yu93Wz9\n\taAZUBtGQfXwjv2RnFL4vRXpI0Jf4mggzD4Hebd/MiVjbnYk1ufTyCVcamsfX4EAlNMg9\n\tSYkg=="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"MWgzdQod\"; dkim-atps=neutral","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20221208; t=1690811320; x=1691416120;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=LkIMdJ3eLZj5aH+k9LGXUdnWU3Jit63XrS52uvt3qB4=;\n\tb=lhQPggBoik+ocDsD1iVAnfInmX5QmNJ9iqUcbT0CGXNSM6PYoxdwWvdO+UphiKhmxn\n\t+vxa1GCeRGYjJ3Bxbf/NtvVh036mwUFelvzr6OCvY9l3wMW/gxLdYXdkQelgHbb0DVE8\n\tY2CBBXZSIv9Oe4iuM50M9WOSr0rYbdCX9MnLHrYweYfRFW1FM3eQ1r2BTQxZg8p58qzO\n\tY0g91Vz73yWKHWHUSMYKypa99OYAgrG81BkLtxKFbOqDKsbn3X7b5kkUpj8Pgo8TDV8C\n\tC34HWsdeH9e7rpSVw8nVUDlV6xgxQuh9oms/Q1nNXJtvl8d1MYtUq+bGU+1FUqK3bArz\n\tcIjg==","X-Gm-Message-State":"ABy/qLZ67UMBrrXp0bU4+R2MuYPMw8B+NJgZjoCEUv5tGZCMqVmBE2h0\n\tRC+gTeVCbCRZFPJBt/rt+mxxz8E1p+OWKPELcFM=","X-Google-Smtp-Source":"APBJJlGCv+QN48i+KhqaTxVUtK72Xm/9mdr/GgfTyenj+BcyJuVKjHeZrIbDTkgNi8HTQXriwjpnJQ==","X-Received":"by 2002:a05:600c:8513:b0:3f9:68f:9c1a with SMTP id\n\tgw19-20020a05600c851300b003f9068f9c1amr10729372wmb.15.1690811319122; \n\tMon, 31 Jul 2023 06:48:39 -0700 (PDT)","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 31 Jul 2023 14:48:33 +0100","Message-Id":"<20230731134833.79687-3-david.plowman@raspberrypi.com>","X-Mailer":"git-send-email 2.30.2","In-Reply-To":"<20230731134833.79687-1-david.plowman@raspberrypi.com>","References":"<20230731134833.79687-1-david.plowman@raspberrypi.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 2/2] ipa: rpi: vc4: data: Update tuning\n\tfiles for HDR","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"David Plowman via libcamera-devel ","Reply-To":"David Plowman ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"All the Raspberry Pi official camera tuning files are updated for\nHDR. As stated previously, there is no mechanism in the hardware for\ncombining images so all this does is enable multi-channel AGC to\nproduce short and long exposure frames. It will be up to the\napplication to deal with them.\n\nThe changes are identical in every tuning file.\n\n1. The existing AGC tuning is duplicated twice so that we have 3 AGC\nchannels.\n\n2. The first is left alone (the default AGC channel), the second is\ntweaked to under-expose significantly (ev -3) and the final one is\ntweaked to over-exposure slightly (ev +0.5)\n\n3. Control parameters are provided to the \"rpi.hdr\" algorithm to\nassociate these AGC channels correctly with the HDR modes.\n\nSigned-off-by: David Plowman \n---\n src/ipa/rpi/vc4/data/imx219.json | 388 +++++++++++++++-----\n src/ipa/rpi/vc4/data/imx219_noir.json | 388 +++++++++++++++-----\n src/ipa/rpi/vc4/data/imx477.json | 386 +++++++++++++++-----\n src/ipa/rpi/vc4/data/imx477_noir.json | 388 +++++++++++++++-----\n src/ipa/rpi/vc4/data/imx708.json | 350 +++++++++++++-----\n src/ipa/rpi/vc4/data/imx708_noir.json | 350 +++++++++++++-----\n src/ipa/rpi/vc4/data/imx708_wide.json | 350 +++++++++++++-----\n src/ipa/rpi/vc4/data/imx708_wide_noir.json | 350 +++++++++++++-----\n src/ipa/rpi/vc4/data/ov5647.json | 392 ++++++++++++++++-----\n 9 files changed, 2563 insertions(+), 779 deletions(-)","diff":"diff --git a/src/ipa/rpi/vc4/data/imx219.json b/src/ipa/rpi/vc4/data/imx219.json\nindex efe7210a..a4e457c0 100644\n--- a/src/ipa/rpi/vc4/data/imx219.json\n+++ b/src/ipa/rpi/vc4/data/imx219.json\n@@ -131,95 +131,282 @@\n {\n \"rpi.agc\":\n {\n- \"metering_modes\":\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- \"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- \"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- \"y_target\":\n- [\n- 0, 0.16,\n- 1000, 0.165,\n- 10000, 0.17\n- ]\n- }\n+\t\t\"channels\":\n+\t\t[\n+\t\t {\n+\t\t\t\"metering_modes\":\n+\t\t\t{\n+\t\t\t \"centre-weighted\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"spot\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"matrix\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"exposure_modes\":\n+\t\t\t{\n+\t\t\t \"normal\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 66666 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"short\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 5000, 10000, 20000, 33333 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"long\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"constraint_modes\":\n+\t\t\t{\n+\t\t\t \"normal\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.5,\n+\t\t\t\t\t1000, 0.5\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"highlight\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.5,\n+\t\t\t\t\t1000, 0.5\n+\t\t\t\t ]\n+\t\t\t\t},\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"UPPER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.8,\n+\t\t\t\t\t1000, 0.8\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"shadows\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.0,\n+\t\t\t\t \"q_hi\": 0.5,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.17,\n+\t\t\t\t\t1000, 0.17\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ]\n+\t\t\t},\n+\t\t\t\"y_target\":\n+\t\t\t[\n+\t\t\t 0, 0.16,\n+\t\t\t 1000, 0.165,\n+\t\t\t 10000, 0.17\n+\t\t\t]\n+\t\t },\n+\t\t {\n+\t\t\t\"base_ev\": 0.125,\n+\t\t\t\"metering_modes\":\n+\t\t\t{\n+\t\t\t \"centre-weighted\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"spot\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"matrix\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"exposure_modes\":\n+\t\t\t{\n+\t\t\t \"normal\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 66666 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"short\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 5000, 10000, 20000, 33333 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"long\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"constraint_modes\":\n+\t\t\t{\n+\t\t\t \"normal\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.5,\n+\t\t\t\t\t1000, 0.5\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"highlight\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.5,\n+\t\t\t\t\t1000, 0.5\n+\t\t\t\t ]\n+\t\t\t\t},\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"UPPER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.8,\n+\t\t\t\t\t1000, 0.8\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"shadows\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.0,\n+\t\t\t\t \"q_hi\": 0.5,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.17,\n+\t\t\t\t\t1000, 0.17\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ]\n+\t\t\t},\n+\t\t\t\"y_target\":\n+\t\t\t[\n+\t\t\t 0, 0.16,\n+\t\t\t 1000, 0.165,\n+\t\t\t 10000, 0.17\n+\t\t\t]\n+\t\t },\n+\t\t {\n+\t\t\t\"base_ev\": 1.5,\n+\t\t\t\"metering_modes\":\n+\t\t\t{\n+\t\t\t \"centre-weighted\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"spot\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"matrix\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"exposure_modes\":\n+\t\t\t{\n+\t\t\t \"normal\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 66666 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"short\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 5000, 10000, 20000, 33333 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"long\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"constraint_modes\":\n+\t\t\t{\n+\t\t\t \"normal\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.5,\n+\t\t\t\t\t1000, 0.5\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"highlight\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.5,\n+\t\t\t\t\t1000, 0.5\n+\t\t\t\t ]\n+\t\t\t\t},\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"UPPER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.8,\n+\t\t\t\t\t1000, 0.8\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"shadows\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.0,\n+\t\t\t\t \"q_hi\": 0.5,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.17,\n+\t\t\t\t\t1000, 0.17\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ]\n+\t\t\t},\n+\t\t\t\"y_target\":\n+\t\t\t[\n+\t\t\t 0, 0.16,\n+\t\t\t 1000, 0.165,\n+\t\t\t 10000, 0.17\n+\t\t\t]\n+\t\t }\n+\t\t]\n+\t }\n },\n {\n \"rpi.alsc\":\n@@ -481,6 +668,25 @@\n },\n {\n \"rpi.sharpen\": { }\n- }\n+ },\n+\t{\n+\t \"rpi.hdr\":\n+\t {\n+\t\t\"Off\":\n+\t\t{\n+\t\t \"cadence\": [ 0 ]\n+\t\t},\n+\t\t\"MultiExposure\":\n+\t\t{\n+\t\t \"cadence\": [ 1, 2 ],\n+\t\t \"channel_map\": { \"short\": 1, \"long\": 2 }\n+\t\t},\n+\t\t\"SingleExposure\":\n+\t\t{\n+\t\t \"cadence\": [ 1 ],\n+\t\t \"channel_map\": { \"short\": 1 }\n+\t\t}\n+\t }\n+\t}\n ]\n-}\n\\ No newline at end of file\n+}\ndiff --git a/src/ipa/rpi/vc4/data/imx219_noir.json b/src/ipa/rpi/vc4/data/imx219_noir.json\nindex cfedb943..cba1905c 100644\n--- a/src/ipa/rpi/vc4/data/imx219_noir.json\n+++ b/src/ipa/rpi/vc4/data/imx219_noir.json\n@@ -47,95 +47,282 @@\n {\n \"rpi.agc\":\n {\n- \"metering_modes\":\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- \"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- \"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- \"y_target\":\n- [\n- 0, 0.16,\n- 1000, 0.165,\n- 10000, 0.17\n- ]\n- }\n+\t\t\"channels\":\n+\t\t[\n+\t\t {\n+\t\t\t\"metering_modes\":\n+\t\t\t{\n+\t\t\t \"centre-weighted\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"spot\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"matrix\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"exposure_modes\":\n+\t\t\t{\n+\t\t\t \"normal\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 66666 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"short\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 5000, 10000, 20000, 33333 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"long\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"constraint_modes\":\n+\t\t\t{\n+\t\t\t \"normal\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.5,\n+\t\t\t\t\t1000, 0.5\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"highlight\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.5,\n+\t\t\t\t\t1000, 0.5\n+\t\t\t\t ]\n+\t\t\t\t},\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"UPPER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.8,\n+\t\t\t\t\t1000, 0.8\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"shadows\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.0,\n+\t\t\t\t \"q_hi\": 0.5,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.17,\n+\t\t\t\t\t1000, 0.17\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ]\n+\t\t\t},\n+\t\t\t\"y_target\":\n+\t\t\t[\n+\t\t\t 0, 0.16,\n+\t\t\t 1000, 0.165,\n+\t\t\t 10000, 0.17\n+\t\t\t]\n+\t\t },\n+\t\t {\n+\t\t\t\"base_ev\": 0.125,\n+\t\t\t\"metering_modes\":\n+\t\t\t{\n+\t\t\t \"centre-weighted\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"spot\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"matrix\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"exposure_modes\":\n+\t\t\t{\n+\t\t\t \"normal\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 66666 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"short\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 5000, 10000, 20000, 33333 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"long\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"constraint_modes\":\n+\t\t\t{\n+\t\t\t \"normal\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.5,\n+\t\t\t\t\t1000, 0.5\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"highlight\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.5,\n+\t\t\t\t\t1000, 0.5\n+\t\t\t\t ]\n+\t\t\t\t},\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"UPPER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.8,\n+\t\t\t\t\t1000, 0.8\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"shadows\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.0,\n+\t\t\t\t \"q_hi\": 0.5,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.17,\n+\t\t\t\t\t1000, 0.17\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ]\n+\t\t\t},\n+\t\t\t\"y_target\":\n+\t\t\t[\n+\t\t\t 0, 0.16,\n+\t\t\t 1000, 0.165,\n+\t\t\t 10000, 0.17\n+\t\t\t]\n+\t\t },\n+\t\t {\n+\t\t\t\"base_ev\": 1.5,\n+\t\t\t\"metering_modes\":\n+\t\t\t{\n+\t\t\t \"centre-weighted\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"spot\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"matrix\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"exposure_modes\":\n+\t\t\t{\n+\t\t\t \"normal\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 66666 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"short\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 5000, 10000, 20000, 33333 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"long\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"constraint_modes\":\n+\t\t\t{\n+\t\t\t \"normal\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.5,\n+\t\t\t\t\t1000, 0.5\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"highlight\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.5,\n+\t\t\t\t\t1000, 0.5\n+\t\t\t\t ]\n+\t\t\t\t},\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"UPPER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.8,\n+\t\t\t\t\t1000, 0.8\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"shadows\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.0,\n+\t\t\t\t \"q_hi\": 0.5,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.17,\n+\t\t\t\t\t1000, 0.17\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ]\n+\t\t\t},\n+\t\t\t\"y_target\":\n+\t\t\t[\n+\t\t\t 0, 0.16,\n+\t\t\t 1000, 0.165,\n+\t\t\t 10000, 0.17\n+\t\t\t]\n+\t\t }\n+\t\t]\n+\t }\n },\n {\n \"rpi.alsc\":\n@@ -397,6 +584,25 @@\n },\n {\n \"rpi.sharpen\": { }\n- }\n+ },\n+\t{\n+\t \"rpi.hdr\":\n+\t {\n+\t\t\"Off\":\n+\t\t{\n+\t\t \"cadence\": [ 0 ]\n+\t\t},\n+\t\t\"MultiExposure\":\n+\t\t{\n+\t\t \"cadence\": [ 1, 2 ],\n+\t\t \"channel_map\": { \"short\": 1, \"long\": 2 }\n+\t\t},\n+\t\t\"SingleExposure\":\n+\t\t{\n+\t\t \"cadence\": [ 1 ],\n+\t\t \"channel_map\": { \"short\": 1 }\n+\t\t}\n+\t }\n+\t}\n ]\n-}\n\\ No newline at end of file\n+}\ndiff --git a/src/ipa/rpi/vc4/data/imx477.json b/src/ipa/rpi/vc4/data/imx477.json\nindex bbe6da0d..fbefb0a9 100644\n--- a/src/ipa/rpi/vc4/data/imx477.json\n+++ b/src/ipa/rpi/vc4/data/imx477.json\n@@ -136,95 +136,282 @@\n {\n \"rpi.agc\":\n {\n- \"metering_modes\":\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- \"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- \"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- \"y_target\":\n- [\n- 0, 0.16,\n- 1000, 0.165,\n- 10000, 0.17\n- ]\n- }\n+\t\t\"channels\":\n+\t\t[\n+ {\n+\t\t\t\"metering_modes\":\n+\t\t\t{\n+\t\t\t \"centre-weighted\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"spot\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"matrix\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"exposure_modes\":\n+\t\t\t{\n+\t\t\t \"normal\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 66666 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"short\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 5000, 10000, 20000, 33333 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"long\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"constraint_modes\":\n+\t\t\t{\n+\t\t\t \"normal\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.3,\n+\t\t\t\t\t1000, 0.3\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"highlight\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.3,\n+\t\t\t\t\t1000, 0.3\n+\t\t\t\t ]\n+\t\t\t\t},\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"UPPER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.8,\n+\t\t\t\t\t1000, 0.8\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"shadows\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.0,\n+\t\t\t\t \"q_hi\": 0.5,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.17,\n+\t\t\t\t\t1000, 0.17\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ]\n+\t\t\t},\n+\t\t\t\"y_target\":\n+\t\t\t[\n+\t\t\t 0, 0.16,\n+\t\t\t 1000, 0.165,\n+\t\t\t 10000, 0.17\n+\t\t\t]\n+\t\t },\n+ {\n+\t\t\t\"base_ev\": 0.125,\n+\t\t\t\"metering_modes\":\n+\t\t\t{\n+\t\t\t \"centre-weighted\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"spot\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"matrix\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"exposure_modes\":\n+\t\t\t{\n+\t\t\t \"normal\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 66666 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"short\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 5000, 10000, 20000, 33333 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"long\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"constraint_modes\":\n+\t\t\t{\n+\t\t\t \"normal\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.3,\n+\t\t\t\t\t1000, 0.3\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"highlight\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.3,\n+\t\t\t\t\t1000, 0.3\n+\t\t\t\t ]\n+\t\t\t\t},\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"UPPER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.8,\n+\t\t\t\t\t1000, 0.8\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"shadows\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.0,\n+\t\t\t\t \"q_hi\": 0.5,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.17,\n+\t\t\t\t\t1000, 0.17\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ]\n+\t\t\t},\n+\t\t\t\"y_target\":\n+\t\t\t[\n+\t\t\t 0, 0.16,\n+\t\t\t 1000, 0.165,\n+\t\t\t 10000, 0.17\n+\t\t\t]\n+\t\t },\n+ {\n+\t\t\t\"base_ev\": 1.5,\n+\t\t\t\"metering_modes\":\n+\t\t\t{\n+\t\t\t \"centre-weighted\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"spot\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"matrix\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"exposure_modes\":\n+\t\t\t{\n+\t\t\t \"normal\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 66666 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"short\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 5000, 10000, 20000, 33333 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"long\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"constraint_modes\":\n+\t\t\t{\n+\t\t\t \"normal\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.3,\n+\t\t\t\t\t1000, 0.3\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"highlight\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.3,\n+\t\t\t\t\t1000, 0.3\n+\t\t\t\t ]\n+\t\t\t\t},\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"UPPER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.8,\n+\t\t\t\t\t1000, 0.8\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"shadows\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.0,\n+\t\t\t\t \"q_hi\": 0.5,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.17,\n+\t\t\t\t\t1000, 0.17\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ]\n+\t\t\t},\n+\t\t\t\"y_target\":\n+\t\t\t[\n+\t\t\t 0, 0.16,\n+\t\t\t 1000, 0.165,\n+\t\t\t 10000, 0.17\n+\t\t\t]\n+\t\t }\n+\t\t]\n+\t }\n },\n {\n \"rpi.alsc\":\n@@ -513,7 +700,26 @@\n },\n {\n \"rpi.sharpen\": { }\n- }\n+ },\n+\t{\n+\t \"rpi.hdr\":\n+\t {\n+\t\t\"Off\":\n+\t\t{\n+\t\t \"cadence\": [ 0 ]\n+\t\t},\n+\t\t\"MultiExposure\":\n+\t\t{\n+\t\t \"cadence\": [ 1, 2 ],\n+\t\t \"channel_map\": { \"short\": 1, \"long\": 2 }\n+\t\t},\n+\t\t\"SingleExposure\":\n+\t\t{\n+\t\t \"cadence\": [ 1 ],\n+\t\t \"channel_map\": { \"short\": 1 }\n+\t\t}\n+\t }\n+\t}\n ]\n }\n \ndiff --git a/src/ipa/rpi/vc4/data/imx477_noir.json b/src/ipa/rpi/vc4/data/imx477_noir.json\nindex 52d7f072..53b7b492 100644\n--- a/src/ipa/rpi/vc4/data/imx477_noir.json\n+++ b/src/ipa/rpi/vc4/data/imx477_noir.json\n@@ -47,95 +47,282 @@\n {\n \"rpi.agc\":\n {\n- \"metering_modes\":\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- \"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- \"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- \"y_target\":\n- [\n- 0, 0.16,\n- 1000, 0.165,\n- 10000, 0.17\n- ]\n- }\n+\t\t\"channels\":\n+\t\t[\n+\t\t {\n+\t\t\t\"metering_modes\":\n+\t\t\t{\n+\t\t\t \"centre-weighted\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"spot\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"matrix\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"exposure_modes\":\n+\t\t\t{\n+\t\t\t \"normal\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 66666 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"short\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 5000, 10000, 20000, 33333 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"long\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"constraint_modes\":\n+\t\t\t{\n+\t\t\t \"normal\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.3,\n+\t\t\t\t\t1000, 0.3\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"highlight\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.3,\n+\t\t\t\t\t1000, 0.3\n+\t\t\t\t ]\n+\t\t\t\t},\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"UPPER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.8,\n+\t\t\t\t\t1000, 0.8\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"shadows\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.0,\n+\t\t\t\t \"q_hi\": 0.5,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.17,\n+\t\t\t\t\t1000, 0.17\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ]\n+\t\t\t},\n+\t\t\t\"y_target\":\n+\t\t\t[\n+\t\t\t 0, 0.16,\n+\t\t\t 1000, 0.165,\n+\t\t\t 10000, 0.17\n+\t\t\t]\n+\t\t },\n+\t\t {\n+\t\t\t\"base_ev\": 0.125,\n+\t\t\t\"metering_modes\":\n+\t\t\t{\n+\t\t\t \"centre-weighted\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"spot\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"matrix\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"exposure_modes\":\n+\t\t\t{\n+\t\t\t \"normal\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 66666 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"short\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 5000, 10000, 20000, 33333 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"long\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"constraint_modes\":\n+\t\t\t{\n+\t\t\t \"normal\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.3,\n+\t\t\t\t\t1000, 0.3\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"highlight\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.3,\n+\t\t\t\t\t1000, 0.3\n+\t\t\t\t ]\n+\t\t\t\t},\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"UPPER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.8,\n+\t\t\t\t\t1000, 0.8\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"shadows\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.0,\n+\t\t\t\t \"q_hi\": 0.5,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.17,\n+\t\t\t\t\t1000, 0.17\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ]\n+\t\t\t},\n+\t\t\t\"y_target\":\n+\t\t\t[\n+\t\t\t 0, 0.16,\n+\t\t\t 1000, 0.165,\n+\t\t\t 10000, 0.17\n+\t\t\t]\n+\t\t },\n+\t\t {\n+\t\t\t\"base_ev\": 1.5,\n+\t\t\t\"metering_modes\":\n+\t\t\t{\n+\t\t\t \"centre-weighted\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"spot\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"matrix\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"exposure_modes\":\n+\t\t\t{\n+\t\t\t \"normal\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 66666 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"short\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 5000, 10000, 20000, 33333 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"long\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"constraint_modes\":\n+\t\t\t{\n+\t\t\t \"normal\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.3,\n+\t\t\t\t\t1000, 0.3\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"highlight\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.3,\n+\t\t\t\t\t1000, 0.3\n+\t\t\t\t ]\n+\t\t\t\t},\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"UPPER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.8,\n+\t\t\t\t\t1000, 0.8\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"shadows\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.0,\n+\t\t\t\t \"q_hi\": 0.5,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.17,\n+\t\t\t\t\t1000, 0.17\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ]\n+\t\t\t},\n+\t\t\t\"y_target\":\n+\t\t\t[\n+\t\t\t 0, 0.16,\n+\t\t\t 1000, 0.165,\n+\t\t\t 10000, 0.17\n+\t\t\t]\n+\t\t }\n+\t\t]\n+\t }\n },\n {\n \"rpi.alsc\":\n@@ -424,6 +611,25 @@\n },\n {\n \"rpi.sharpen\": { }\n- }\n+ },\n+\t{\n+\t \"rpi.hdr\":\n+\t {\n+\t\t\"Off\":\n+\t\t{\n+\t\t \"cadence\": [ 0 ]\n+\t\t},\n+\t\t\"MultiExposure\":\n+\t\t{\n+\t\t \"cadence\": [ 1, 2 ],\n+\t\t \"channel_map\": { \"short\": 1, \"long\": 2 }\n+\t\t},\n+\t\t\"SingleExposure\":\n+\t\t{\n+\t\t \"cadence\": [ 1 ],\n+\t\t \"channel_map\": { \"short\": 1 }\n+\t\t}\n+\t }\n+\t}\n ]\n-}\n\\ No newline at end of file\n+}\ndiff --git a/src/ipa/rpi/vc4/data/imx708.json b/src/ipa/rpi/vc4/data/imx708.json\nindex 6b26d0a1..bfa78b72 100644\n--- a/src/ipa/rpi/vc4/data/imx708.json\n+++ b/src/ipa/rpi/vc4/data/imx708.json\n@@ -139,86 +139,255 @@\n {\n \"rpi.agc\":\n {\n- \"metering_modes\":\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- \"normal\":\n- {\n- \"shutter\": [ 100, 15000, 30000, 60000, 120000 ],\n- \"gain\": [ 1.0, 1.0, 2.0, 4.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- \"long\":\n- {\n- \"shutter\": [ 1000, 30000, 60000, 90000, 120000 ],\n- \"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.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.2,\n- 1000, 0.2\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.2,\n- 1000, 0.2\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- 0, 0.16,\n- 1000, 0.165,\n- 10000, 0.17\n- ],\n- \"startup_frames\": 5,\n- \"convergence_frames\": 6,\n- \"speed\": 0.15\n- }\n+\t\t\"channels\":\n+\t\t[\n+\t\t {\n+\t\t\t\"metering_modes\":\n+\t\t\t{\n+\t\t\t \"centre-weighted\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"spot\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"matrix\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"exposure_modes\":\n+\t\t\t{\n+\t\t\t \"normal\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 15000, 30000, 60000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 1.0, 2.0, 4.0, 6.0 ]\n+\t\t\t },\n+\t\t\t \"short\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 5000, 10000, 20000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]\n+\t\t\t },\n+\t\t\t \"long\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 1000, 30000, 60000, 90000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"constraint_modes\":\n+\t\t\t{\n+\t\t\t \"normal\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.2,\n+\t\t\t\t\t1000, 0.2\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"highlight\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.2,\n+\t\t\t\t\t1000, 0.2\n+\t\t\t\t ]\n+\t\t\t\t},\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"UPPER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.8,\n+\t\t\t\t\t1000, 0.8\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ]\n+\t\t\t},\n+\t\t\t\"y_target\":\n+\t\t\t[\n+\t\t\t 0, 0.16,\n+\t\t\t 1000, 0.165,\n+\t\t\t 10000, 0.17\n+\t\t\t],\n+\t\t\t\"startup_frames\": 5,\n+\t\t\t\"convergence_frames\": 6,\n+\t\t\t\"speed\": 0.15\n+\t\t },\n+\t\t {\n+\t\t\t\"base_ev\": 0.125,\n+\t\t\t\"metering_modes\":\n+\t\t\t{\n+\t\t\t \"centre-weighted\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"spot\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"matrix\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"exposure_modes\":\n+\t\t\t{\n+\t\t\t \"normal\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 15000, 30000, 60000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 1.0, 2.0, 4.0, 6.0 ]\n+\t\t\t },\n+\t\t\t \"short\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 5000, 10000, 20000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]\n+\t\t\t },\n+\t\t\t \"long\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 1000, 30000, 60000, 90000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"constraint_modes\":\n+\t\t\t{\n+\t\t\t \"normal\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.2,\n+\t\t\t\t\t1000, 0.2\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"highlight\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.2,\n+\t\t\t\t\t1000, 0.2\n+\t\t\t\t ]\n+\t\t\t\t},\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"UPPER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.8,\n+\t\t\t\t\t1000, 0.8\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ]\n+\t\t\t},\n+\t\t\t\"y_target\":\n+\t\t\t[\n+\t\t\t 0, 0.16,\n+\t\t\t 1000, 0.165,\n+\t\t\t 10000, 0.17\n+\t\t\t],\n+\t\t\t\"startup_frames\": 5,\n+\t\t\t\"convergence_frames\": 6,\n+\t\t\t\"speed\": 0.15\n+\t\t },\n+\t\t {\n+\t\t\t\"base_ev\": 1.5,\n+\t\t\t\"metering_modes\":\n+\t\t\t{\n+\t\t\t \"centre-weighted\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"spot\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"matrix\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"exposure_modes\":\n+\t\t\t{\n+\t\t\t \"normal\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 15000, 30000, 60000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 1.0, 2.0, 4.0, 6.0 ]\n+\t\t\t },\n+\t\t\t \"short\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 5000, 10000, 20000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]\n+\t\t\t },\n+\t\t\t \"long\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 1000, 30000, 60000, 90000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"constraint_modes\":\n+\t\t\t{\n+\t\t\t \"normal\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.2,\n+\t\t\t\t\t1000, 0.2\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"highlight\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.2,\n+\t\t\t\t\t1000, 0.2\n+\t\t\t\t ]\n+\t\t\t\t},\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"UPPER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.8,\n+\t\t\t\t\t1000, 0.8\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ]\n+\t\t\t},\n+\t\t\t\"y_target\":\n+\t\t\t[\n+\t\t\t 0, 0.16,\n+\t\t\t 1000, 0.165,\n+\t\t\t 10000, 0.17\n+\t\t\t],\n+\t\t\t\"startup_frames\": 5,\n+\t\t\t\"convergence_frames\": 6,\n+\t\t\t\"speed\": 0.15\n+\t\t }\n+\t\t]\n+\t }\n },\n {\n \"rpi.alsc\":\n@@ -556,6 +725,25 @@\n \"skip_frames\": 5,\n \"map\": [ 0.0, 445, 15.0, 925 ]\n }\n- }\n+ },\n+\t{\n+\t \"rpi.hdr\":\n+\t {\n+\t\t\"Off\":\n+\t\t{\n+\t\t \"cadence\": [ 0 ]\n+\t\t},\n+\t\t\"MultiExposure\":\n+\t\t{\n+\t\t \"cadence\": [ 1, 2 ],\n+\t\t \"channel_map\": { \"short\": 1, \"long\": 2 }\n+\t\t},\n+\t\t\"SingleExposure\":\n+\t\t{\n+\t\t \"cadence\": [ 1 ],\n+\t\t \"channel_map\": { \"short\": 1 }\n+\t\t}\n+\t }\n+\t}\n ]\n }\ndiff --git a/src/ipa/rpi/vc4/data/imx708_noir.json b/src/ipa/rpi/vc4/data/imx708_noir.json\nindex 8d498153..eb0c7a95 100644\n--- a/src/ipa/rpi/vc4/data/imx708_noir.json\n+++ b/src/ipa/rpi/vc4/data/imx708_noir.json\n@@ -139,86 +139,255 @@\n {\n \"rpi.agc\":\n {\n- \"metering_modes\":\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- \"normal\":\n- {\n- \"shutter\": [ 100, 15000, 30000, 60000, 120000 ],\n- \"gain\": [ 1.0, 1.0, 2.0, 4.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- \"long\":\n- {\n- \"shutter\": [ 1000, 30000, 60000, 90000, 120000 ],\n- \"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.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.2,\n- 1000, 0.2\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.2,\n- 1000, 0.2\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- 0, 0.16,\n- 1000, 0.165,\n- 10000, 0.17\n- ],\n- \"startup_frames\": 5,\n- \"convergence_frames\": 6,\n- \"speed\": 0.15\n- }\n+\t\t\"channels\":\n+\t\t[\n+\t\t {\n+\t\t\t\"metering_modes\":\n+\t\t\t{\n+\t\t\t \"centre-weighted\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"spot\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"matrix\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"exposure_modes\":\n+\t\t\t{\n+\t\t\t \"normal\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 15000, 30000, 60000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 1.0, 2.0, 4.0, 6.0 ]\n+\t\t\t },\n+\t\t\t \"short\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 5000, 10000, 20000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]\n+\t\t\t },\n+\t\t\t \"long\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 1000, 30000, 60000, 90000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"constraint_modes\":\n+\t\t\t{\n+\t\t\t \"normal\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.2,\n+\t\t\t\t\t1000, 0.2\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"highlight\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.2,\n+\t\t\t\t\t1000, 0.2\n+\t\t\t\t ]\n+\t\t\t\t},\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"UPPER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.8,\n+\t\t\t\t\t1000, 0.8\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ]\n+\t\t\t},\n+\t\t\t\"y_target\":\n+\t\t\t[\n+\t\t\t 0, 0.16,\n+\t\t\t 1000, 0.165,\n+\t\t\t 10000, 0.17\n+\t\t\t],\n+\t\t\t\"startup_frames\": 5,\n+\t\t\t\"convergence_frames\": 6,\n+\t\t\t\"speed\": 0.15\n+\t\t },\n+\t\t {\n+\t\t\t\"base_ev\": 0.125,\n+\t\t\t\"metering_modes\":\n+\t\t\t{\n+\t\t\t \"centre-weighted\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"spot\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"matrix\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"exposure_modes\":\n+\t\t\t{\n+\t\t\t \"normal\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 15000, 30000, 60000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 1.0, 2.0, 4.0, 6.0 ]\n+\t\t\t },\n+\t\t\t \"short\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 5000, 10000, 20000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]\n+\t\t\t },\n+\t\t\t \"long\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 1000, 30000, 60000, 90000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"constraint_modes\":\n+\t\t\t{\n+\t\t\t \"normal\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.2,\n+\t\t\t\t\t1000, 0.2\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"highlight\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.2,\n+\t\t\t\t\t1000, 0.2\n+\t\t\t\t ]\n+\t\t\t\t},\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"UPPER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.8,\n+\t\t\t\t\t1000, 0.8\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ]\n+\t\t\t},\n+\t\t\t\"y_target\":\n+\t\t\t[\n+\t\t\t 0, 0.16,\n+\t\t\t 1000, 0.165,\n+\t\t\t 10000, 0.17\n+\t\t\t],\n+\t\t\t\"startup_frames\": 5,\n+\t\t\t\"convergence_frames\": 6,\n+\t\t\t\"speed\": 0.15\n+\t\t },\n+\t\t {\n+\t\t\t\"base_ev\": 1.5,\n+\t\t\t\"metering_modes\":\n+\t\t\t{\n+\t\t\t \"centre-weighted\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"spot\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"matrix\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"exposure_modes\":\n+\t\t\t{\n+\t\t\t \"normal\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 15000, 30000, 60000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 1.0, 2.0, 4.0, 6.0 ]\n+\t\t\t },\n+\t\t\t \"short\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 5000, 10000, 20000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]\n+\t\t\t },\n+\t\t\t \"long\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 1000, 30000, 60000, 90000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"constraint_modes\":\n+\t\t\t{\n+\t\t\t \"normal\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.2,\n+\t\t\t\t\t1000, 0.2\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"highlight\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.2,\n+\t\t\t\t\t1000, 0.2\n+\t\t\t\t ]\n+\t\t\t\t},\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"UPPER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.8,\n+\t\t\t\t\t1000, 0.8\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ]\n+\t\t\t},\n+\t\t\t\"y_target\":\n+\t\t\t[\n+\t\t\t 0, 0.16,\n+\t\t\t 1000, 0.165,\n+\t\t\t 10000, 0.17\n+\t\t\t],\n+\t\t\t\"startup_frames\": 5,\n+\t\t\t\"convergence_frames\": 6,\n+\t\t\t\"speed\": 0.15\n+\t\t }\n+\t\t]\n+\t }\n },\n {\n \"rpi.alsc\":\n@@ -556,6 +725,25 @@\n \"skip_frames\": 5,\n \"map\": [ 0.0, 445, 15.0, 925 ]\n }\n- }\n+ },\n+\t{\n+\t \"rpi.hdr\":\n+\t {\n+\t\t\"Off\":\n+\t\t{\n+\t\t \"cadence\": [ 0 ]\n+\t\t},\n+\t\t\"MultiExposure\":\n+\t\t{\n+\t\t \"cadence\": [ 1, 2 ],\n+\t\t \"channel_map\": { \"short\": 1, \"long\": 2 }\n+\t\t},\n+\t\t\"SingleExposure\":\n+\t\t{\n+\t\t \"cadence\": [ 1 ],\n+\t\t \"channel_map\": { \"short\": 1 }\n+\t\t}\n+\t }\n+\t}\n ]\n }\ndiff --git a/src/ipa/rpi/vc4/data/imx708_wide.json b/src/ipa/rpi/vc4/data/imx708_wide.json\nindex 14bc918e..cefaaaeb 100644\n--- a/src/ipa/rpi/vc4/data/imx708_wide.json\n+++ b/src/ipa/rpi/vc4/data/imx708_wide.json\n@@ -129,86 +129,255 @@\n {\n \"rpi.agc\":\n {\n- \"metering_modes\":\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- \"normal\":\n- {\n- \"shutter\": [ 100, 15000, 30000, 60000, 120000 ],\n- \"gain\": [ 1.0, 1.0, 2.0, 4.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- \"long\":\n- {\n- \"shutter\": [ 1000, 30000, 60000, 90000, 120000 ],\n- \"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.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.2,\n- 1000, 0.2\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.2,\n- 1000, 0.2\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- 0, 0.16,\n- 1000, 0.165,\n- 10000, 0.17\n- ],\n- \"startup_frames\": 5,\n- \"convergence_frames\": 6,\n- \"speed\": 0.15\n- }\n+\t\t\"channels\":\n+\t\t[\n+\t\t {\n+\t\t\t\"metering_modes\":\n+\t\t\t{\n+\t\t\t \"centre-weighted\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"spot\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"matrix\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"exposure_modes\":\n+\t\t\t{\n+\t\t\t \"normal\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 15000, 30000, 60000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 1.0, 2.0, 4.0, 6.0 ]\n+\t\t\t },\n+\t\t\t \"short\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 5000, 10000, 20000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]\n+\t\t\t },\n+\t\t\t \"long\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 1000, 30000, 60000, 90000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"constraint_modes\":\n+\t\t\t{\n+\t\t\t \"normal\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.2,\n+\t\t\t\t\t1000, 0.2\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"highlight\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.2,\n+\t\t\t\t\t1000, 0.2\n+\t\t\t\t ]\n+\t\t\t\t},\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"UPPER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.8,\n+\t\t\t\t\t1000, 0.8\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ]\n+\t\t\t},\n+\t\t\t\"y_target\":\n+\t\t\t[\n+\t\t\t 0, 0.16,\n+\t\t\t 1000, 0.165,\n+\t\t\t 10000, 0.17\n+\t\t\t],\n+\t\t\t\"startup_frames\": 5,\n+\t\t\t\"convergence_frames\": 6,\n+\t\t\t\"speed\": 0.15\n+\t\t },\n+\t\t {\n+\t\t\t\"base_ev\": 0.125,\n+\t\t\t\"metering_modes\":\n+\t\t\t{\n+\t\t\t \"centre-weighted\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"spot\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"matrix\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"exposure_modes\":\n+\t\t\t{\n+\t\t\t \"normal\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 15000, 30000, 60000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 1.0, 2.0, 4.0, 6.0 ]\n+\t\t\t },\n+\t\t\t \"short\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 5000, 10000, 20000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]\n+\t\t\t },\n+\t\t\t \"long\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 1000, 30000, 60000, 90000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"constraint_modes\":\n+\t\t\t{\n+\t\t\t \"normal\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.2,\n+\t\t\t\t\t1000, 0.2\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"highlight\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.2,\n+\t\t\t\t\t1000, 0.2\n+\t\t\t\t ]\n+\t\t\t\t},\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"UPPER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.8,\n+\t\t\t\t\t1000, 0.8\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ]\n+\t\t\t},\n+\t\t\t\"y_target\":\n+\t\t\t[\n+\t\t\t 0, 0.16,\n+\t\t\t 1000, 0.165,\n+\t\t\t 10000, 0.17\n+\t\t\t],\n+\t\t\t\"startup_frames\": 5,\n+\t\t\t\"convergence_frames\": 6,\n+\t\t\t\"speed\": 0.15\n+\t\t },\n+\t\t {\n+\t\t\t\"base_ev\": 1.5,\n+\t\t\t\"metering_modes\":\n+\t\t\t{\n+\t\t\t \"centre-weighted\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"spot\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"matrix\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"exposure_modes\":\n+\t\t\t{\n+\t\t\t \"normal\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 15000, 30000, 60000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 1.0, 2.0, 4.0, 6.0 ]\n+\t\t\t },\n+\t\t\t \"short\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 5000, 10000, 20000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]\n+\t\t\t },\n+\t\t\t \"long\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 1000, 30000, 60000, 90000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"constraint_modes\":\n+\t\t\t{\n+\t\t\t \"normal\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.2,\n+\t\t\t\t\t1000, 0.2\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"highlight\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.2,\n+\t\t\t\t\t1000, 0.2\n+\t\t\t\t ]\n+\t\t\t\t},\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"UPPER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.8,\n+\t\t\t\t\t1000, 0.8\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ]\n+\t\t\t},\n+\t\t\t\"y_target\":\n+\t\t\t[\n+\t\t\t 0, 0.16,\n+\t\t\t 1000, 0.165,\n+\t\t\t 10000, 0.17\n+\t\t\t],\n+\t\t\t\"startup_frames\": 5,\n+\t\t\t\"convergence_frames\": 6,\n+\t\t\t\"speed\": 0.15\n+\t\t }\n+\t\t]\n+\t }\n },\n {\n \"rpi.alsc\":\n@@ -459,6 +628,25 @@\n \"skip_frames\": 5,\n \"map\": [ 0.0, 420, 35.0, 920 ]\n }\n- }\n+ },\n+\t{\n+\t \"rpi.hdr\":\n+\t {\n+\t\t\"Off\":\n+\t\t{\n+\t\t \"cadence\": [ 0 ]\n+\t\t},\n+\t\t\"MultiExposure\":\n+\t\t{\n+\t\t \"cadence\": [ 1, 2 ],\n+\t\t \"channel_map\": { \"short\": 1, \"long\": 2 }\n+\t\t},\n+\t\t\"SingleExposure\":\n+\t\t{\n+\t\t \"cadence\": [ 1 ],\n+\t\t \"channel_map\": { \"short\": 1 }\n+\t\t}\n+\t }\n+\t}\n ]\n }\ndiff --git a/src/ipa/rpi/vc4/data/imx708_wide_noir.json b/src/ipa/rpi/vc4/data/imx708_wide_noir.json\nindex 49442c0f..de222f52 100644\n--- a/src/ipa/rpi/vc4/data/imx708_wide_noir.json\n+++ b/src/ipa/rpi/vc4/data/imx708_wide_noir.json\n@@ -129,86 +129,255 @@\n {\n \"rpi.agc\":\n {\n- \"metering_modes\":\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- \"normal\":\n- {\n- \"shutter\": [ 100, 15000, 30000, 60000, 120000 ],\n- \"gain\": [ 1.0, 1.0, 2.0, 4.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- \"long\":\n- {\n- \"shutter\": [ 1000, 30000, 60000, 90000, 120000 ],\n- \"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.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.2,\n- 1000, 0.2\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.2,\n- 1000, 0.2\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- 0, 0.16,\n- 1000, 0.165,\n- 10000, 0.17\n- ],\n- \"startup_frames\": 5,\n- \"convergence_frames\": 6,\n- \"speed\": 0.15\n- }\n+\t\t\"channels\":\n+\t\t[\n+\t\t {\n+\t\t\t\"metering_modes\":\n+\t\t\t{\n+\t\t\t \"centre-weighted\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"spot\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"matrix\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"exposure_modes\":\n+\t\t\t{\n+\t\t\t \"normal\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 15000, 30000, 60000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 1.0, 2.0, 4.0, 6.0 ]\n+\t\t\t },\n+\t\t\t \"short\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 5000, 10000, 20000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]\n+\t\t\t },\n+\t\t\t \"long\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 1000, 30000, 60000, 90000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"constraint_modes\":\n+\t\t\t{\n+\t\t\t \"normal\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.2,\n+\t\t\t\t\t1000, 0.2\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"highlight\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.2,\n+\t\t\t\t\t1000, 0.2\n+\t\t\t\t ]\n+\t\t\t\t},\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"UPPER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.8,\n+\t\t\t\t\t1000, 0.8\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ]\n+\t\t\t},\n+\t\t\t\"y_target\":\n+\t\t\t[\n+\t\t\t 0, 0.16,\n+\t\t\t 1000, 0.165,\n+\t\t\t 10000, 0.17\n+\t\t\t],\n+\t\t\t\"startup_frames\": 5,\n+\t\t\t\"convergence_frames\": 6,\n+\t\t\t\"speed\": 0.15\n+\t\t },\n+\t\t {\n+\t\t\t\"base_ev\": 0.125,\n+\t\t\t\"metering_modes\":\n+\t\t\t{\n+\t\t\t \"centre-weighted\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"spot\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"matrix\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"exposure_modes\":\n+\t\t\t{\n+\t\t\t \"normal\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 15000, 30000, 60000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 1.0, 2.0, 4.0, 6.0 ]\n+\t\t\t },\n+\t\t\t \"short\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 5000, 10000, 20000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]\n+\t\t\t },\n+\t\t\t \"long\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 1000, 30000, 60000, 90000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"constraint_modes\":\n+\t\t\t{\n+\t\t\t \"normal\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.2,\n+\t\t\t\t\t1000, 0.2\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"highlight\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.2,\n+\t\t\t\t\t1000, 0.2\n+\t\t\t\t ]\n+\t\t\t\t},\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"UPPER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.8,\n+\t\t\t\t\t1000, 0.8\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ]\n+\t\t\t},\n+\t\t\t\"y_target\":\n+\t\t\t[\n+\t\t\t 0, 0.16,\n+\t\t\t 1000, 0.165,\n+\t\t\t 10000, 0.17\n+\t\t\t],\n+\t\t\t\"startup_frames\": 5,\n+\t\t\t\"convergence_frames\": 6,\n+\t\t\t\"speed\": 0.15\n+\t\t },\n+\t\t {\n+\t\t\t\"base_ev\": 1.5,\n+\t\t\t\"metering_modes\":\n+\t\t\t{\n+\t\t\t \"centre-weighted\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"spot\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"matrix\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"exposure_modes\":\n+\t\t\t{\n+\t\t\t \"normal\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 15000, 30000, 60000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 1.0, 2.0, 4.0, 6.0 ]\n+\t\t\t },\n+\t\t\t \"short\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 5000, 10000, 20000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]\n+\t\t\t },\n+\t\t\t \"long\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 1000, 30000, 60000, 90000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"constraint_modes\":\n+\t\t\t{\n+\t\t\t \"normal\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.2,\n+\t\t\t\t\t1000, 0.2\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"highlight\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.2,\n+\t\t\t\t\t1000, 0.2\n+\t\t\t\t ]\n+\t\t\t\t},\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"UPPER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.8,\n+\t\t\t\t\t1000, 0.8\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ]\n+\t\t\t},\n+\t\t\t\"y_target\":\n+\t\t\t[\n+\t\t\t 0, 0.16,\n+\t\t\t 1000, 0.165,\n+\t\t\t 10000, 0.17\n+\t\t\t],\n+\t\t\t\"startup_frames\": 5,\n+\t\t\t\"convergence_frames\": 6,\n+\t\t\t\"speed\": 0.15\n+\t\t }\n+\t\t]\n+\t }\n },\n {\n \"rpi.alsc\":\n@@ -459,6 +628,25 @@\n \"skip_frames\": 5,\n \"map\": [ 0.0, 420, 35.0, 920 ]\n }\n- }\n+ },\n+\t{\n+\t \"rpi.hdr\":\n+\t {\n+\t\t\"Off\":\n+\t\t{\n+\t\t \"cadence\": [ 0 ]\n+\t\t},\n+\t\t\"MultiExposure\":\n+\t\t{\n+\t\t \"cadence\": [ 1, 2 ],\n+\t\t \"channel_map\": { \"short\": 1, \"long\": 2 }\n+\t\t},\n+\t\t\"SingleExposure\":\n+\t\t{\n+\t\t \"cadence\": [ 1 ],\n+\t\t \"channel_map\": { \"short\": 1 }\n+\t\t}\n+\t }\n+\t}\n ]\n }\ndiff --git a/src/ipa/rpi/vc4/data/ov5647.json b/src/ipa/rpi/vc4/data/ov5647.json\nindex d770e44f..ac9f3f30 100644\n--- a/src/ipa/rpi/vc4/data/ov5647.json\n+++ b/src/ipa/rpi/vc4/data/ov5647.json\n@@ -131,96 +131,285 @@\n {\n \"rpi.agc\":\n {\n- \"metering_modes\":\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- \"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- \"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- \"y_target\":\n- [\n- 0, 0.16,\n- 1000, 0.165,\n- 10000, 0.17\n- ],\n- \"base_ev\": 1.25\n- }\n+\t\t\"channels\":\n+\t\t[\n+\t\t {\n+\t\t\t\"metering_modes\":\n+\t\t\t{\n+\t\t\t \"centre-weighted\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"spot\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"matrix\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"exposure_modes\":\n+\t\t\t{\n+\t\t\t \"normal\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 66666 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"short\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 5000, 10000, 20000, 33333 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"long\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"constraint_modes\":\n+\t\t\t{\n+\t\t\t \"normal\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.5,\n+\t\t\t\t\t1000, 0.5\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"highlight\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.5,\n+\t\t\t\t\t1000, 0.5\n+\t\t\t\t ]\n+\t\t\t\t},\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"UPPER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.8,\n+\t\t\t\t\t1000, 0.8\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"shadows\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.0,\n+\t\t\t\t \"q_hi\": 0.5,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.17,\n+\t\t\t\t\t1000, 0.17\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ]\n+\t\t\t},\n+\t\t\t\"y_target\":\n+\t\t\t[\n+\t\t\t 0, 0.16,\n+\t\t\t 1000, 0.165,\n+\t\t\t 10000, 0.17\n+\t\t\t],\n+\t\t\t\"base_ev\": 1.25\n+\t\t },\n+\t\t {\n+\t\t\t\"base_ev\": 0.125,\n+\t\t\t\"metering_modes\":\n+\t\t\t{\n+\t\t\t \"centre-weighted\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"spot\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"matrix\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"exposure_modes\":\n+\t\t\t{\n+\t\t\t \"normal\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 66666 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"short\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 5000, 10000, 20000, 33333 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"long\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"constraint_modes\":\n+\t\t\t{\n+\t\t\t \"normal\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.5,\n+\t\t\t\t\t1000, 0.5\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"highlight\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.5,\n+\t\t\t\t\t1000, 0.5\n+\t\t\t\t ]\n+\t\t\t\t},\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"UPPER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.8,\n+\t\t\t\t\t1000, 0.8\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"shadows\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.0,\n+\t\t\t\t \"q_hi\": 0.5,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.17,\n+\t\t\t\t\t1000, 0.17\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ]\n+\t\t\t},\n+\t\t\t\"y_target\":\n+\t\t\t[\n+\t\t\t 0, 0.16,\n+\t\t\t 1000, 0.165,\n+\t\t\t 10000, 0.17\n+\t\t\t],\n+\t\t\t\"base_ev\": 1.25\n+\t\t },\n+\t\t {\n+\t\t\t\"base_ev\": 1.5,\n+\t\t\t\"metering_modes\":\n+\t\t\t{\n+\t\t\t \"centre-weighted\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"spot\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]\n+\t\t\t },\n+\t\t\t \"matrix\":\n+\t\t\t {\n+\t\t\t\t\"weights\": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"exposure_modes\":\n+\t\t\t{\n+\t\t\t \"normal\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 66666 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"short\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 5000, 10000, 20000, 33333 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n+\t\t\t },\n+\t\t\t \"long\":\n+\t\t\t {\n+\t\t\t\t\"shutter\": [ 100, 10000, 30000, 60000, 120000 ],\n+\t\t\t\t\"gain\": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]\n+\t\t\t }\n+\t\t\t},\n+\t\t\t\"constraint_modes\":\n+\t\t\t{\n+\t\t\t \"normal\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.5,\n+\t\t\t\t\t1000, 0.5\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"highlight\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.5,\n+\t\t\t\t\t1000, 0.5\n+\t\t\t\t ]\n+\t\t\t\t},\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"UPPER\",\n+\t\t\t\t \"q_lo\": 0.98,\n+\t\t\t\t \"q_hi\": 1.0,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.8,\n+\t\t\t\t\t1000, 0.8\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ],\n+\t\t\t \"shadows\": [\n+\t\t\t\t{\n+\t\t\t\t \"bound\": \"LOWER\",\n+\t\t\t\t \"q_lo\": 0.0,\n+\t\t\t\t \"q_hi\": 0.5,\n+\t\t\t\t \"y_target\":\n+\t\t\t\t [\n+\t\t\t\t\t0, 0.17,\n+\t\t\t\t\t1000, 0.17\n+\t\t\t\t ]\n+\t\t\t\t}\n+\t\t\t ]\n+\t\t\t},\n+\t\t\t\"y_target\":\n+\t\t\t[\n+\t\t\t 0, 0.16,\n+\t\t\t 1000, 0.165,\n+\t\t\t 10000, 0.17\n+\t\t\t],\n+\t\t\t\"base_ev\": 1.25\n+\t\t }\n+\t\t]\n+\t }\n },\n {\n \"rpi.alsc\":\n@@ -482,6 +671,25 @@\n },\n {\n \"rpi.sharpen\": { }\n- }\n+ },\n+\t{\n+\t \"rpi.hdr\":\n+\t {\n+\t\t\"Off\":\n+\t\t{\n+\t\t \"cadence\": [ 0 ]\n+\t\t},\n+\t\t\"MultiExposure\":\n+\t\t{\n+\t\t \"cadence\": [ 1, 2 ],\n+\t\t \"channel_map\": { \"short\": 1, \"long\": 2 }\n+\t\t},\n+\t\t\"SingleExposure\":\n+\t\t{\n+\t\t \"cadence\": [ 1 ],\n+\t\t \"channel_map\": { \"short\": 1 }\n+\t\t}\n+\t }\n+\t}\n ]\n-}\n\\ No newline at end of file\n+}\n","prefixes":["libcamera-devel","2/2"]}