Patch Detail
Show a patch.
GET /api/patches/21496/?format=api
{ "id": 21496, "url": "https://patchwork.libcamera.org/api/patches/21496/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21496/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20241003080228.25438-3-naush@raspberrypi.com>", "date": "2024-10-03T08:02:27", "name": "[v2,2/2] ipa: rpi: awb: Add a bias to the AWB search", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "68e6717b3bdc490e7763f11388ee460c5a500f1b", "submitter": { "id": 34, "url": "https://patchwork.libcamera.org/api/people/34/?format=api", "name": "Naushir Patuck", "email": "naush@raspberrypi.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/21496/mbox/", "series": [ { "id": 4652, "url": "https://patchwork.libcamera.org/api/series/4652/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4652", "date": "2024-10-03T08:02:25", "name": "RPi: AWB bias", "version": 2, "mbox": "https://patchwork.libcamera.org/series/4652/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/21496/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21496/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 762CFC3263\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 3 Oct 2024 08:02:21 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D100763528;\n\tThu, 3 Oct 2024 10:02:19 +0200 (CEST)", "from mail-wm1-x330.google.com (mail-wm1-x330.google.com\n\t[IPv6:2a00:1450:4864:20::330])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9D58E6351F\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 3 Oct 2024 10:02:14 +0200 (CEST)", "by mail-wm1-x330.google.com with SMTP id\n\t5b1f17b1804b1-42f7e1fcb8dso988945e9.2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 03 Oct 2024 01:02:14 -0700 (PDT)", "from naush-laptop.pitowers.org ([93.93.133.154])\n\tby smtp.gmail.com with ESMTPSA id\n\tffacd0b85a97d-37d082a6b69sm684952f8f.88.2024.10.03.01.02.13\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 03 Oct 2024 01:02:13 -0700 (PDT)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=raspberrypi.com header.i=@raspberrypi.com\n\theader.b=\"jSOa8Fyh\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google; t=1727942534; x=1728547334;\n\tdarn=lists.libcamera.org; \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=OF6k+gO/gUrGIO7nDwWvyOjqLkIrghDFrQyp/14hJlU=;\n\tb=jSOa8Fyh7AfE2rYA/3kuk+3GTqCepYYLVd0HGyo6kNRd5pBWpJoIlEwJ4dFsb4cLZ0\n\tSKnNRSwXMt+VffNBu7nNJD7R1kngp35FBKKxqGhRQMLVL7Z9WXfAWsTbL9zqmLHDS4/M\n\tOuZNr6Xm1kDMF6Tc3eA6Yc/KeWC4ig+fJXb38GmOrm9mgXjXq3Mv2j8shgbbnw9Ox09S\n\t1ibKyfL3l5Dqg55g1EddJBK9JXeVPGg91IXFmEJ3fijktk2XpreUS6ZEypx02bcDlIsu\n\tkJFAg1TeHSiLNMcotzUZV3+Ba/Fofy+TAa94BhaypTWhctiD5EQx9wRnkvyQpn1t9Mxc\n\tM1ng==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1727942534; x=1728547334;\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=OF6k+gO/gUrGIO7nDwWvyOjqLkIrghDFrQyp/14hJlU=;\n\tb=CPRR0rIl5HY2pkcSyjbcHrTfT/31dguc7ocgpTcgESAGI8a6whfJuedzkPaSLDfPUK\n\tCngu/rt2WJA2kvtOjO/K5LsnY6PTQsC1evv6iWeiJHQ5r1I3rz6J/Bmet3057zH5MLJc\n\tkxGuIHHlygbghOl7BhbKYLPc2i4yLb8Il4Fxw/Vm2aFvGKGHwLDc9tO3nz4dOIxl4VKU\n\tVlyHNSSKj89L2UrEMDDRo8OupRlDaIrqv8GTd0A4oPYlRZRMLJZtGZp+hCxKnW7KuLFX\n\t7G6NSJsw5PJs/fhQ9QQfC8vPXV1n+DmVjS3dkOvkTt3mKMg3xHmoZm4BC4G9SwNbSrkw\n\tZ4nA==", "X-Gm-Message-State": "AOJu0Yy/OackCYL3Y7MnIg76ii41lNxvLYPRVL8uv3uHHCtMCsT4uEP8\n\trHnvjty9FBZ3fYDszixaq5kVWRH/4JBGGU4L6CrttD77qZSrlokpp4OqMqWSpoRQFFr5+eqUWeq\n\t6", "X-Google-Smtp-Source": "AGHT+IH8vG90nBXVuCn1eLbIat36oVHe9/n/o8GU8agxBwrATTvtzmBqwtVV3xBskPqiDH5bGAywgg==", "X-Received": "by 2002:a5d:5f82:0:b0:374:c92b:80a0 with SMTP id\n\tffacd0b85a97d-37cfb8b6267mr2096649f8f.3.1727942533707; \n\tThu, 03 Oct 2024 01:02:13 -0700 (PDT)", "From": "Naushir Patuck <naush@raspberrypi.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Naushir Patuck <naush@raspberrypi.com>,\n\tDavid Plowman <david.plowman@raspberrypi.com>", "Subject": "[PATCH v2 2/2] ipa: rpi: awb: Add a bias to the AWB search", "Date": "Thu, 3 Oct 2024 09:02:27 +0100", "Message-Id": "<20241003080228.25438-3-naush@raspberrypi.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20241003080228.25438-1-naush@raspberrypi.com>", "References": "<20241003080228.25438-1-naush@raspberrypi.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "In the case of an AWB search failure, the current algorithm logic will\nreturn a point on the CT curve closest to where the search finisned.\nThis can be quite undesirable. Instead, add some bias params to the AWB\nalgorithm which will direct the search to a set CT value in the case\nwhere statistics become unreliable causing the search to fail.\n\nSigned-off-by: Naushir Patuck <naush@raspberrypi.com>\nReviewed-by: David Plowman <david.plowman@raspberrypi.com>\n---\n src/ipa/rpi/controller/rpi/awb.cpp | 23 +++++++++++++++++++++--\n src/ipa/rpi/controller/rpi/awb.h | 4 ++++\n 2 files changed, 25 insertions(+), 2 deletions(-)", "diff": "diff --git a/src/ipa/rpi/controller/rpi/awb.cpp b/src/ipa/rpi/controller/rpi/awb.cpp\nindex 3904fed615f7..2ab405ef395a 100644\n--- a/src/ipa/rpi/controller/rpi/awb.cpp\n+++ b/src/ipa/rpi/controller/rpi/awb.cpp\n@@ -169,6 +169,14 @@ int AwbConfig::read(const libcamera::YamlObject ¶ms)\n \twhitepointB = params[\"whitepoint_b\"].get<double>(0.0);\n \tif (bayes == false)\n \t\tsensitivityR = sensitivityB = 1.0; /* nor do sensitivities make any sense */\n+\t/*\n+\t * The biasProportion parameter adds a small proportion of the counted\n+\t * pixles to a region biased to the biasCT colour temperature.\n+\t *\n+\t * A typical value for biasProportion would be between 0.05 to 0.1.\n+\t */\n+\tbiasProportion = params[\"bias_proportion\"].get<double>(0.0);\n+\tbiasCT = params[\"bias_ct\"].get<double>(DefaultCT);\n \treturn 0;\n }\n \n@@ -409,7 +417,8 @@ void Awb::asyncFunc()\n \n static void generateStats(std::vector<Awb::RGB> &zones,\n \t\t\t StatisticsPtr &stats, double minPixels,\n-\t\t\t double minG, Metadata &globalMetadata)\n+\t\t\t double minG, Metadata &globalMetadata,\n+\t\t\t double biasProportion, double biasCtR, double biasCtB)\n {\n \tstd::scoped_lock<RPiController::Metadata> l(globalMetadata);\n \n@@ -422,6 +431,14 @@ static void generateStats(std::vector<Awb::RGB> &zones,\n \t\t\t\tcontinue;\n \t\t\tzone.R = region.val.rSum / region.counted;\n \t\t\tzone.B = region.val.bSum / region.counted;\n+\t\t\t/*\n+\t\t\t * Add some bias samples to allow the search to tend to a\n+\t\t\t * bias CT in failure cases.\n+\t\t\t */\n+\t\t\tconst unsigned int proportion = biasProportion * region.counted;\n+\t\t\tzone.R += proportion * biasCtR;\n+\t\t\tzone.B += proportion * biasCtB;\n+\t\t\tzone.G += proportion * 1.0;\n \t\t\t/* Factor in the ALSC applied colour shading correction if required. */\n \t\t\tconst AlscStatus *alscStatus = globalMetadata.getLocked<AlscStatus>(\"alsc.status\");\n \t\t\tif (stats->colourStatsPos == Statistics::ColourStatsPos::PreLsc && alscStatus) {\n@@ -442,7 +459,9 @@ void Awb::prepareStats()\n \t * any LSC compensation. We also ignore config_.fast in this version.\n \t */\n \tgenerateStats(zones_, statistics_, config_.minPixels,\n-\t\t config_.minG, getGlobalMetadata());\n+\t\t config_.minG, getGlobalMetadata(),\n+\t\t config_.biasProportion, config_.ctR.eval(config_.biasCT),\n+\t\t config_.ctB.eval(config_.biasCT));\n \t/*\n \t * apply sensitivities, so values appear to come from our \"canonical\"\n \t * sensor.\ndiff --git a/src/ipa/rpi/controller/rpi/awb.h b/src/ipa/rpi/controller/rpi/awb.h\nindex ab30f4fa51c1..5d628b47c8a6 100644\n--- a/src/ipa/rpi/controller/rpi/awb.h\n+++ b/src/ipa/rpi/controller/rpi/awb.h\n@@ -87,6 +87,10 @@ struct AwbConfig {\n \tdouble whitepointR;\n \tdouble whitepointB;\n \tbool bayes; /* use Bayesian algorithm */\n+\t/* proportion of counted samples to add for the search bias */\n+\tdouble biasProportion;\n+\t/* CT target for the search bias */\n+\tdouble biasCT;\n };\n \n class Awb : public AwbAlgorithm\n", "prefixes": [ "v2", "2/2" ] }