{"id":13827,"url":"https://patchwork.libcamera.org/api/1.1/patches/13827/?format=json","web_url":"https://patchwork.libcamera.org/patch/13827/","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":"<20210913132803.54881-6-jeanmichel.hautbois@ideasonboard.com>","date":"2021-09-13T13:28:03","name":"[libcamera-devel,v7,5/5] ipa: ipu3: awb: Make the naming consistent","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"97b75b2fdc9419ff248cbf482df01b14c4262a38","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/13827/mbox/","series":[{"id":2522,"url":"https://patchwork.libcamera.org/api/1.1/series/2522/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2522","date":"2021-09-13T13:27:58","name":"Move and improve AWB structures","version":7,"mbox":"https://patchwork.libcamera.org/series/2522/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13827/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13827/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 7E484BDC71\n\tfor ;\n\tMon, 13 Sep 2021 13:28:13 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 38C4969190;\n\tMon, 13 Sep 2021 15:28:13 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7B2A169188\n\tfor ;\n\tMon, 13 Sep 2021 15:28:07 +0200 (CEST)","from tatooine.ideasonboard.com (unknown\n\t[IPv6:2a01:e0a:169:7140:edc5:688b:2ede:8b4b])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2F98D499;\n\tMon, 13 Sep 2021 15:28:07 +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=\"rcIOHWea\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1631539687;\n\tbh=WNofhsf9SWhGDIOJqK3Xl67M74w1aYmZsXmBZ0e/7PI=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=rcIOHWeaDDN74FKPbbfI3IGCXHFyyMYuJWrogPZ/v2HvBN61yGYA5Zv47I077iM1K\n\tmW7ED1CahySLkzClgB7wDkkPW6pH6QCOBIn9uNOyMAmF9ILFfnuLgAun5ITsVZqoOu\n\t1dRQS7IuGeHqSth1z52JUeHyrJnJoFaJ5iZC4Dl0=","From":"Jean-Michel Hautbois ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 13 Sep 2021 15:28:03 +0200","Message-Id":"<20210913132803.54881-6-jeanmichel.hautbois@ideasonboard.com>","X-Mailer":"git-send-email 2.30.2","In-Reply-To":"<20210913132803.54881-1-jeanmichel.hautbois@ideasonboard.com>","References":"<20210913132803.54881-1-jeanmichel.hautbois@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v7 5/5] ipa: ipu3: awb: Make the naming\n\tconsistent","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 variables mix the terms cell, region and zone. It can confuse the\nreader, and make the algorithm more difficult to follow.\n\nRename the local variables consistent with their definitions:\n- Cells are defined in Pixels\n- Zones are defined in Cells\n\nThere is no \"region\" as such, so replace it with the correct term.\n\nSigned-off-by: Jean-Michel Hautbois \nReviewed-by: Kieran Bingham \n---\n src/ipa/ipu3/algorithms/awb.cpp | 24 ++++++++++++------------\n 1 file changed, 12 insertions(+), 12 deletions(-)","diff":"diff --git a/src/ipa/ipu3/algorithms/awb.cpp b/src/ipa/ipu3/algorithms/awb.cpp\nindex 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}\n","prefixes":["libcamera-devel","v7","5/5"]}