{"id":13416,"url":"https://patchwork.libcamera.org/api/patches/13416/?format=json","web_url":"https://patchwork.libcamera.org/patch/13416/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20210820121149.85859-2-jeanmichel.hautbois@ideasonboard.com>","date":"2021-08-20T12:11:48","name":"[libcamera-devel,v1,1/2] ipa: ipu3: agc: remove local storage of the grid","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"ac11295ef1708b8bc377b92fecfc0e58930788aa","submitter":{"id":75,"url":"https://patchwork.libcamera.org/api/people/75/?format=json","name":"Jean-Michel Hautbois","email":"jeanmichel.hautbois@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/13416/mbox/","series":[{"id":2375,"url":"https://patchwork.libcamera.org/api/series/2375/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2375","date":"2021-08-20T12:11:47","name":"Remove local storage of the grid in algorithms","version":1,"mbox":"https://patchwork.libcamera.org/series/2375/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13416/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13416/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 DB182C3241\n\tfor ;\n\tFri, 20 Aug 2021 12:11:53 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 91489688AE;\n\tFri, 20 Aug 2021 14:11:53 +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 8F29D68891\n\tfor ;\n\tFri, 20 Aug 2021 14:11:52 +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 3D3C711C7;\n\tFri, 20 Aug 2021 14:11:52 +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=\"MYTN8eY0\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1629461512;\n\tbh=ZJ+eco949iTODeRo7Rg7iVVW0snVXM7QHzX/JzzAweU=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=MYTN8eY0dTzeFjelUd4KcJWyHYZXTx/odK3h9iDyL0UqvIWon0BUcFKljMvvd3tGa\n\tsEClBlNwNizPMhvJtHSHQnelmrHG0OPcpsn86Mulf2oVTl8b5ji2f2mMIZLMPCSPlD\n\tnjE+RuyvunK3bd4ozm00DmjoVC7sC1rSV4YO+KcU=","From":"Jean-Michel Hautbois ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 20 Aug 2021 14:11:48 +0200","Message-Id":"<20210820121149.85859-2-jeanmichel.hautbois@ideasonboard.com>","X-Mailer":"git-send-email 2.30.2","In-Reply-To":"<20210820121149.85859-1-jeanmichel.hautbois@ideasonboard.com>","References":"<20210820121149.85859-1-jeanmichel.hautbois@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v1 1/2] ipa: ipu3: agc: 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 at process() call in AGC and pass it as a reference to the private\nfunctions when needed.\n\nSigned-off-by: Jean-Michel Hautbois \n---\n src/ipa/ipu3/algorithms/agc.cpp | 29 +++++++++++++++--------------\n src/ipa/ipu3/algorithms/agc.h | 5 ++---\n 2 files changed, 17 insertions(+), 17 deletions(-)","diff":"diff --git a/src/ipa/ipu3/algorithms/agc.cpp b/src/ipa/ipu3/algorithms/agc.cpp\nindex e4598b2e..f51c08d8 100644\n--- a/src/ipa/ipu3/algorithms/agc.cpp\n+++ b/src/ipa/ipu3/algorithms/agc.cpp\n@@ -57,10 +57,9 @@ Agc::Agc()\n {\n }\n \n-int Agc::configure(IPAContext &context, const IPAConfigInfo &configInfo)\n+int Agc::configure([[maybe_unused]] IPAContext &context,\n+\t\t const IPAConfigInfo &configInfo)\n {\n-\taeGrid_ = context.configuration.grid.bdsGrid;\n-\n \tlineDuration_ = configInfo.sensorInfo.lineLength * 1.0s\n \t\t / configInfo.sensorInfo.pixelRate;\n \tmaxExposureTime_ = kMaxExposure * lineDuration_;\n@@ -68,7 +67,8 @@ int Agc::configure(IPAContext &context, const IPAConfigInfo &configInfo)\n \treturn 0;\n }\n \n-void Agc::processBrightness(const ipu3_uapi_stats_3a *stats)\n+void Agc::processBrightness(const ipu3_uapi_stats_3a *stats,\n+\t\t\t struct ipu3_uapi_grid_config &grid)\n {\n \tconst struct ipu3_uapi_grid_config statsAeGrid = stats->stats_4a_config.awb_config.grid;\n \tRectangle aeRegion = { statsAeGrid.x_start,\n@@ -76,19 +76,19 @@ void Agc::processBrightness(const ipu3_uapi_stats_3a *stats)\n \t\t\t static_cast(statsAeGrid.x_end - statsAeGrid.x_start) + 1,\n \t\t\t static_cast(statsAeGrid.y_end - statsAeGrid.y_start) + 1 };\n \tPoint topleft = aeRegion.topLeft();\n-\tint topleftX = topleft.x >> aeGrid_.block_width_log2;\n-\tint topleftY = topleft.y >> aeGrid_.block_height_log2;\n+\tint topleftX = topleft.x >> grid.block_width_log2;\n+\tint topleftY = topleft.y >> grid.block_height_log2;\n \n \t/* Align to the grid cell width and height */\n-\tuint32_t startX = topleftX << aeGrid_.block_width_log2;\n-\tuint32_t startY = topleftY * aeGrid_.width << aeGrid_.block_width_log2;\n-\tuint32_t endX = (startX + (aeRegion.size().width >> aeGrid_.block_width_log2)) << aeGrid_.block_width_log2;\n+\tuint32_t startX = topleftX << grid.block_width_log2;\n+\tuint32_t startY = topleftY * grid.width << grid.block_width_log2;\n+\tuint32_t endX = (startX + (aeRegion.size().width >> grid.block_width_log2)) << grid.block_width_log2;\n \tuint32_t i, j;\n \tuint32_t count = 0;\n \n \tuint32_t hist[knumHistogramBins] = { 0 };\n \tfor (j = topleftY;\n-\t j < topleftY + (aeRegion.size().height >> aeGrid_.block_height_log2);\n+\t j < topleftY + (aeRegion.size().height >> grid.block_height_log2);\n \t j++) {\n \t\tfor (i = startX + startY; i < endX + startY; i += kCellSize) {\n \t\t\t/*\n@@ -96,9 +96,9 @@ void Agc::processBrightness(const ipu3_uapi_stats_3a *stats)\n \t\t\t * We observed a bit shift which makes the value 160 to be 32 in the stats grid.\n \t\t\t * Use the one passed at init time.\n \t\t\t */\n-\t\t\tif (stats->awb_raw_buffer.meta_data[i + 4 + j * aeGrid_.width] == 0) {\n-\t\t\t\tuint8_t Gr = stats->awb_raw_buffer.meta_data[i + 0 + j * aeGrid_.width];\n-\t\t\t\tuint8_t Gb = stats->awb_raw_buffer.meta_data[i + 3 + j * aeGrid_.width];\n+\t\t\tif (stats->awb_raw_buffer.meta_data[i + 4 + j * grid.width] == 0) {\n+\t\t\t\tuint8_t Gr = stats->awb_raw_buffer.meta_data[i + 0 + j * grid.width];\n+\t\t\t\tuint8_t Gb = stats->awb_raw_buffer.meta_data[i + 3 + j * grid.width];\n \t\t\t\thist[(Gr + Gb) / 2]++;\n \t\t\t\tcount++;\n \t\t\t}\n@@ -190,7 +190,8 @@ void Agc::process(IPAContext &context, const ipu3_uapi_stats_3a *stats)\n {\n \tuint32_t &exposure = context.frameContext.agc.exposure;\n \tdouble &gain = context.frameContext.agc.gain;\n-\tprocessBrightness(stats);\n+\tstruct ipu3_uapi_grid_config grid = context.configuration.grid.bdsGrid;\n+\tprocessBrightness(stats, grid);\n \tlockExposureGain(exposure, gain);\n \tframeCount_++;\n }\ndiff --git a/src/ipa/ipu3/algorithms/agc.h b/src/ipa/ipu3/algorithms/agc.h\nindex 1739d2fd..74ef0299 100644\n--- a/src/ipa/ipu3/algorithms/agc.h\n+++ b/src/ipa/ipu3/algorithms/agc.h\n@@ -33,12 +33,11 @@ public:\n \tvoid process(IPAContext &context, const ipu3_uapi_stats_3a *stats) override;\n \n private:\n-\tvoid processBrightness(const ipu3_uapi_stats_3a *stats);\n+\tvoid processBrightness(const ipu3_uapi_stats_3a *stats,\n+\t\t\t struct ipu3_uapi_grid_config &grid);\n \tvoid filterExposure();\n \tvoid lockExposureGain(uint32_t &exposure, double &gain);\n \n-\tstruct ipu3_uapi_grid_config aeGrid_;\n-\n \tuint64_t frameCount_;\n \tuint64_t lastFrame_;\n \n","prefixes":["libcamera-devel","v1","1/2"]}