{"id":13993,"url":"https://patchwork.libcamera.org/api/1.1/patches/13993/?format=json","web_url":"https://patchwork.libcamera.org/patch/13993/","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":"<20210930093715.73293-12-jeanmichel.hautbois@ideasonboard.com>","date":"2021-09-30T09:37:14","name":"[libcamera-devel,v2,11/12] ipa: ipu3: agc: Rewrite and simplify the brightness loop","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"db454bfb5c4c4d990a87505157f94eefa65192bf","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/13993/mbox/","series":[{"id":2587,"url":"https://patchwork.libcamera.org/api/1.1/series/2587/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2587","date":"2021-09-30T09:37:03","name":"Improve ImgU statistics usage","version":2,"mbox":"https://patchwork.libcamera.org/series/2587/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13993/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13993/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 675EBBDC71\n\tfor ;\n\tThu, 30 Sep 2021 09:37:34 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 29161691C3;\n\tThu, 30 Sep 2021 11:37:34 +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 0C97A691B9\n\tfor ;\n\tThu, 30 Sep 2021 11:37:22 +0200 (CEST)","from tatooine.ideasonboard.com (unknown\n\t[IPv6:2a01:e0a:169:7140:bab4:22c5:662d:e478])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B2F6018BF;\n\tThu, 30 Sep 2021 11:37:21 +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=\"dC7MMKU8\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1632994641;\n\tbh=6XvCGCc2wwMTxdrkPYkCjYBi+jhlZP0I0O+8681ZiIU=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=dC7MMKU8ILEVHEDuidndyyPzVKOqmxB3Kvr5ejp4w25+M8MPYFqD3JvxsW/Y1FLVN\n\tOyMSEgI+DDQ7mhlEKmLWUHRr3aqLUl2daNz5XP6j2lve4HBLkxugWgRwYHFGBn8cXn\n\t4cjPurB8qwq2aGIwjWAavy66Wt5rqYchE1ksWkOA=","From":"Jean-Michel Hautbois ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 30 Sep 2021 11:37:14 +0200","Message-Id":"<20210930093715.73293-12-jeanmichel.hautbois@ideasonboard.com>","X-Mailer":"git-send-email 2.30.2","In-Reply-To":"<20210930093715.73293-1-jeanmichel.hautbois@ideasonboard.com>","References":"<20210930093715.73293-1-jeanmichel.hautbois@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 11/12] ipa: ipu3: agc: Rewrite and\n\tsimplify the brightness loop","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":"Now that we know how the AWB statistics are formatted, use a simplified\nloop in processBrightness() to parse the green values and get the\nhistogram.\n\nSigned-off-by: Jean-Michel Hautbois \n---\n src/ipa/ipu3/algorithms/agc.cpp | 55 ++++++++++++---------------------\n src/ipa/ipu3/algorithms/agc.h | 2 ++\n 2 files changed, 22 insertions(+), 35 deletions(-)","diff":"diff --git a/src/ipa/ipu3/algorithms/agc.cpp b/src/ipa/ipu3/algorithms/agc.cpp\nindex 5ff50f4a..46e01fc4 100644\n--- a/src/ipa/ipu3/algorithms/agc.cpp\n+++ b/src/ipa/ipu3/algorithms/agc.cpp\n@@ -6,6 +6,7 @@\n */\n \n #include \"agc.h\"\n+#include \"awb.h\"\n \n #include \n #include \n@@ -47,9 +48,6 @@ static constexpr uint32_t kMaxExposure = 1976;\n static constexpr uint32_t knumHistogramBins = 256;\n static constexpr double kEvGainTarget = 0.5;\n \n-/* A cell is 8 bytes and contains averages for RGB values and saturation ratio */\n-static constexpr uint8_t kCellSize = 8;\n-\n Agc::Agc()\n \t: frameCount_(0), lastFrame_(0), iqMean_(0.0), lineDuration_(0s),\n \t maxExposureTime_(0s), prevExposure_(0s), prevExposureNoDg_(0s),\n@@ -57,9 +55,10 @@ Agc::Agc()\n {\n }\n \n-int Agc::configure([[maybe_unused]] IPAContext &context,\n-\t\t const IPAConfigInfo &configInfo)\n+int Agc::configure(IPAContext &context, const IPAConfigInfo &configInfo)\n {\n+\tstride_ = context.configuration.grid.stride;\n+\n \tlineDuration_ = configInfo.sensorInfo.lineLength * 1.0s\n \t\t / configInfo.sensorInfo.pixelRate;\n \tmaxExposureTime_ = kMaxExposure * lineDuration_;\n@@ -70,37 +69,23 @@ int Agc::configure([[maybe_unused]] IPAContext &context,\n void Agc::processBrightness(const ipu3_uapi_stats_3a *stats,\n \t\t\t const 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-\t\t\t statsAeGrid.y_start,\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 >> 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 << 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 >> grid.block_height_log2);\n-\t j++) {\n-\t\tfor (i = startX + startY; i < endX + startY; i += kCellSize) {\n-\t\t\t/*\n-\t\t\t * The grid width (and maybe height) is not reliable.\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 * 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+\n+\tfor (unsigned int cellY = 0; cellY < grid.height; cellY++) {\n+\t\tfor (unsigned int cellX = 0; cellX < grid.width; cellX++) {\n+\t\t\tuint32_t cellPosition = cellY * stride_ + cellX\n+\t\t\t\t\t * sizeof(Ipu3AwbCell);\n+\n+\t\t\t/* Cast the initial IPU3 structure to simplify the reading */\n+\t\t\tconst Ipu3AwbCell *cell =\n+\t\t\t\treinterpret_cast(\n+\t\t\t\t\t&stats->awb_raw_buffer.meta_data[cellPosition]\n+\t\t\t\t);\n+\n+\t\t\tif (cell->satRatio == 0) {\n+\t\t\t\tuint8_t gr = cell->greenRedAvg;\n+\t\t\t\tuint8_t gb = cell->greenBlueAvg;\n+\t\t\t\thist[(gr + gb) / 2]++;\n \t\t\t}\n \t\t}\n \t}\ndiff --git a/src/ipa/ipu3/algorithms/agc.h b/src/ipa/ipu3/algorithms/agc.h\nindex e36797d3..64b71c65 100644\n--- a/src/ipa/ipu3/algorithms/agc.h\n+++ b/src/ipa/ipu3/algorithms/agc.h\n@@ -50,6 +50,8 @@ private:\n \tDuration prevExposureNoDg_;\n \tDuration currentExposure_;\n \tDuration currentExposureNoDg_;\n+\n+\tuint32_t stride_;\n };\n \n } /* namespace ipa::ipu3::algorithms */\n","prefixes":["libcamera-devel","v2","11/12"]}