{"id":13825,"url":"https://patchwork.libcamera.org/api/1.1/patches/13825/?format=json","web_url":"https://patchwork.libcamera.org/patch/13825/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210913132803.54881-4-jeanmichel.hautbois@ideasonboard.com>","date":"2021-09-13T13:28:01","name":"[libcamera-devel,v7,3/5] ipa: ipu3: Change Accumulator structure layout","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"4f7b9ddfe9fdf1f24d86e2611be2355043f6efc2","submitter":{"id":75,"url":"https://patchwork.libcamera.org/api/1.1/people/75/?format=json","name":"Jean-Michel Hautbois","email":"jeanmichel.hautbois@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/13825/mbox/","series":[{"id":2522,"url":"https://patchwork.libcamera.org/api/1.1/series/2522/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2522","date":"2021-09-13T13:27:58","name":"Move and improve AWB structures","version":7,"mbox":"https://patchwork.libcamera.org/series/2522/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13825/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13825/checks/","tags":{},"headers":{"Return-Path":"","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 66865BDC71\n\tfor ;\n\tMon, 13 Sep 2021 13:28:12 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B90EF6918B;\n\tMon, 13 Sep 2021 15:28:11 +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 138CF69184\n\tfor ;\n\tMon, 13 Sep 2021 15:28:07 +0200 (CEST)","from tatooine.ideasonboard.com (unknown\n\t[IPv6:2a01:e0a:169:7140:edc5:688b:2ede:8b4b])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B1F08499;\n\tMon, 13 Sep 2021 15:28:06 +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=\"Babj+hRp\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1631539686;\n\tbh=8EuUaJwg1fVehXtHQy9FV4z5AmtEwFMatXNotUgioj4=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=Babj+hRp3Zhc8Pox5rUXA3qocDEANA2Uy730dte80VprazxJHN8/2cIDR7eT9XtwR\n\tTiV/qKcKrUthmljjCQByadef4S46oNFHBRDIVGqo94KZ3ak6Uj/yLws+Z1vKXzIE8+\n\thCtpy2aPmVFrpXu+IR3qJBxsnnHCIBE9D8NtEpYM=","From":"Jean-Michel Hautbois ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 13 Sep 2021 15:28:01 +0200","Message-Id":"<20210913132803.54881-4-jeanmichel.hautbois@ideasonboard.com>","X-Mailer":"git-send-email 2.30.2","In-Reply-To":"<20210913132803.54881-1-jeanmichel.hautbois@ideasonboard.com>","References":"<20210913132803.54881-1-jeanmichel.hautbois@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v7 3/5] ipa: ipu3: Change Accumulator\n\tstructure layout","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The pixel component sums for the Accumulator are inconsistent with other\nsimilar structures such as the IPAFrameContext::awb::gains. Group the\nred, green, and blue sums together in a struct and store them as\nuint64_t to reduce potential architectural differences.\n\nSigned-off-by: Jean-Michel Hautbois \nReviewed-by: Kieran Bingham \nReviewed-by: Laurent Pinchart \n---\n src/ipa/ipu3/algorithms/awb.cpp | 24 ++++++++++++------------\n src/ipa/ipu3/algorithms/awb.h | 8 +++++---\n 2 files changed, 17 insertions(+), 15 deletions(-)","diff":"diff --git a/src/ipa/ipu3/algorithms/awb.cpp b/src/ipa/ipu3/algorithms/awb.cpp\nindex d993e21e..ec7df608 100644\n--- a/src/ipa/ipu3/algorithms/awb.cpp\n+++ b/src/ipa/ipu3/algorithms/awb.cpp\n@@ -78,13 +78,13 @@ static constexpr uint32_t kMinGreenLevelInZone = 32;\n * \\var Accumulator::counted\n * \\brief Number of unsaturated cells used to calculate the sums\n *\n- * \\var Accumulator::rSum\n+ * \\var Accumulator::sum::red\n * \\brief Sum of the average red values of each unsaturated cell in the zone\n *\n- * \\var Accumulator::gSum\n+ * \\var Accumulator::sum::green\n * \\brief Sum of the average green values of each unsaturated cell in the zone\n *\n- * \\var Accumulator::bSum\n+ * \\var Accumulator::sum::blue\n * \\brief Sum of the average blue values of each unsaturated cell in the zone\n */\n \n@@ -209,10 +209,10 @@ void Awb::generateZones(std::vector &zones)\n \t\tRGB zone;\n \t\tdouble counted = awbStats_[i].counted;\n \t\tif (counted >= kMinZonesCounted) {\n-\t\t\tzone.G = awbStats_[i].gSum / counted;\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].rSum / counted;\n-\t\t\t\tzone.B = awbStats_[i].bSum / counted;\n+\t\t\t\tzone.R = awbStats_[i].sum.red / counted;\n+\t\t\t\tzone.B = awbStats_[i].sum.blue / counted;\n \t\t\t\tzones.push_back(zone);\n \t\t\t}\n \t\t}\n@@ -245,9 +245,9 @@ void Awb::generateAwbStats(const ipu3_uapi_stats_3a *stats,\n \t\t\t\t/* The cell is not saturated, use the current cell */\n \t\t\t\tawbStats_[awbRegionPosition].counted++;\n \t\t\t\tuint32_t greenValue = currentCell->greenRedAvg + currentCell->greenBlueAvg;\n-\t\t\t\tawbStats_[awbRegionPosition].gSum += greenValue / 2;\n-\t\t\t\tawbStats_[awbRegionPosition].rSum += currentCell->redAvg;\n-\t\t\t\tawbStats_[awbRegionPosition].bSum += currentCell->blueAvg;\n+\t\t\t\tawbStats_[awbRegionPosition].sum.green += greenValue / 2;\n+\t\t\t\tawbStats_[awbRegionPosition].sum.red += currentCell->redAvg;\n+\t\t\t\tawbStats_[awbRegionPosition].sum.blue += currentCell->blueAvg;\n \t\t\t}\n \t\t}\n \t}\n@@ -256,9 +256,9 @@ void Awb::generateAwbStats(const ipu3_uapi_stats_3a *stats,\n void Awb::clearAwbStats()\n {\n \tfor (unsigned int i = 0; i < kAwbStatsSizeX * kAwbStatsSizeY; i++) {\n-\t\tawbStats_[i].bSum = 0;\n-\t\tawbStats_[i].rSum = 0;\n-\t\tawbStats_[i].gSum = 0;\n+\t\tawbStats_[i].sum.blue = 0;\n+\t\tawbStats_[i].sum.red = 0;\n+\t\tawbStats_[i].sum.green = 0;\n \t\tawbStats_[i].counted = 0;\n \t}\n }\ndiff --git a/src/ipa/ipu3/algorithms/awb.h b/src/ipa/ipu3/algorithms/awb.h\nindex ac8ccc84..3385ebe7 100644\n--- a/src/ipa/ipu3/algorithms/awb.h\n+++ b/src/ipa/ipu3/algorithms/awb.h\n@@ -35,9 +35,11 @@ struct Ipu3AwbCell {\n \n struct Accumulator {\n \tunsigned int counted;\n-\tunsigned long long rSum;\n-\tunsigned long long gSum;\n-\tunsigned long long bSum;\n+\tstruct {\n+\t\tuint64_t red;\n+\t\tuint64_t green;\n+\t\tuint64_t blue;\n+\t} sum;\n };\n \n class Awb : public Algorithm\n","prefixes":["libcamera-devel","v7","3/5"]}