Patch Detail
Show a patch.
GET /api/1.1/patches/14061/?format=api
{ "id": 14061, "url": "https://patchwork.libcamera.org/api/1.1/patches/14061/?format=api", "web_url": "https://patchwork.libcamera.org/patch/14061/", "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": "<20211006140041.964542-8-jeanmichel.hautbois@ideasonboard.com>", "date": "2021-10-06T14:00:37", "name": "[libcamera-devel,v3,07/12] ipa: ipu3: awb: Correct the relevant zones proportion", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "58b65d3810d432d2db005953d98c02fa709711b3", "submitter": { "id": 75, "url": "https://patchwork.libcamera.org/api/1.1/people/75/?format=api", "name": "Jean-Michel Hautbois", "email": "jeanmichel.hautbois@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/14061/mbox/", "series": [ { "id": 2605, "url": "https://patchwork.libcamera.org/api/1.1/series/2605/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2605", "date": "2021-10-06T14:00:30", "name": "Improve ImgU statistics usage", "version": 3, "mbox": "https://patchwork.libcamera.org/series/2605/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/14061/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/14061/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 E3E51C323E\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 6 Oct 2021 14:01:10 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A33F4691BF;\n\tWed, 6 Oct 2021 16:01:10 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 60136691C2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 6 Oct 2021 16:01:02 +0200 (CEST)", "from tatooine.ideasonboard.com (unknown\n\t[IPv6:2a01:e0a:169:7140:843b:c831:54de:6e8c])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1161E1909;\n\tWed, 6 Oct 2021 16:01:02 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"fPkpxKOL\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1633528862;\n\tbh=xoWuOp6/4P9/LAbzl7B9GMLLcrfZ/5bjwLZ3tnhnxGo=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=fPkpxKOLsqMY4imnE1QUo2W+4/h8T+2d2i9D2KGxRVZmiZmighYX3Uo04wZJ8gRVw\n\tEazXdAyDBKfGKeyFJ+rku4I5SnJbDkSN8bWi6Gztfhj3EBVNYwx6G6n9za1VbOgk9i\n\t/da7jTqhe5BAKG/JKiKLIcvUV6+N5STzpRfJweSA=", "From": "Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 6 Oct 2021 16:00:37 +0200", "Message-Id": "<20211006140041.964542-8-jeanmichel.hautbois@ideasonboard.com>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20211006140041.964542-1-jeanmichel.hautbois@ideasonboard.com>", "References": "<20211006140041.964542-1-jeanmichel.hautbois@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 07/12] ipa: ipu3: awb: Correct the\n\trelevant zones proportion", "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": "The algorithm uses the statistics of a cell only if there is not too\nmuch saturated pixels in it. The grey world algorithm works fine when\nthere are a limited number of outliers.\nConsider a valid zone to be at least 80% of unsaturated cells in it.\nThis value could very well be configurable, and make the algorithm more\nor less tolerant.\n\nWhile at it, implement it in a configure() call as it will not change\nduring execution, and cache the cellsPerZone values estimated with\nstd::round as we are using cmath.\n\nSigned-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/ipa/ipu3/algorithms/awb.cpp | 32 +++++++++++++++++++++++---------\n src/ipa/ipu3/algorithms/awb.h | 5 +++++\n 2 files changed, 28 insertions(+), 9 deletions(-)", "diff": "diff --git a/src/ipa/ipu3/algorithms/awb.cpp b/src/ipa/ipu3/algorithms/awb.cpp\nindex dba7cec3..1c294f31 100644\n--- a/src/ipa/ipu3/algorithms/awb.cpp\n+++ b/src/ipa/ipu3/algorithms/awb.cpp\n@@ -17,7 +17,6 @@ namespace ipa::ipu3::algorithms {\n \n LOG_DEFINE_CATEGORY(IPU3Awb)\n \n-static constexpr uint32_t kMinZonesCounted = 16;\n static constexpr uint32_t kMinGreenLevelInZone = 32;\n \n /**\n@@ -173,6 +172,24 @@ Awb::Awb()\n \n Awb::~Awb() = default;\n \n+int Awb::configure(IPAContext &context,\n+\t\t [[maybe_unused]] const IPAConfigInfo &configInfo)\n+{\n+\tconst ipu3_uapi_grid_config &grid = context.configuration.grid.bdsGrid;\n+\n+\tcellsPerZoneX_ = std::round(grid.width / static_cast<double>(kAwbStatsSizeX));\n+\tcellsPerZoneY_ = std::round(grid.height / static_cast<double>(kAwbStatsSizeY));\n+\n+\t/*\n+\t * Configure the minimum proportion of cells counted within a zone\n+\t * for it to be relevant for the grey world algorithm.\n+\t * \\todo This proportion could be configured.\n+\t */\n+\tcellsPerZoneThreshold_ = cellsPerZoneX_ * cellsPerZoneY_ * 80 / 100;\n+\n+\treturn 0;\n+}\n+\n /**\n * The function estimates the correlated color temperature using\n * from RGB color space input.\n@@ -209,7 +226,7 @@ void Awb::generateZones(std::vector<RGB> &zones)\n \tfor (unsigned int i = 0; i < kAwbStatsSizeX * kAwbStatsSizeY; i++) {\n \t\tRGB zone;\n \t\tdouble counted = awbStats_[i].counted;\n-\t\tif (counted >= kMinZonesCounted) {\n+\t\tif (counted >= cellsPerZoneThreshold_) {\n \t\t\tzone.G = awbStats_[i].sum.green / counted;\n \t\t\tif (zone.G >= kMinGreenLevelInZone) {\n \t\t\t\tzone.R = awbStats_[i].sum.red / counted;\n@@ -224,19 +241,16 @@ void Awb::generateZones(std::vector<RGB> &zones)\n void Awb::generateAwbStats(const ipu3_uapi_stats_3a *stats,\n \t\t\t const ipu3_uapi_grid_config &grid)\n {\n-\tuint32_t cellsPerZoneX = round(grid.width / static_cast<double>(kAwbStatsSizeX));\n-\tuint32_t cellsPerZoneY = round(grid.height / static_cast<double>(kAwbStatsSizeY));\n-\n \t/*\n \t * Generate a (kAwbStatsSizeX x kAwbStatsSizeY) array from the IPU3 grid which is\n \t * (grid.width x grid.height).\n \t */\n-\tfor (unsigned int cellY = 0; cellY < kAwbStatsSizeY * cellsPerZoneY; cellY++) {\n-\t\tfor (unsigned int cellX = 0; cellX < kAwbStatsSizeX * cellsPerZoneX; cellX++) {\n+\tfor (unsigned int cellY = 0; cellY < kAwbStatsSizeY * cellsPerZoneY_; cellY++) {\n+\t\tfor (unsigned int cellX = 0; cellX < kAwbStatsSizeX * cellsPerZoneX_; cellX++) {\n \t\t\tuint32_t cellPosition = (cellY * grid.width + cellX)\n \t\t\t\t\t * sizeof(Ipu3AwbCell);\n-\t\t\tuint32_t zoneX = cellX / cellsPerZoneX;\n-\t\t\tuint32_t zoneY = cellY / cellsPerZoneY;\n+\t\t\tuint32_t zoneX = cellX / cellsPerZoneX_;\n+\t\t\tuint32_t zoneY = cellY / cellsPerZoneY_;\n \n \t\t\tuint32_t awbZonePosition = zoneY * kAwbStatsSizeX + zoneX;\n \ndiff --git a/src/ipa/ipu3/algorithms/awb.h b/src/ipa/ipu3/algorithms/awb.h\nindex 3385ebe7..681d8c2b 100644\n--- a/src/ipa/ipu3/algorithms/awb.h\n+++ b/src/ipa/ipu3/algorithms/awb.h\n@@ -48,6 +48,7 @@ public:\n \tAwb();\n \t~Awb();\n \n+\tint configure(IPAContext &context, const IPAConfigInfo &configInfo) override;\n \tvoid prepare(IPAContext &context, ipu3_uapi_params *params) override;\n \tvoid process(IPAContext &context, const ipu3_uapi_stats_3a *stats) override;\n \n@@ -85,6 +86,10 @@ private:\n \tstd::vector<RGB> zones_;\n \tAccumulator awbStats_[kAwbStatsSizeX * kAwbStatsSizeY];\n \tAwbStatus asyncResults_;\n+\n+\tuint32_t cellsPerZoneX_;\n+\tuint32_t cellsPerZoneY_;\n+\tuint32_t cellsPerZoneThreshold_;\n };\n \n } /* namespace ipa::ipu3::algorithms */\n", "prefixes": [ "libcamera-devel", "v3", "07/12" ] }