Patch Detail
Show a patch.
GET /api/patches/13992/?format=api
{ "id": 13992, "url": "https://patchwork.libcamera.org/api/patches/13992/?format=api", "web_url": "https://patchwork.libcamera.org/patch/13992/", "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": "<20210930093715.73293-10-jeanmichel.hautbois@ideasonboard.com>", "date": "2021-09-30T09:37:12", "name": "[libcamera-devel,v2,09/12] ipa: ipu3: awb: Use the line stride for the stats", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "1a0b6eeba41d9d6a429a0b973e7c230872e094e8", "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/13992/mbox/", "series": [ { "id": 2587, "url": "https://patchwork.libcamera.org/api/series/2587/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2587", "date": "2021-09-30T09:37:03", "name": "Improve ImgU statistics usage", "version": 2, "mbox": "https://patchwork.libcamera.org/series/2587/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/13992/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/13992/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 B8926BDC71\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 30 Sep 2021 09:37:33 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7FEA8691C1;\n\tThu, 30 Sep 2021 11:37:33 +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 9E0A6691AB\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 30 Sep 2021 11:37:21 +0200 (CEST)", "from tatooine.ideasonboard.com (unknown\n\t[IPv6:2a01:e0a:169:7140:bab4:22c5:662d:e478])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4BA6E2A8;\n\tThu, 30 Sep 2021 11:37:21 +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=\"KcMrLLol\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1632994641;\n\tbh=ZLFmS98jA8/xD2N95JpMrotLaquSujewNAr3ohOfz5o=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=KcMrLLolGO+nHBNCWJ9OZNR0gwNgALG8usowq62DRiqoyaeqVVtotNxGzi1CtN82u\n\t2eDR54zKDHtIc8hfFBLqAHqKLWMiYKmyLE8Agn6cKFbGfwLZXt8FQxk1EHbaLOhF87\n\t0NS2ZhHyNb9GNWDdRfGiexfbXdHBc0gnCL105S+k=", "From": "Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 30 Sep 2021 11:37:12 +0200", "Message-Id": "<20210930093715.73293-10-jeanmichel.hautbois@ideasonboard.com>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20210930093715.73293-1-jeanmichel.hautbois@ideasonboard.com>", "References": "<20210930093715.73293-1-jeanmichel.hautbois@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 09/12] ipa: ipu3: awb: Use the line\n\tstride for 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 horizontally to a multiple of 4\ncells. The AWB loop should take care of it to add the proper offset\nbetween lines and avoid any 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>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n---\n src/ipa/ipu3/algorithms/awb.cpp | 13 ++++++-------\n src/ipa/ipu3/algorithms/awb.h | 7 +++----\n src/ipa/ipu3/ipa_context.h | 1 +\n src/ipa/ipu3/ipu3.cpp | 3 +++\n 4 files changed, 13 insertions(+), 11 deletions(-)", "diff": "diff --git a/src/ipa/ipu3/algorithms/awb.cpp b/src/ipa/ipu3/algorithms/awb.cpp\nindex c1ff9450..fcd1469f 100644\n--- a/src/ipa/ipu3/algorithms/awb.cpp\n+++ b/src/ipa/ipu3/algorithms/awb.cpp\n@@ -172,6 +172,7 @@ 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+\tstride_ = context.configuration.grid.stride;\n \n \tcellsPerZoneX_ = std::round(grid.width / static_cast<double>(kAwbStatsSizeX));\n \tcellsPerZoneY_ = std::round(grid.height / static_cast<double>(kAwbStatsSizeY));\n@@ -234,8 +235,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 +243,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 +318,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 +335,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_;\ndiff --git a/src/ipa/ipu3/ipa_context.h b/src/ipa/ipu3/ipa_context.h\nindex 9d9444dc..5bab684c 100644\n--- a/src/ipa/ipu3/ipa_context.h\n+++ b/src/ipa/ipu3/ipa_context.h\n@@ -20,6 +20,7 @@ struct IPASessionConfiguration {\n \tstruct {\n \t\tipu3_uapi_grid_config bdsGrid;\n \t\tSize bdsOutputSize;\n+\t\tuint32_t stride;\n \t} grid;\n };\n \ndiff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\nindex 757a5d50..b33e8c77 100644\n--- a/src/ipa/ipu3/ipu3.cpp\n+++ b/src/ipa/ipu3/ipu3.cpp\n@@ -352,6 +352,9 @@ void IPAIPU3::calculateBdsGrid(const Size &bdsOutputSize)\n \tbdsGrid.height = best.height >> bestLog2.height;\n \tbdsGrid.block_height_log2 = bestLog2.height;\n \n+\t/* The grid width is aligned to the next multiple of 4 */\n+\tcontext_.configuration.grid.stride = utils::alignUp(bdsGrid.width, 4);\n+\n \tLOG(IPAIPU3, Debug) << \"Best grid found is: (\"\n \t\t\t << (int)bdsGrid.width << \" << \" << (int)bdsGrid.block_width_log2 << \") x (\"\n \t\t\t << (int)bdsGrid.height << \" << \" << (int)bdsGrid.block_height_log2 << \")\";\n", "prefixes": [ "libcamera-devel", "v2", "09/12" ] }