[{"id":18980,"web_url":"https://patchwork.libcamera.org/comment/18980/","msgid":"","date":"2021-08-20T13:08:29","subject":"Re: [libcamera-devel] [PATCH v1 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 02:11:49PM +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 | 29 ++++++++++++++++-------------\n> src/ipa/ipu3/algorithms/awb.h | 8 ++++----\n> 2 files changed, 20 insertions(+), 17 deletions(-)\n> \n> diff --git a/src/ipa/ipu3/algorithms/awb.cpp b/src/ipa/ipu3/algorithms/awb.cpp\n> index e15f7406..72ec5f88 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 struct ipu3_uapi_grid_config &grid)\n\nThis should be const.\n\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 struct ipu3_uapi_grid_config &grid)\n\nHere too.\n\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,9 +299,9 @@ 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\nWhy do you need to make a copy of the grid ?\n\n> \n> -\tparams->acc_param.awb.config.grid = context.configuration.grid.bdsGrid;\n> +\tparams->acc_param.awb.config.grid = grid;\n\nThis doesn't seem needed.\n\n> \n> \t/*\n> \t * Optical center is column start (respectively row start) of the\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..3807cc14 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 struct 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 struct 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 998EDBD87C\n\tfor ;\n\tFri, 20 Aug 2021 13:08:39 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5FB81688A2;\n\tFri, 20 Aug 2021 15:08:39 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C96A568891\n\tfor ;\n\tFri, 20 Aug 2021 15:08:38 +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 744CE8C8;\n\tFri, 20 Aug 2021 15:08:38 +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=\"U1NiMpl9\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1629464918;\n\tbh=oQst4sGdnwPcAQWQMO3G7NP73gp3TzKyiDWY1VD74wc=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=U1NiMpl994Gb5Pqpg+6AaXlMkvjgtOkX2WhtExkpeJPXRlwKiBdyKDMBLXZgje8Bt\n\tMoD+1eqGKYCjARAsqnvhQmLbL6BCM1ATPXznhwf2lt2T0Biy4NZBKHfn+l+ng9e5sR\n\tEfp3jkysd12B0Zsj/f9DYXPwRq7vxOaBfQ6KipTk=","Date":"Fri, 20 Aug 2021 16:08:29 +0300","From":"Laurent Pinchart ","To":"Jean-Michel Hautbois ","Message-ID":"","References":"<20210820121149.85859-1-jeanmichel.hautbois@ideasonboard.com>\n\t<20210820121149.85859-3-jeanmichel.hautbois@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210820121149.85859-3-jeanmichel.hautbois@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v1 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\" "}},{"id":18984,"web_url":"https://patchwork.libcamera.org/comment/18984/","msgid":"<0a7ac650-2691-25e9-60a3-186c68a20183@ideasonboard.com>","date":"2021-08-20T14:07:36","subject":"Re: [libcamera-devel] [PATCH v1 2/2] ipa: ipu3: awb: remove local\n\tstorage of the grid","submitter":{"id":75,"url":"https://patchwork.libcamera.org/api/people/75/","name":"Jean-Michel Hautbois","email":"jeanmichel.hautbois@ideasonboard.com"},"content":"On 20/08/2021 15:08, Laurent Pinchart wrote:\n> Hi Jean-Michel,\n> \n> Thank you for the patch.\n> \n> On Fri, Aug 20, 2021 at 02:11:49PM +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 | 29 ++++++++++++++++-------------\n>> src/ipa/ipu3/algorithms/awb.h | 8 ++++----\n>> 2 files changed, 20 insertions(+), 17 deletions(-)\n>>\n>> diff --git a/src/ipa/ipu3/algorithms/awb.cpp b/src/ipa/ipu3/algorithms/awb.cpp\n>> index e15f7406..72ec5f88 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 struct ipu3_uapi_grid_config &grid)\n> \n> This should be const.\n> \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 struct ipu3_uapi_grid_config &grid)\n> \n> Here too.\n> \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,9 +299,9 @@ 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> Why do you need to make a copy of the grid ?\n> \n>> \n>> -\tparams->acc_param.awb.config.grid = context.configuration.grid.bdsGrid;\n>> +\tparams->acc_param.awb.config.grid = grid;\n> \n> This doesn't seem needed.\n\nThe hunk you mean ? Because I need to copy the grid :-) but only in params.\n\n>> \n>> \t/*\n>> \t * Optical center is column start (respectively row start) of the\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..3807cc14 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 struct 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 struct 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>","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 D3F75BD87D\n\tfor ;\n\tFri, 20 Aug 2021 14:07:41 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 302A0688A2;\n\tFri, 20 Aug 2021 16:07:41 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9E3176888E\n\tfor ;\n\tFri, 20 Aug 2021 16:07:39 +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 50B058C8;\n\tFri, 20 Aug 2021 16:07:39 +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=\"G842Zeqy\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1629468459;\n\tbh=xAtJF8vRduXr4grrce8p5WOh8btmfUWaNw5cN9htnqM=;\n\th=Subject:To:Cc:References:From:Date:In-Reply-To:From;\n\tb=G842ZeqyWb4hcj1mN6LA6WZuzKtdDEUFDyA/t3987QuMYt2ClmctyXtgTUKb207Ay\n\tyzopiwLpmy+Nr7ZYDDvoM5yV61hWb19qFII78TZfoMm5g4U5jj7fgsqdMOQQ8o43U5\n\tLAwlWSY9NLSm18NRgwDRGX83wuOXd4BWoNYrVTA0=","To":"Laurent Pinchart ","References":"<20210820121149.85859-1-jeanmichel.hautbois@ideasonboard.com>\n\t<20210820121149.85859-3-jeanmichel.hautbois@ideasonboard.com>\n\t","From":"Jean-Michel Hautbois ","Message-ID":"<0a7ac650-2691-25e9-60a3-186c68a20183@ideasonboard.com>","Date":"Fri, 20 Aug 2021 16:07:36 +0200","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101\n\tThunderbird/78.11.0","MIME-Version":"1.0","In-Reply-To":"","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-US","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH v1 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\" "}}]