Patch Detail
Show a patch.
GET /api/patches/15554/?format=api
{ "id": 15554, "url": "https://patchwork.libcamera.org/api/patches/15554/?format=api", "web_url": "https://patchwork.libcamera.org/patch/15554/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20220325092555.1799897-5-kieran.bingham@ideasonboard.com>", "date": "2022-03-25T09:25:54", "name": "[libcamera-devel,v3,4/5] ipa: ipu3: af: Use Span for y_table_item_t", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "5ecb9efa34101c29b4e0ffbd956fca673dd8fd46", "submitter": { "id": 4, "url": "https://patchwork.libcamera.org/api/people/4/?format=api", "name": "Kieran Bingham", "email": "kieran.bingham@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/15554/mbox/", "series": [ { "id": 3000, "url": "https://patchwork.libcamera.org/api/series/3000/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3000", "date": "2022-03-25T09:25:50", "name": "ipa: ipu3: af: Small improvements", "version": 3, "mbox": "https://patchwork.libcamera.org/series/3000/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/15554/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/15554/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 79423C3265\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 25 Mar 2022 09:26:06 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4F200604EA;\n\tFri, 25 Mar 2022 10:26:05 +0100 (CET)", "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 8B7EB604D5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 25 Mar 2022 10:26:01 +0100 (CET)", "from Monstersaurus.ksquared.org.uk.beta.tailscale.net\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2C82AE15;\n\tFri, 25 Mar 2022 10:26:01 +0100 (CET)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1648200365;\n\tbh=ovvmB/xUUnlsheOFLNWFFfwAF2vEsqOHGr0LJiKnFlM=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=n3TIcAp4PK1q2y6+rFridtug21VDGuYOiuKsrLnW7ij9vdrDZdaokawxxSRaBuXAX\n\t2mNS4a5g4b9LcLPJsoQEuyVOE5VB6UcBT8x4pDeoByz8GJD8AOYLBKZ3Mu6Un3Fb8F\n\tckWjy2g1A6UhclSEbef6zY4tvObhT9kJMeBhRst0YpPG3pOKJOfc57jkgEsS+qyR/D\n\tMcM26XcAu+DzZ2w3pUVOkLqRuxuKf6NQlHwSU3AU1OB7cVdRDoy0EcL9nOC2tE1Gkt\n\tsPM6NRFYYuXWrohJ6dP09KbKKBEuNc3uZKYBlA2O1JdRV6fKk38xdBputkvC+20dUl\n\tbcjjUfQ1Jy3fQ==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1648200361;\n\tbh=ovvmB/xUUnlsheOFLNWFFfwAF2vEsqOHGr0LJiKnFlM=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=G+Y8aF16pVZClb1KsVkSOHDaEepOyZXgnr4XR2RXydI8eHI07Rce8/A0itrG7XRF2\n\thS9rZgiP9ujMpq5MeM90A20jSSdmqcEjll8oeR+GRX7dbdW6LXae+5XkCBvH44pqqe\n\tJmyzX+u+rsbKJQQ+zOLHdIm5z46yTGPlQYtOneR4=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"G+Y8aF16\"; dkim-atps=neutral", "To": "libcamera devel <libcamera-devel@lists.libcamera.org>,\n\tKate Hsuan <hpa@redhat.com>,\n\tJean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>", "Date": "Fri, 25 Mar 2022 09:25:54 +0000", "Message-Id": "<20220325092555.1799897-5-kieran.bingham@ideasonboard.com>", "X-Mailer": "git-send-email 2.32.0", "In-Reply-To": "<20220325092555.1799897-1-kieran.bingham@ideasonboard.com>", "References": "<20220325092555.1799897-1-kieran.bingham@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 4/5] ipa: ipu3: af: Use Span for\n\ty_table_item_t", "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>", "From": "Kieran Bingham via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Kieran Bingham <kieran.bingham@ideasonboard.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Convert the y_table_item_t to a Span and use that for iteration when\nestimating variance of the table.\n\nSigned-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\n---\nv3:\n - Remove parentheses and casting in afEstimateVariance\n\n src/ipa/ipu3/algorithms/af.cpp | 34 +++++++++++++++++-----------------\n src/ipa/ipu3/algorithms/af.h | 4 ++--\n 2 files changed, 19 insertions(+), 19 deletions(-)", "diff": "diff --git a/src/ipa/ipu3/algorithms/af.cpp b/src/ipa/ipu3/algorithms/af.cpp\nindex 6893a15fdc07..c0f2d34368cb 100644\n--- a/src/ipa/ipu3/algorithms/af.cpp\n+++ b/src/ipa/ipu3/algorithms/af.cpp\n@@ -335,29 +335,29 @@ void Af::afIgnoreFrameReset()\n *\n * \\return The variance of the values in the data set \\a y_item selected by \\a isY1\n */\n-double Af::afEstimateVariance(const y_table_item_t *y_item, uint32_t len,\n-\t\t\t bool isY1)\n+double Af::afEstimateVariance(Span<const y_table_item_t> y_items, bool isY1)\n {\n-\tuint32_t z = 0;\n \tuint32_t total = 0;\n \tdouble mean;\n \tdouble var_sum = 0;\n \n-\tfor (z = 0; z < len; z++) {\n+\tfor (auto y : y_items) {\n \t\tif (isY1)\n-\t\t\ttotal += y_item[z].y1_avg;\n+\t\t\ttotal += y.y1_avg;\n \t\telse\n-\t\t\ttotal += y_item[z].y2_avg;\n+\t\t\ttotal += y.y2_avg;\n \t}\n-\tmean = total / len;\n-\tfor (z = 0; z < len; z++) {\n+\n+\tmean = total / y_items.size();\n+\n+\tfor (auto y : y_items) {\n \t\tif (isY1)\n-\t\t\tvar_sum += pow((y_item[z].y1_avg - mean), 2);\n+\t\t\tvar_sum += pow(y.y1_avg - mean, 2);\n \t\telse\n-\t\t\tvar_sum += pow((y_item[z].y2_avg - mean), 2);\n+\t\t\tvar_sum += pow(y.y2_avg - mean, 2);\n \t}\n \n-\treturn var_sum / static_cast<double>(len);\n+\treturn var_sum / y_items.size();\n }\n \n /**\n@@ -405,21 +405,21 @@ bool Af::afIsOutOfFocus(IPAContext context)\n */\n void Af::process(IPAContext &context, const ipu3_uapi_stats_3a *stats)\n {\n-\tconst y_table_item_t *y_item = reinterpret_cast<const y_table_item_t *>(&stats->af_raw_buffer.y_table);\n-\tuint32_t afRawBufferLen;\n-\n \t/* Evaluate the AF buffer length */\n-\tafRawBufferLen = context.configuration.af.afGrid.width *\n-\t\t\t context.configuration.af.afGrid.height;\n+\tuint32_t afRawBufferLen = context.configuration.af.afGrid.width *\n+\t\t\t\t context.configuration.af.afGrid.height;\n \n \tASSERT(afRawBufferLen < IPU3_UAPI_AF_Y_TABLE_MAX_SIZE);\n \n+\tSpan<const y_table_item_t> y_items(reinterpret_cast<const y_table_item_t *>(&stats->af_raw_buffer.y_table),\n+\t\t\t\t\t afRawBufferLen);\n+\n \t/*\n \t * Calculate the mean and the variance of AF statistics for a given grid.\n \t * For coarse: y1 are used.\n \t * For fine: y2 results are used.\n \t */\n-\tcurrentVariance_ = afEstimateVariance(y_item, afRawBufferLen, !coarseCompleted_);\n+\tcurrentVariance_ = afEstimateVariance(y_items, !coarseCompleted_);\n \n \tif (!context.frameContext.af.stable) {\n \t\tafCoarseScan(context);\ndiff --git a/src/ipa/ipu3/algorithms/af.h b/src/ipa/ipu3/algorithms/af.h\nindex 3b5758e868ea..b85cf94163ff 100644\n--- a/src/ipa/ipu3/algorithms/af.h\n+++ b/src/ipa/ipu3/algorithms/af.h\n@@ -41,8 +41,8 @@ private:\n \tvoid afReset(IPAContext &context);\n \tbool afNeedIgnoreFrame();\n \tvoid afIgnoreFrameReset();\n-\tdouble afEstimateVariance(const y_table_item_t *y_item, uint32_t len,\n-\t\t\t\t bool isY1);\n+\tdouble afEstimateVariance(Span<const y_table_item_t> y_items, bool isY1);\n+\n \tbool afIsOutOfFocus(IPAContext context);\n \n \t/* VCM step configuration. It is the current setting of the VCM step. */\n", "prefixes": [ "libcamera-devel", "v3", "4/5" ] }