Patch Detail
Show a patch.
GET /api/patches/13901/?format=api
{ "id": 13901, "url": "https://patchwork.libcamera.org/api/patches/13901/?format=api", "web_url": "https://patchwork.libcamera.org/patch/13901/", "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": "<20210923081625.60276-10-jeanmichel.hautbois@ideasonboard.com>", "date": "2021-09-23T08:16:22", "name": "[libcamera-devel,09/12] ipa: ipu3: awb: Use the line stride for the stats", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "d10ba95730760906cc4df742bf7a3254003c72e3", "submitter": { "id": 75, "url": "https://patchwork.libcamera.org/api/people/75/?format=api", "name": "Jean-Michel Hautbois", "email": "jeanmichel.hautbois@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/13901/mbox/", "series": [ { "id": 2548, "url": "https://patchwork.libcamera.org/api/series/2548/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2548", "date": "2021-09-23T08:16:13", "name": "Improve ImgU statistics usage", "version": 1, "mbox": "https://patchwork.libcamera.org/series/2548/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/13901/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/13901/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 EF3AFBF01C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 23 Sep 2021 08:16:44 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A7ADB6919C;\n\tThu, 23 Sep 2021 10:16:44 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 01BE56918F\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 23 Sep 2021 10:16:32 +0200 (CEST)", "from tatooine.ideasonboard.com (unknown\n\t[IPv6:2a01:e0a:169:7140:392e:dcd2:2bf6:d61c])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B7FF045E;\n\tThu, 23 Sep 2021 10:16:31 +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=\"THzFjLA4\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1632384991;\n\tbh=1JTuSko7vN52UYfnqgnfaQBoiynJsBf2q8zvXTBb4lM=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=THzFjLA4Z7B6Ky5JWO/MRhfstBD7wXg0wJkBYuFteRk+k3zfTrau5OR2H3LBck1Gq\n\tuB9PRBEpFv1vjUSprxHdYE/0CLX31yfkjLIcYgjKOnX7Q0RHSCmUh7QdHcAkU/RjdU\n\t+BwLkDKz7rmtThoEn4j3rO7jMAuajJHCOKLAVl4U=", "From": "Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 23 Sep 2021 10:16:22 +0200", "Message-Id": "<20210923081625.60276-10-jeanmichel.hautbois@ideasonboard.com>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20210923081625.60276-1-jeanmichel.hautbois@ideasonboard.com>", "References": "<20210923081625.60276-1-jeanmichel.hautbois@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 09/12] ipa: ipu3: awb: Use the line stride\n\tfor the stats", "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 statistics buffer 'ipu3_uapi_awb_raw_buffer' stores the ImgU\ncalculation results in a buffer aligned to a multiple of 4. The AWB loop\nshould take care of it to add the proper offset between lines and avoid\nany staircase effect.\n\nIt is now no more required to pass the grid configuration context to the\nprivate functions called from process() which simplifies the code flow.\n\nSigned-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>\n---\n src/ipa/ipu3/algorithms/awb.cpp | 16 ++++++++--------\n src/ipa/ipu3/algorithms/awb.h | 7 +++----\n 2 files changed, 11 insertions(+), 12 deletions(-)", "diff": "diff --git a/src/ipa/ipu3/algorithms/awb.cpp b/src/ipa/ipu3/algorithms/awb.cpp\nindex 8a926691..a5391653 100644\n--- a/src/ipa/ipu3/algorithms/awb.cpp\n+++ b/src/ipa/ipu3/algorithms/awb.cpp\n@@ -172,8 +172,10 @@ 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+\t/* The grid is aligned to the next multiple of 4 */\n+\tstride_ = (grid.width + 3) / 4 * 4;\n \n-\tcellsPerZoneX_ = round(grid.width / static_cast<double>(kAwbStatsSizeX));\n+\tcellsPerZoneX_ = round(stride_ / static_cast<double>(kAwbStatsSizeX));\n \tcellsPerZoneY_ = round(grid.height / static_cast<double>(kAwbStatsSizeY));\n \n \t/*\n@@ -234,8 +236,7 @@ void Awb::generateZones(std::vector<RGB> &zones)\n }\n \n /* Translate the IPU3 statistics into the default statistics zone array */\n-void Awb::generateAwbStats(const ipu3_uapi_stats_3a *stats,\n-\t\t\t const ipu3_uapi_grid_config &grid)\n+void Awb::generateAwbStats(const ipu3_uapi_stats_3a *stats)\n {\n \t/*\n \t * Generate a (kAwbStatsSizeX x kAwbStatsSizeY) array from the IPU3 grid which is\n@@ -243,7 +244,7 @@ void Awb::generateAwbStats(const ipu3_uapi_stats_3a *stats,\n \t */\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\tuint32_t cellPosition = (cellY * stride_ + 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@@ -318,13 +319,12 @@ void Awb::awbGreyWorld()\n \tasyncResults_.blueGain = blueGain;\n }\n \n-void Awb::calculateWBGains(const ipu3_uapi_stats_3a *stats,\n-\t\t\t const ipu3_uapi_grid_config &grid)\n+void Awb::calculateWBGains(const ipu3_uapi_stats_3a *stats)\n {\n \tASSERT(stats->stats_3a_status.awb_en);\n \tzones_.clear();\n \tclearAwbStats();\n-\tgenerateAwbStats(stats, grid);\n+\tgenerateAwbStats(stats);\n \tgenerateZones(zones_);\n \tLOG(IPU3Awb, Debug) << \"Valid zones: \" << zones_.size();\n \tif (zones_.size() > 10) {\n@@ -336,7 +336,7 @@ void Awb::calculateWBGains(const ipu3_uapi_stats_3a *stats,\n \n void Awb::process(IPAContext &context, const ipu3_uapi_stats_3a *stats)\n {\n-\tcalculateWBGains(stats, context.configuration.grid.bdsGrid);\n+\tcalculateWBGains(stats);\n \n \t/*\n \t * Gains are only recalculated if enough zones were detected.\ndiff --git a/src/ipa/ipu3/algorithms/awb.h b/src/ipa/ipu3/algorithms/awb.h\nindex 681d8c2b..b3e0ad82 100644\n--- a/src/ipa/ipu3/algorithms/awb.h\n+++ b/src/ipa/ipu3/algorithms/awb.h\n@@ -74,11 +74,9 @@ public:\n \t};\n \n private:\n-\tvoid calculateWBGains(const ipu3_uapi_stats_3a *stats,\n-\t\t\t const ipu3_uapi_grid_config &grid);\n+\tvoid calculateWBGains(const ipu3_uapi_stats_3a *stats);\n \tvoid generateZones(std::vector<RGB> &zones);\n-\tvoid generateAwbStats(const ipu3_uapi_stats_3a *stats,\n-\t\t\t const ipu3_uapi_grid_config &grid);\n+\tvoid generateAwbStats(const ipu3_uapi_stats_3a *stats);\n \tvoid clearAwbStats();\n \tvoid awbGreyWorld();\n \tuint32_t estimateCCT(double red, double green, double blue);\n@@ -87,6 +85,7 @@ private:\n \tAccumulator awbStats_[kAwbStatsSizeX * kAwbStatsSizeY];\n \tAwbStatus asyncResults_;\n \n+\tuint32_t stride_;\n \tuint32_t cellsPerZoneX_;\n \tuint32_t cellsPerZoneY_;\n \tuint32_t cellsPerZoneThreshold_;\n", "prefixes": [ "libcamera-devel", "09/12" ] }