[{"id":19645,"web_url":"https://patchwork.libcamera.org/comment/19645/","msgid":"","date":"2021-09-13T16:02:09","subject":"Re: [libcamera-devel] [PATCH v7 5/5] ipa: ipu3: awb: Make the\n\tnaming consistent","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 Mon, Sep 13, 2021 at 03:28:03PM +0200, Jean-Michel Hautbois wrote:\n> The variables mix the terms cell, region and zone. It can confuse the\n> reader, and make the algorithm more difficult to follow.\n> \n> Rename the local variables consistent with their definitions:\n> - Cells are defined in Pixels\n> - Zones are defined in Cells\n> \n> There is no \"region\" as such, so replace it with the correct term.\n> \n> Signed-off-by: Jean-Michel Hautbois \n> Reviewed-by: Kieran Bingham \n\nMuch better in v7 :-)\n\nReviewed-by: Laurent Pinchart \n\n> ---\n> src/ipa/ipu3/algorithms/awb.cpp | 24 ++++++++++++------------\n> 1 file changed, 12 insertions(+), 12 deletions(-)\n> \n> diff --git a/src/ipa/ipu3/algorithms/awb.cpp b/src/ipa/ipu3/algorithms/awb.cpp\n> index 0b850335..36e80306 100644\n> --- a/src/ipa/ipu3/algorithms/awb.cpp\n> +++ b/src/ipa/ipu3/algorithms/awb.cpp\n> @@ -223,30 +223,30 @@ void Awb::generateZones(std::vector &zones)\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(grid.width / static_cast(kAwbStatsSizeX));\n> -\tuint32_t regionHeight = round(grid.height / static_cast(kAwbStatsSizeY));\n> +\tuint32_t cellsPerZoneX = round(grid.width / static_cast(kAwbStatsSizeX));\n> +\tuint32_t cellsPerZoneY = 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 * (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 * grid.width + i;\n> -\t\t\tuint32_t cellX = (cellPosition / regionWidth) % kAwbStatsSizeX;\n> -\t\t\tuint32_t cellY = ((cellPosition / grid.width) / regionHeight) % kAwbStatsSizeY;\n> +\tfor (unsigned int cellY = 0; cellY < kAwbStatsSizeY * cellsPerZoneY; cellY++) {\n> +\t\tfor (unsigned int cellX = 0; cellX < kAwbStatsSizeX * cellsPerZoneX; cellX++) {\n> +\t\t\tuint32_t cellPosition = cellY * grid.width + cellX;\n> +\t\t\tuint32_t zoneX = cellX / cellsPerZoneX;\n> +\t\t\tuint32_t zoneY = cellY / cellsPerZoneY;\n> \n> -\t\t\tuint32_t awbRegionPosition = cellY * kAwbStatsSizeX + cellX;\n> +\t\t\tuint32_t awbZonePosition = zoneY * kAwbStatsSizeX + zoneX;\n> \n> \t\t\t/* Cast the initial IPU3 structure to simplify the reading */\n> \t\t\tconst ipu3_uapi_awb_set_item *currentCell = &stats->awb_raw_buffer.meta_data[cellPosition];\n> \t\t\tif (currentCell->sat_ratio == 0) {\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\tawbStats_[awbZonePosition].counted++;\n> \t\t\t\tuint32_t greenValue = currentCell->Gr_avg + currentCell->Gb_avg;\n> -\t\t\t\tawbStats_[awbRegionPosition].sum.green += greenValue / 2;\n> -\t\t\t\tawbStats_[awbRegionPosition].sum.red += currentCell->R_avg;\n> -\t\t\t\tawbStats_[awbRegionPosition].sum.blue += currentCell->B_avg;\n> +\t\t\t\tawbStats_[awbZonePosition].sum.green += greenValue / 2;\n> +\t\t\t\tawbStats_[awbZonePosition].sum.red += currentCell->R_avg;\n> +\t\t\t\tawbStats_[awbZonePosition].sum.blue += currentCell->B_avg;\n> \t\t\t}\n> \t\t}\n> \t}","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 3EFF4BDC71\n\tfor ;\n\tMon, 13 Sep 2021 16:02:36 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BC0A269182;\n\tMon, 13 Sep 2021 18:02:35 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 80A9C6024C\n\tfor ;\n\tMon, 13 Sep 2021 18:02:34 +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 ECBD0499;\n\tMon, 13 Sep 2021 18:02:33 +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=\"YIpP4csL\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1631548954;\n\tbh=cHsrdNqq9rCCvbO+4YwRNNjP9J63QLeT5+OIC2n/kWk=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=YIpP4csLG8U/W/NC06iaBME3ISWlfo62z6JZ/zqnMRGPxa9rvmY7n/CeJQhBaqeuK\n\t7426gjAjnqwNVsUN9CXgOcv1yjW39Y8liXEWQn5E5wyom/n2ZowuVe4icB5+9gwvYg\n\t/GG0RYPahmPWIwTveA29Pjo3ZIiZJA7sQlJu7yPE=","Date":"Mon, 13 Sep 2021 19:02:09 +0300","From":"Laurent Pinchart ","To":"Jean-Michel Hautbois ","Message-ID":"","References":"<20210913132803.54881-1-jeanmichel.hautbois@ideasonboard.com>\n\t<20210913132803.54881-6-jeanmichel.hautbois@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210913132803.54881-6-jeanmichel.hautbois@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v7 5/5] ipa: ipu3: awb: Make the\n\tnaming consistent","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\" "}}]