Patch Detail
Show a patch.
GET /api/1.1/patches/13422/?format=api
{ "id": 13422, "url": "https://patchwork.libcamera.org/api/1.1/patches/13422/?format=api", "web_url": "https://patchwork.libcamera.org/patch/13422/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20210820160028.104265-2-jeanmichel.hautbois@ideasonboard.com>", "date": "2021-08-20T16:00:27", "name": "[libcamera-devel,v3,1/2] ipa: ipu3: agc: remove local storage of the grid", "commit_ref": "b3befe2ef03794f5d8c2241e5809cb7dca8735e7", "pull_url": null, "state": "accepted", "archived": false, "hash": "a2eb6d7190c5e27ee1f7b476ffa7fcee58dd883c", "submitter": { "id": 75, "url": "https://patchwork.libcamera.org/api/1.1/people/75/?format=api", "name": "Jean-Michel Hautbois", "email": "jeanmichel.hautbois@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/13422/mbox/", "series": [ { "id": 2377, "url": "https://patchwork.libcamera.org/api/1.1/series/2377/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2377", "date": "2021-08-20T16:00:26", "name": "Remove local storage of the grid in algorithms", "version": 3, "mbox": "https://patchwork.libcamera.org/series/2377/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/13422/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/13422/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 074A8BD87D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 20 Aug 2021 16:00:38 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9996768895;\n\tFri, 20 Aug 2021 18:00:36 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DA8DC68891\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 20 Aug 2021 18:00:33 +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 74A5C11C7;\n\tFri, 20 Aug 2021 18:00:33 +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=\"YNELilqr\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1629475233;\n\tbh=Vs44Sew1v4PdznUBVKXhPkm2s/S8Z2d4vTHltJeByAI=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=YNELilqr62Ca7my0UrULjxzr2piohTK4xWybtAYjSu6zkN0iLfWS9WjAdbN4i45xB\n\t/zJjnsycoMIkudZR320wJhAfKJUwsrFkS62wAdr+RVveK2HBtEHb9EBexCReLP9hR5\n\teGZvpJ19A7nz4WNQJ/9dy5JefHG41e9GCr4Df+iE=", "From": "Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 20 Aug 2021 18:00:27 +0200", "Message-Id": "<20210820160028.104265-2-jeanmichel.hautbois@ideasonboard.com>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20210820160028.104265-1-jeanmichel.hautbois@ideasonboard.com>", "References": "<20210820160028.104265-1-jeanmichel.hautbois@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "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 <jeanmichel.hautbois@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/ipa/ipu3/algorithms/agc.cpp | 28 ++++++++++++++--------------\n src/ipa/ipu3/algorithms/agc.h | 5 ++---\n 2 files changed, 16 insertions(+), 17 deletions(-)", "diff": "diff --git a/src/ipa/ipu3/algorithms/agc.cpp b/src/ipa/ipu3/algorithms/agc.cpp\nindex e4598b2e..5ff50f4a 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 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@@ -76,19 +76,19 @@ void Agc::processBrightness(const ipu3_uapi_stats_3a *stats)\n \t\t\t static_cast<unsigned int>(statsAeGrid.x_end - statsAeGrid.x_start) + 1,\n \t\t\t static_cast<unsigned int>(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,7 @@ 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+\tprocessBrightness(stats, context.configuration.grid.bdsGrid);\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..e36797d3 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 const 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", "v3", "1/2" ] }