Patch Detail
Show a patch.
GET /api/1.1/patches/13417/?format=api
{ "id": 13417, "url": "https://patchwork.libcamera.org/api/1.1/patches/13417/?format=api", "web_url": "https://patchwork.libcamera.org/patch/13417/", "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": "<20210820121149.85859-3-jeanmichel.hautbois@ideasonboard.com>", "date": "2021-08-20T12:11:49", "name": "[libcamera-devel,v1,2/2] ipa: ipu3: awb: remove local storage of the grid", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "e198f0707a506e172c485e673f2c59ec54c7f10a", "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/13417/mbox/", "series": [ { "id": 2375, "url": "https://patchwork.libcamera.org/api/1.1/series/2375/?format=api", "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/13417/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/13417/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 B768BC3242\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 20 Aug 2021 12:11:55 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 42F10688A3;\n\tFri, 20 Aug 2021 14:11:55 +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 B907A6025E\n\tfor <libcamera-devel@lists.libcamera.org>;\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 6A5171207;\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=\"eWqbax8U\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1629461512;\n\tbh=mTKCtwLCQ5omf9LgicReHlSwTxuWkdW4JripFJDO7EI=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=eWqbax8U3mB6g7bntOSQVNRZCXAjdKUU0vPJyKSVJr2pHoF6NKZ7JcRmZ9d44y/2z\n\t+L+A1OJN2sS49EwTZUtXKKApxeyG2Y92xPBGnQAASfwcPTukehHheJtUEq8wHJchgD\n\t4TAc4XgIg7SNaRGlqBG2I4vYwYKdP460hwjOC+W4=", "From": "Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 20 Aug 2021 14:11:49 +0200", "Message-Id": "<20210820121149.85859-3-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 2/2] ipa: ipu3: awb: 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 it at prepare() and process() calls in AWB and pass it as a reference\nto the private functions when needed.\n\nSigned-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>\n---\n src/ipa/ipu3/algorithms/awb.cpp | 29 ++++++++++++++++-------------\n src/ipa/ipu3/algorithms/awb.h | 8 ++++----\n 2 files changed, 20 insertions(+), 17 deletions(-)", "diff": "diff --git a/src/ipa/ipu3/algorithms/awb.cpp b/src/ipa/ipu3/algorithms/awb.cpp\nindex e15f7406..72ec5f88 100644\n--- a/src/ipa/ipu3/algorithms/awb.cpp\n+++ b/src/ipa/ipu3/algorithms/awb.cpp\n@@ -175,20 +175,21 @@ void Awb::generateZones(std::vector<RGB> &zones)\n }\n \n /* Translate the IPU3 statistics into the default statistics region array */\n-void Awb::generateAwbStats(const ipu3_uapi_stats_3a *stats)\n+void Awb::generateAwbStats(const ipu3_uapi_stats_3a *stats,\n+\t\t\t struct ipu3_uapi_grid_config &grid)\n {\n-\tuint32_t regionWidth = round(awbGrid_.width / static_cast<double>(kAwbStatsSizeX));\n-\tuint32_t regionHeight = round(awbGrid_.height / static_cast<double>(kAwbStatsSizeY));\n+\tuint32_t regionWidth = round(grid.width / static_cast<double>(kAwbStatsSizeX));\n+\tuint32_t regionHeight = round(grid.height / static_cast<double>(kAwbStatsSizeY));\n \n \t/*\n \t * Generate a (kAwbStatsSizeX x kAwbStatsSizeY) array from the IPU3 grid which is\n-\t * (awbGrid_.width x awbGrid_.height).\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 * awbGrid_.width + 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 / awbGrid_.width) / regionHeight) % kAwbStatsSizeY;\n+\t\t\tuint32_t cellY = ((cellPosition / grid.width) / regionHeight) % kAwbStatsSizeY;\n \n \t\t\tuint32_t awbRegionPosition = cellY * kAwbStatsSizeX + cellX;\n \t\t\tcellPosition *= 8;\n@@ -258,12 +259,13 @@ void Awb::awbGreyWorld()\n \tasyncResults_.blueGain = blueGain;\n }\n \n-void Awb::calculateWBGains(const ipu3_uapi_stats_3a *stats)\n+void Awb::calculateWBGains(const ipu3_uapi_stats_3a *stats,\n+\t\t\t struct ipu3_uapi_grid_config &grid)\n {\n \tASSERT(stats->stats_3a_status.awb_en);\n \tzones_.clear();\n \tclearAwbStats();\n-\tgenerateAwbStats(stats);\n+\tgenerateAwbStats(stats, grid);\n \tgenerateZones(zones_);\n \tLOG(IPU3Awb, Debug) << \"Valid zones: \" << zones_.size();\n \tif (zones_.size() > 10) {\n@@ -275,7 +277,8 @@ void Awb::calculateWBGains(const ipu3_uapi_stats_3a *stats)\n \n void Awb::process(IPAContext &context, const ipu3_uapi_stats_3a *stats)\n {\n-\tcalculateWBGains(stats);\n+\tstruct ipu3_uapi_grid_config grid = context.configuration.grid.bdsGrid;\n+\tcalculateWBGains(stats, grid);\n \n \t/*\n \t * Gains are only recalculated if enough zones were detected.\n@@ -296,9 +299,9 @@ void Awb::prepare(IPAContext &context, ipu3_uapi_params *params)\n \t\t\t\t\t | IPU3_UAPI_AWB_RGBS_THR_B_EN\n \t\t\t\t\t | 8191;\n \n-\tawbGrid_ = context.configuration.grid.bdsGrid;\n+\tstruct ipu3_uapi_grid_config grid = context.configuration.grid.bdsGrid;\n \n-\tparams->acc_param.awb.config.grid = context.configuration.grid.bdsGrid;\n+\tparams->acc_param.awb.config.grid = grid;\n \n \t/*\n \t * Optical center is column start (respectively row start) of the\n@@ -310,8 +313,8 @@ void Awb::prepare(IPAContext &context, ipu3_uapi_params *params)\n \tparams->acc_param.bnr = imguCssBnrDefaults;\n \tSize &bdsOutputSize = context.configuration.grid.bdsOutputSize;\n \tparams->acc_param.bnr.column_size = bdsOutputSize.width;\n-\tparams->acc_param.bnr.opt_center.x_reset = awbGrid_.x_start - (bdsOutputSize.width / 2);\n-\tparams->acc_param.bnr.opt_center.y_reset = awbGrid_.y_start - (bdsOutputSize.height / 2);\n+\tparams->acc_param.bnr.opt_center.x_reset = grid.x_start - (bdsOutputSize.width / 2);\n+\tparams->acc_param.bnr.opt_center.y_reset = grid.y_start - (bdsOutputSize.height / 2);\n \tparams->acc_param.bnr.opt_center_sqr.x_sqr_reset = params->acc_param.bnr.opt_center.x_reset\n \t\t\t\t\t\t\t* params->acc_param.bnr.opt_center.x_reset;\n \tparams->acc_param.bnr.opt_center_sqr.y_sqr_reset = params->acc_param.bnr.opt_center.y_reset\ndiff --git a/src/ipa/ipu3/algorithms/awb.h b/src/ipa/ipu3/algorithms/awb.h\nindex fac54e45..3807cc14 100644\n--- a/src/ipa/ipu3/algorithms/awb.h\n+++ b/src/ipa/ipu3/algorithms/awb.h\n@@ -71,15 +71,15 @@ public:\n \t};\n \n private:\n-\tvoid calculateWBGains(const ipu3_uapi_stats_3a *stats);\n+\tvoid calculateWBGains(const ipu3_uapi_stats_3a *stats,\n+\t\t\t struct ipu3_uapi_grid_config &grid);\n \tvoid generateZones(std::vector<RGB> &zones);\n-\tvoid generateAwbStats(const ipu3_uapi_stats_3a *stats);\n+\tvoid generateAwbStats(const ipu3_uapi_stats_3a *stats,\n+\t\t\t struct ipu3_uapi_grid_config &grid);\n \tvoid clearAwbStats();\n \tvoid awbGreyWorld();\n \tuint32_t estimateCCT(double red, double green, double blue);\n \n-\tstruct ipu3_uapi_grid_config awbGrid_;\n-\n \tstd::vector<RGB> zones_;\n \tIspStatsRegion awbStats_[kAwbStatsSizeX * kAwbStatsSizeY];\n \tAwbStatus asyncResults_;\n", "prefixes": [ "libcamera-devel", "v1", "2/2" ] }