{"id":13604,"url":"https://patchwork.libcamera.org/api/1.1/patches/13604/?format=json","web_url":"https://patchwork.libcamera.org/patch/13604/","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":"<20210902083207.33976-5-jeanmichel.hautbois@ideasonboard.com>","date":"2021-09-02T08:32:07","name":"[libcamera-devel,4/4] ipa: ipu3: Change Accumulator structure layout","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"b6dba4951b94c7a104d9343f1de09250c33570cb","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/13604/mbox/","series":[{"id":2437,"url":"https://patchwork.libcamera.org/api/1.1/series/2437/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2437","date":"2021-09-02T08:32:03","name":"Move and improve AWB structures","version":1,"mbox":"https://patchwork.libcamera.org/series/2437/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13604/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13604/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 293A4C3243\n\tfor ;\n\tThu, 2 Sep 2021 08:32:16 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 023046917C;\n\tThu, 2 Sep 2021 10:32:15 +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 8E1C469166\n\tfor ;\n\tThu, 2 Sep 2021 10:32:12 +0200 (CEST)","from tatooine.ideasonboard.com (unknown\n\t[IPv6:2a01:e0a:169:7140:43b0:6633:e0bd:5dc6])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 44A1E532;\n\tThu, 2 Sep 2021 10:32:12 +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=\"AVHfUGmg\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1630571532;\n\tbh=fYzRDyrqGh3Ya+Vv07BW7LI6CaYr2MJkesUJ01Yln6k=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=AVHfUGmgbHinjzBJKkkMTWi0qDQVjSaK/oIXilMWY2hMvQ1Y5kmr/yybjn/Lp/fR/\n\tZTw43RBu4tntc7Gw3AONRwamkbU+leq16aeAWGwhcb8+sKoh0JSXbUpgKXVy+702/F\n\tFC6tNGF1H+pDw5gYfw3Uhv6SxbzKFTNQH/OqjsiE=","From":"Jean-Michel Hautbois ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 2 Sep 2021 10:32:07 +0200","Message-Id":"<20210902083207.33976-5-jeanmichel.hautbois@ideasonboard.com>","X-Mailer":"git-send-email 2.30.2","In-Reply-To":"<20210902083207.33976-1-jeanmichel.hautbois@ideasonboard.com>","References":"<20210902083207.33976-1-jeanmichel.hautbois@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 4/4] 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 red, green and blue sums should follow the same philosophy as the\nIPAFrameContext::awb structure. Change the red, green and blue sums to\nuint64_t which is better as it does not depend on the architecture.\n\nSigned-off-by: Jean-Michel Hautbois \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 9b2cbba7..ea567f96 100644\n--- a/src/ipa/ipu3/algorithms/awb.cpp\n+++ b/src/ipa/ipu3/algorithms/awb.cpp\n@@ -41,13 +41,13 @@ static constexpr uint32_t kMinGreenLevelInZone = 32;\n * \\var Accumulator::total\n * \\brief Total number of regions in the zone\n *\n- * \\var Accumulator::rSum\n+ * \\var Accumulator::sum::red\n * \\brief Sum of the red values in the zone\n *\n- * \\var Accumulator::gSum\n+ * \\var Accumulator::sum::green\n * \\brief Sum of the green values in the zone\n *\n- * \\var Accumulator::bSum\n+ * \\var Accumulator::sum::blue\n * \\brief Sum of the blue values in the zone\n */\n \n@@ -172,10 +172,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@@ -212,9 +212,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@@ -223,9 +223,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\tawbStats_[i].total = 0;\n \t}\ndiff --git a/src/ipa/ipu3/algorithms/awb.h b/src/ipa/ipu3/algorithms/awb.h\nindex 13490b07..23f3e872 100644\n--- a/src/ipa/ipu3/algorithms/awb.h\n+++ b/src/ipa/ipu3/algorithms/awb.h\n@@ -36,9 +36,11 @@ struct Ipu3AwbCell {\n struct Accumulator {\n \tunsigned int counted;\n \tunsigned int total;\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","4/4"]}