[{"id":18986,"web_url":"https://patchwork.libcamera.org/comment/18986/","msgid":"","date":"2021-08-20T14:57:07","subject":"Re: [libcamera-devel] [PATCH v2 2/2] ipa: ipu3: awb: remove local\n\tstorage of the grid","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jean-Michel,\n\nThank you for the patch.\n\nOn Fri, Aug 20, 2021 at 04:11:04PM +0200, Jean-Michel Hautbois wrote:\n> The IPASessionConfiguration now has the grid configuration stored. Use\n> it it at prepare() and process() calls in AWB and pass it as a reference\n> to the private functions when needed.\n> \n> Signed-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(-)\n> \n> diff --git a/src/ipa/ipu3/algorithms/awb.cpp b/src/ipa/ipu3/algorithms/awb.cpp\n> index 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\tcalculateWBGains(stats, context.configuration.grid.bdsGrid);\n\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\nThis should be const.\n\nReviewed-by: Laurent Pinchart \n\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\n> diff --git a/src/ipa/ipu3/algorithms/awb.h b/src/ipa/ipu3/algorithms/awb.h\n> index 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_;","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 DAFCDBD87C\n\tfor ;\n\tFri, 20 Aug 2021 14:57:18 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 18B7F688A2;\n\tFri, 20 Aug 2021 16:57:18 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 96E596888E\n\tfor ;\n\tFri, 20 Aug 2021 16:57:16 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 22C5C8C8;\n\tFri, 20 Aug 2021 16:57:16 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"G3ll4Vo/\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1629471436;\n\tbh=khDJdBCmCqxYL7jsMskpNvXWtT7mmYsWQsVl57n79ro=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=G3ll4Vo/uJ7I9HUQYuvG+USZswOFDF4PgzKqmoMzAXBkAlraL0VLfs6OqhOG7vPGn\n\tdLLFpUxeiCMrCfEhU+k9FV1N2cuUJBoN76XBv/0Zo1JBHiaMIgjYmGF6P8VwJgrn3k\n\t6RQ4B7qEeb8OmUdfW+OrRbcEHfVysmpbY6PoRHMc=","Date":"Fri, 20 Aug 2021 17:57:07 +0300","From":"Laurent Pinchart ","To":"Jean-Michel Hautbois ","Message-ID":"","References":"<20210820141104.94438-1-jeanmichel.hautbois@ideasonboard.com>\n\t<20210820141104.94438-3-jeanmichel.hautbois@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210820141104.94438-3-jeanmichel.hautbois@ideasonboard.com>","Subject":"Re: [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","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]