Patch Detail
Show a patch.
GET /api/1.1/patches/18958/?format=api
{ "id": 18958, "url": "https://patchwork.libcamera.org/api/1.1/patches/18958/?format=api", "web_url": "https://patchwork.libcamera.org/patch/18958/", "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": "<20230823144925.2542-3-david.plowman@raspberrypi.com>", "date": "2023-08-23T14:49:25", "name": "[libcamera-devel,v2,2/2] ipa: rpi: vc4: data: Update tuning files for HDR", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "65649d174f6d32a3bb7539ec2aadf994a3c55119", "submitter": { "id": 42, "url": "https://patchwork.libcamera.org/api/1.1/people/42/?format=api", "name": "David Plowman", "email": "david.plowman@raspberrypi.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/18958/mbox/", "series": [ { "id": 4007, "url": "https://patchwork.libcamera.org/api/1.1/series/4007/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4007", "date": "2023-08-23T14:49:23", "name": "HDR for Raspberry Pi", "version": 2, "mbox": "https://patchwork.libcamera.org/series/4007/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/18958/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/18958/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 1D352BE080\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 23 Aug 2023 14:49:35 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BE31D627E0;\n\tWed, 23 Aug 2023 16:49:34 +0200 (CEST)", "from mail-wm1-x332.google.com (mail-wm1-x332.google.com\n\t[IPv6:2a00:1450:4864:20::332])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0496B627DF\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 23 Aug 2023 16:49:31 +0200 (CEST)", "by mail-wm1-x332.google.com with SMTP id\n\t5b1f17b1804b1-3fee8af9cb9so36718645e9.1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 23 Aug 2023 07:49:31 -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\tk15-20020a7bc40f000000b003feef9a6cb2sm10983535wmi.28.2023.08.23.07.49.28\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 23 Aug 2023 07:49:29 -0700 (PDT)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1692802174;\n\tbh=nb6uF+o6t+5QUaXN2SHBpbrUvLjFvQlRlkdqFeRw/KQ=;\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=NhB1eTUvw4en8TQ6bIRvtZoB6od05B+ff/obmGlesrCehjSqyKZc3TibOUhmKRulX\n\tfOWR+188yQo1Kv5/uiPrt2kT1MNFproyn/ng8h8mPRhbiUgGctpwaVdC4Kkl7m2xYC\n\t/Ave9UwaVOkDkik3NEreEuKVffvuYWJ3RuzlhGHcgt9I3Se6ZwR7ORH1DtuuzC7dnl\n\t6BWSseH7rVJQXWQ314zsYz758+6N7dcxT2QN8X+zgB3U4oRBTVgRiwYdh526AXLWqT\n\tPTHu2+C4c6AGgwPXOFSFn3oIn0kejG5Qx6QEJ8uRBikwYAX/qccz3TwfzCsjswyWem\n\tpVa3fGkKS0GTg==", "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google; t=1692802171; x=1693406971;\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=4VK91kViVDJb2jFRtNmqS/0/E+J4AJ51tC5pFB+2zzg=;\n\tb=ea/oWgXU1qJuf6FqwVLjjqbiGBj25Hcf4HrUwn+tD+ZGKxPKs0WrWTwQai8kO0tDH2\n\tLHhxUa/JFYjOqXbz04mbd797QlJMAf/oT4va5b1Y4shaSiaRpecEEnglRdgl5AonTaym\n\tSZfsA2CH6mMAf8yPhAemnzcJp99uoKAuTNEGXhhFLS1uvvf8L8FvGClAKDl8Vv3GxkIw\n\tw7qmAPCks7Iska2Yame99pE2LhVqUs7otyHcZlU0Zx+UyXy4uV+GTw2n/sIuucqjsKq3\n\t4T56iENMWR84B4c9tpM4uTlQl3vH2PM3UQo2Yzzyv8X4r9nzYTUi1vB7YnRuDCscH4ee\n\tl4ZA==" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"ea/oWgXU\"; dkim-atps=neutral", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20221208; t=1692802171; x=1693406971;\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=4VK91kViVDJb2jFRtNmqS/0/E+J4AJ51tC5pFB+2zzg=;\n\tb=A7AbcfWA6Dhy4+BpWsUifAWEiI7rus69cEc3dxJiFEUshkmlG7cmBxxg8XP9q/B7Ws\n\tN6nY6Pu5rYudqWMEWiF9DkAcWALpqe8jQ2o6sqSefrPP0Qb/rFrh9SVmtEirGyKGEV/m\n\tEvx09UYcvfLnf780kQ5mw/V8LFk1KDr+q7GyaWWbib08peizYlpRCdvl3aSordodrPJQ\n\t+jxRrjrLTpM23RUa2cjBOh79/hO/xqP+tERdQRGMXzdL3JkCMngLXSiN4z2LWzZlWWkx\n\tq+e1DkHCiNhMB5cY1qJmWBRKqjTQtH5cdB3U0TMvbRmnaRjjb/cIhjirudRUy6vInhbm\n\tZQFw==", "X-Gm-Message-State": "AOJu0YwLtPmWGT39VLzHXTEkUAdrRGD3QZZjyQTeqhKiqUICLBKP/yix\n\tYlIhZfmJ8c/SJLw24hbTaLYEhxKxhGXzx7WkYyg=", "X-Google-Smtp-Source": "AGHT+IGK6Lt3nhO8OUi4YRF6S2lcL33TmsJiSX7rGiVqjIlXtowJiGq23q+RKCF3k3HBNXHJb8UkGA==", "X-Received": "by 2002:a7b:c38b:0:b0:3fa:71db:56ff with SMTP id\n\ts11-20020a7bc38b000000b003fa71db56ffmr9711960wmj.40.1692802169930; \n\tWed, 23 Aug 2023 07:49:29 -0700 (PDT)", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 23 Aug 2023 15:49:25 +0100", "Message-Id": "<20230823144925.2542-3-david.plowman@raspberrypi.com>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20230823144925.2542-1-david.plowman@raspberrypi.com>", "References": "<20230823144925.2542-1-david.plowman@raspberrypi.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 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": "<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": "David Plowman via libcamera-devel <libcamera-devel@lists.libcamera.org>", "Reply-To": "David Plowman <david.plowman@raspberrypi.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "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 <david.plowman@raspberrypi.com>\n---\n src/ipa/rpi/vc4/data/imx219.json | 384 +++++++++++++++-----\n src/ipa/rpi/vc4/data/imx219_noir.json | 384 +++++++++++++++-----\n src/ipa/rpi/vc4/data/imx477.json | 376 +++++++++++++++-----\n src/ipa/rpi/vc4/data/imx477_noir.json | 384 +++++++++++++++-----\n src/ipa/rpi/vc4/data/imx708.json | 346 +++++++++++++-----\n src/ipa/rpi/vc4/data/imx708_noir.json | 346 +++++++++++++-----\n src/ipa/rpi/vc4/data/imx708_wide.json | 346 +++++++++++++-----\n src/ipa/rpi/vc4/data/imx708_wide_noir.json | 346 +++++++++++++-----\n src/ipa/rpi/vc4/data/ov5647.json | 388 ++++++++++++++++-----\n 9 files changed, 2524 insertions(+), 776 deletions(-)", "diff": "diff --git a/src/ipa/rpi/vc4/data/imx219.json b/src/ipa/rpi/vc4/data/imx219.json\nindex e8fce164..54defc0b 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@@ -463,6 +650,21 @@\n },\n {\n \"rpi.sharpen\": { }\n- }\n+ },\n+\t{\n+\t \"rpi.hdr\":\n+\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..e823a90d 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,21 @@\n },\n {\n \"rpi.sharpen\": { }\n- }\n+ },\n+\t{\n+\t \"rpi.hdr\":\n+\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 0e39d419..853bfa67 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+\t\t\"channels\":\n+\t\t[\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+\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- \"shutter\": [ 100, 10000, 30000, 60000, 66666 ],\n- \"gain\": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]\n- },\n- \"short\":\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- \"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\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@@ -468,6 +655,21 @@\n },\n {\n \"rpi.sharpen\": { }\n- }\n+ },\n+\t{\n+\t \"rpi.hdr\":\n+\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\ndiff --git a/src/ipa/rpi/vc4/data/imx477_noir.json b/src/ipa/rpi/vc4/data/imx477_noir.json\nindex 52d7f072..143e20bd 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,21 @@\n },\n {\n \"rpi.sharpen\": { }\n- }\n+ },\n+\t{\n+\t \"rpi.hdr\":\n+\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 c40a5994..26aafc95 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@@ -457,6 +626,21 @@\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\"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..8259ca4d 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,21 @@\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\"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 65543628..0f846ea2 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@@ -468,6 +637,21 @@\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\"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..f12ddbb6 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,21 @@\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\"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 a1b42a18..4def9ffc 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@@ -464,6 +653,21 @@\n },\n {\n \"rpi.sharpen\": { }\n- }\n+ },\n+\t{\n+\t \"rpi.hdr\":\n+\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", "v2", "2/2" ] }