{"id":13420,"url":"https://patchwork.libcamera.org/api/1.1/patches/13420/?format=json","web_url":"https://patchwork.libcamera.org/patch/13420/","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":"<20210820141104.94438-3-jeanmichel.hautbois@ideasonboard.com>","date":"2021-08-20T14:11:04","name":"[libcamera-devel,v2,2/2] ipa: ipu3: awb: remove local storage of the grid","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"09ad70331b3fc1fab9f87f4e518b2df57de458a1","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/13420/mbox/","series":[{"id":2376,"url":"https://patchwork.libcamera.org/api/1.1/series/2376/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2376","date":"2021-08-20T14:11:02","name":"Remove local storage of the grid in algorithms","version":2,"mbox":"https://patchwork.libcamera.org/series/2376/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13420/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13420/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 6F481BD87C\n\tfor ;\n\tFri, 20 Aug 2021 14:11:11 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BEE776890C;\n\tFri, 20 Aug 2021 16:11:09 +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 9723668895\n\tfor ;\n\tFri, 20 Aug 2021 16:11:08 +0200 (CEST)","from tatooine.ideasonboard.com (unknown\n\t[IPv6:2a01:e0a:169:7140:e43b:edb2:932:6b0a])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 440F01207;\n\tFri, 20 Aug 2021 16:11:08 +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=\"AMxYudN4\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1629468668;\n\tbh=Kn4dOWGVOfFsaVwfXmNAH+/vKUk/FrkM9vo6k1q4vbQ=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=AMxYudN4a5JfCM3GTj7g9iBqLCHjdwOhZdAW+99JjsYY0HATVMqak6mDDEacpI23z\n\t50Q2NPxKFn4w0Hz+0oNeWxnYJh18zyNfdyukV3kBJdtZrsGWNeqxbtcNRy+MT4kn2z\n\tpUgTqmjgCpB6BrBo4DHnuFsXAKwQd9zoRkuH4q6o=","From":"Jean-Michel Hautbois ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 20 Aug 2021 16:11:04 +0200","Message-Id":"<20210820141104.94438-3-jeanmichel.hautbois@ideasonboard.com>","X-Mailer":"git-send-email 2.30.2","In-Reply-To":"<20210820141104.94438-1-jeanmichel.hautbois@ideasonboard.com>","References":"<20210820141104.94438-1-jeanmichel.hautbois@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 2/2] ipa: ipu3: awb: remove local\n\tstorage of the grid","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 IPASessionConfiguration now has the grid configuration stored. Use\nit it at prepare() and process() calls in AWB and pass it as a reference\nto the private functions when needed.\n\nSigned-off-by: Jean-Michel Hautbois \n---\n src/ipa/ipu3/algorithms/awb.cpp | 27 +++++++++++++++------------\n src/ipa/ipu3/algorithms/awb.h | 8 ++++----\n 2 files changed, 19 insertions(+), 16 deletions(-)","diff":"diff --git a/src/ipa/ipu3/algorithms/awb.cpp b/src/ipa/ipu3/algorithms/awb.cpp\nindex e15f7406..c193c080 100644\n--- a/src/ipa/ipu3/algorithms/awb.cpp\n+++ b/src/ipa/ipu3/algorithms/awb.cpp\n@@ -175,20 +175,21 @@ void Awb::generateZones(std::vector &zones)\n }\n \n /* Translate the IPU3 statistics into the default statistics region array */\n-void Awb::generateAwbStats(const ipu3_uapi_stats_3a *stats)\n+void Awb::generateAwbStats(const ipu3_uapi_stats_3a *stats,\n+\t\t\t const ipu3_uapi_grid_config &grid)\n {\n-\tuint32_t regionWidth = round(awbGrid_.width / static_cast(kAwbStatsSizeX));\n-\tuint32_t regionHeight = round(awbGrid_.height / static_cast(kAwbStatsSizeY));\n+\tuint32_t regionWidth = round(grid.width / static_cast(kAwbStatsSizeX));\n+\tuint32_t regionHeight = round(grid.height / static_cast(kAwbStatsSizeY));\n \n \t/*\n \t * Generate a (kAwbStatsSizeX x kAwbStatsSizeY) array from the IPU3 grid which is\n-\t * (awbGrid_.width x awbGrid_.height).\n+\t * (grid.width x grid.height).\n \t */\n \tfor (unsigned int j = 0; j < kAwbStatsSizeY * regionHeight; j++) {\n \t\tfor (unsigned int i = 0; i < kAwbStatsSizeX * regionWidth; i++) {\n-\t\t\tuint32_t cellPosition = j * awbGrid_.width + i;\n+\t\t\tuint32_t cellPosition = j * grid.width + i;\n \t\t\tuint32_t cellX = (cellPosition / regionWidth) % kAwbStatsSizeX;\n-\t\t\tuint32_t cellY = ((cellPosition / awbGrid_.width) / regionHeight) % kAwbStatsSizeY;\n+\t\t\tuint32_t cellY = ((cellPosition / grid.width) / regionHeight) % kAwbStatsSizeY;\n \n \t\t\tuint32_t awbRegionPosition = cellY * kAwbStatsSizeX + cellX;\n \t\t\tcellPosition *= 8;\n@@ -258,12 +259,13 @@ void Awb::awbGreyWorld()\n \tasyncResults_.blueGain = blueGain;\n }\n \n-void Awb::calculateWBGains(const ipu3_uapi_stats_3a *stats)\n+void Awb::calculateWBGains(const ipu3_uapi_stats_3a *stats,\n+\t\t\t const ipu3_uapi_grid_config &grid)\n {\n \tASSERT(stats->stats_3a_status.awb_en);\n \tzones_.clear();\n \tclearAwbStats();\n-\tgenerateAwbStats(stats);\n+\tgenerateAwbStats(stats, grid);\n \tgenerateZones(zones_);\n \tLOG(IPU3Awb, Debug) << \"Valid zones: \" << zones_.size();\n \tif (zones_.size() > 10) {\n@@ -275,7 +277,8 @@ 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);\n+\tstruct ipu3_uapi_grid_config grid = context.configuration.grid.bdsGrid;\n+\tcalculateWBGains(stats, grid);\n \n \t/*\n \t * Gains are only recalculated if enough zones were detected.\n@@ -296,7 +299,7 @@ void Awb::prepare(IPAContext &context, ipu3_uapi_params *params)\n \t\t\t\t\t | IPU3_UAPI_AWB_RGBS_THR_B_EN\n \t\t\t\t\t | 8191;\n \n-\tawbGrid_ = context.configuration.grid.bdsGrid;\n+\tstruct ipu3_uapi_grid_config &grid = context.configuration.grid.bdsGrid;\n \n \tparams->acc_param.awb.config.grid = context.configuration.grid.bdsGrid;\n \n@@ -310,8 +313,8 @@ void Awb::prepare(IPAContext &context, ipu3_uapi_params *params)\n \tparams->acc_param.bnr = imguCssBnrDefaults;\n \tSize &bdsOutputSize = context.configuration.grid.bdsOutputSize;\n \tparams->acc_param.bnr.column_size = bdsOutputSize.width;\n-\tparams->acc_param.bnr.opt_center.x_reset = awbGrid_.x_start - (bdsOutputSize.width / 2);\n-\tparams->acc_param.bnr.opt_center.y_reset = awbGrid_.y_start - (bdsOutputSize.height / 2);\n+\tparams->acc_param.bnr.opt_center.x_reset = grid.x_start - (bdsOutputSize.width / 2);\n+\tparams->acc_param.bnr.opt_center.y_reset = grid.y_start - (bdsOutputSize.height / 2);\n \tparams->acc_param.bnr.opt_center_sqr.x_sqr_reset = params->acc_param.bnr.opt_center.x_reset\n \t\t\t\t\t\t\t* params->acc_param.bnr.opt_center.x_reset;\n \tparams->acc_param.bnr.opt_center_sqr.y_sqr_reset = params->acc_param.bnr.opt_center.y_reset\ndiff --git a/src/ipa/ipu3/algorithms/awb.h b/src/ipa/ipu3/algorithms/awb.h\nindex fac54e45..a16dd68d 100644\n--- a/src/ipa/ipu3/algorithms/awb.h\n+++ b/src/ipa/ipu3/algorithms/awb.h\n@@ -71,15 +71,15 @@ public:\n \t};\n \n private:\n-\tvoid calculateWBGains(const ipu3_uapi_stats_3a *stats);\n+\tvoid calculateWBGains(const ipu3_uapi_stats_3a *stats,\n+\t\t\t const ipu3_uapi_grid_config &grid);\n \tvoid generateZones(std::vector &zones);\n-\tvoid generateAwbStats(const ipu3_uapi_stats_3a *stats);\n+\tvoid generateAwbStats(const ipu3_uapi_stats_3a *stats,\n+\t\t\t const ipu3_uapi_grid_config &grid);\n \tvoid clearAwbStats();\n \tvoid awbGreyWorld();\n \tuint32_t estimateCCT(double red, double green, double blue);\n \n-\tstruct ipu3_uapi_grid_config awbGrid_;\n-\n \tstd::vector zones_;\n \tIspStatsRegion awbStats_[kAwbStatsSizeX * kAwbStatsSizeY];\n \tAwbStatus asyncResults_;\n","prefixes":["libcamera-devel","v2","2/2"]}