Patch Detail
Show a patch.
GET /api/1.1/patches/26244/?format=api
{ "id": 26244, "url": "https://patchwork.libcamera.org/api/1.1/patches/26244/?format=api", "web_url": "https://patchwork.libcamera.org/patch/26244/", "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": "<20260303111741.17417-2-johannes.goede@oss.qualcomm.com>", "date": "2026-03-03T11:17:38", "name": "[v4,1/4] software_isp: swstats_cpu: Prepare for multi-threading support", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "0cf12c28f9da8090733e4008e68663fc2ea05468", "submitter": { "id": 242, "url": "https://patchwork.libcamera.org/api/1.1/people/242/?format=api", "name": "Hans de Goede", "email": "johannes.goede@oss.qualcomm.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/26244/mbox/", "series": [ { "id": 5816, "url": "https://patchwork.libcamera.org/api/1.1/series/5816/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5816", "date": "2026-03-03T11:17:37", "name": "software_isp: debayer_cpu: Add multi-threading support", "version": 4, "mbox": "https://patchwork.libcamera.org/series/5816/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/26244/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/26244/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 EFCE4C0DA4\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 3 Mar 2026 11:17:53 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6CFBA62381;\n\tTue, 3 Mar 2026 12:17:52 +0100 (CET)", "from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com\n\t[205.220.168.131])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E7D7D621CE\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 3 Mar 2026 12:17:49 +0100 (CET)", "from pps.filterd (m0279865.ppops.net [127.0.0.1])\n\tby mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id\n\t6239nGFA3349612 for <libcamera-devel@lists.libcamera.org>;\n\tTue, 3 Mar 2026 11:17:48 GMT", "from mail-qk1-f199.google.com (mail-qk1-f199.google.com\n\t[209.85.222.199])\n\tby mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cnhxsahwt-1\n\t(version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT)\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 03 Mar 2026 11:17:48 +0000 (GMT)", "by mail-qk1-f199.google.com with SMTP id\n\taf79cd13be357-8cb3b6b37d8so3482211785a.3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 03 Mar 2026 03:17:48 -0800 (PST)", "from t14s\n\t(2001-1c00-0c32-7800-beb3-9058-f5fe-3f2e.cable.dynamic.v6.ziggo.nl.\n\t[2001:1c00:c32:7800:beb3:9058:f5fe:3f2e])\n\tby smtp.gmail.com with ESMTPSA id\n\t4fb4d7f45d1cf-66003479178sm2958144a12.9.2026.03.03.03.17.44\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 03 Mar 2026 03:17:44 -0800 (PST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=qualcomm.com header.i=@qualcomm.com\n\theader.b=\"fPJ/7AT2\"; dkim=pass (2048-bit key;\n\tunprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com\n\theader.b=\"fl96v1et\"; dkim-atps=neutral", "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h=\n\tcc:content-transfer-encoding:date:from:in-reply-to:message-id\n\t:mime-version:references:subject:to; s=qcppdkim1; bh=Q9h8k+AeUz8\n\tt+HWwjwjc7na33VwWe6woYgARNnc/Hyc=; b=fPJ/7AT2TNsbyqs5hK8otxmwwh7\n\tx8Mwc3Dt4Y/h7mD6Nqk+NSgF0DM34CVcneqxYr2+pqNXFFM8br9NHbBwjlmPHana\n\trAXeJbRBBR1FNFEzWbZMdwpThutbuIutLVGL8d607kU8bOKZaGCSuvV8eVq4syzq\n\tnZHdJCGF6Ph9OmtqNbS9HbXMTRtugYg5N3m+tvjg+7hd5uODkYhbKUJtmeJrCZZ4\n\tZA8ySKj2+Bv/QJ11LTs10IMetvc7StnNGlr0CjioAU9o/qAG2vWmaEtwGJufomCQ\n\tt/0dZ+tv/1U/qY+flDYLjxMsHbHgQ/Z0s3cVTPJYP/G9HVw2AkW8sjlJgvw==", "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=oss.qualcomm.com; s=google; t=1772536667; x=1773141467;\n\tdarn=lists.libcamera.org; \n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=Q9h8k+AeUz8t+HWwjwjc7na33VwWe6woYgARNnc/Hyc=;\n\tb=fl96v1etIJz2cbdNMd8tqB1fw3xfaC3l/TDqQzJ1pB9p9m5Gv+MSg/GlBXYzTwW+XU\n\tEP3FXHvr0GTBNsWofIpGg+eieu7dMsxJNQxDzAQlHq3j7PJgmlJewoaAn0decSTvlq0A\n\tmPsPmW+8wbb2oYeQKSLO2F9mew6kKGiAezbNeOhrtBlLIH9xcbfofxUMJvmoe2Ybk8vk\n\tI8y8f5cFMZDiCKRCK0vt4azPb2A2kZ7MsszRS9HI508+7FjNNdfIWTHsc0pQCcGNCdCE\n\tckqkoVjpJA4fR7uJc+1aPcm8+iP06U2Qlza27o7L3rgTyz/muNWVNwX/p4ijamkVIBHf\n\tb8ZA==" ], "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1772536667; x=1773141467;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n\t:to:cc:subject:date:message-id:reply-to;\n\tbh=Q9h8k+AeUz8t+HWwjwjc7na33VwWe6woYgARNnc/Hyc=;\n\tb=vzb9RoTkNx+1L30386syyc51lz2F6f/znabk8yhpAl5bFG5Q2JLrt6WcgPC8I+bduJ\n\tcgiPsZFuivdeGQUEM014FYzFCd0fJwHuz+sYfJE3UWFJ+1g5fg2MTUIZn9kEXCwZRsNS\n\tGxOj6F89JChgm6WD2mHTv5zWri6/Eehus9xLj8CCkg+MKOgmXfn3Mnxa6EjsYci1ptmc\n\tGaO56y8vnijZ9avPC0wI6BxzWFrv3kAcHx9JxJO/fyus6PVqlJjAluqnPpPa/XBC92Jc\n\tIazGuwKcGbx7tCUdZryLwBqFZNDEcjBHXBR51i5yUBCn2Cmc3+UABVVg/Piy7nQ/Mn9v\n\tKx2A==", "X-Gm-Message-State": "AOJu0YwSKWhTgNLM3NxOZyHIx0KtbLWc7hw6hVnOteb/L6yzAydr08rQ\n\txnAw2vFWSJrHvo5VY9HnbEvNjCyGlcM4+trDKD1BSBJDI37ZBFQmcjPsBHA8l09TVBeUq188NJL\n\tTlFewAiiiAqM6EkfCzu0NlZp6sX6NToQ+prRKnWmZZaNH9PIPJDkp/i96ABdv/eHdKmQhXq5aiY\n\tTiv7rq707W", "X-Gm-Gg": "ATEYQzxiXPzb6y9vMlkHQ49Bi30tNeusLIrLCmrT5zGul+7+swETCRJH/bamMFyV/23\n\tiZvqV+vSxe1P2AKfjmMimr1B0FUhjMQTiWj+d0Ig8KhS4Rr8VYPU8q5iccr+EP8NKPtHKLqm+oY\n\thGzX6QV4amxarXEaPxZJiDNEIdQYPfa+w4RmFhzRaeXi8H1p/xUFq6wc2UFsQ44jIFgEmorvORP\n\tQ+pooc9mFObLJ9PaxRYzNqBMiFrZj+iAimZ9pL6HR6h9ZLkTpJgZv4N3d0N94k5bYpkJQuYJCnV\n\tK3j7SCIUWwX3ekSgscG+zOOk0szZm7LPdCkv+h4cTOieMq/+dtXwzXetbd3oENjlzWLT/uggtMt\n\tYQemuh1G4mjIN0lde3iaaMqa4AMj0LnQFdm4e+1nVYFeZnFoGZg6i3mE/3owO/igcJtRDx5XlJM\n\tzOekw7dFmifxHQ87dbTQb4WRsXxoBZUSv8xw==", "X-Received": [ "by 2002:a05:620a:2806:b0:8c9:eb6a:1659 with SMTP id\n\taf79cd13be357-8cbc8d671b4mr1562242785a.9.1772536667042; \n\tTue, 03 Mar 2026 03:17:47 -0800 (PST)", "by 2002:a05:620a:2806:b0:8c9:eb6a:1659 with SMTP id\n\taf79cd13be357-8cbc8d671b4mr1562239885a.9.1772536666515; \n\tTue, 03 Mar 2026 03:17:46 -0800 (PST)" ], "From": "Hans de Goede <johannes.goede@oss.qualcomm.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>,\n\tHans de Goede <johannes.goede@oss.qualcomm.com>", "Subject": "[PATCH v4 1/4] software_isp: swstats_cpu: Prepare for\n\tmulti-threading support", "Date": "Tue, 3 Mar 2026 12:17:38 +0100", "Message-ID": "<20260303111741.17417-2-johannes.goede@oss.qualcomm.com>", "X-Mailer": "git-send-email 2.52.0", "In-Reply-To": "<20260303111741.17417-1-johannes.goede@oss.qualcomm.com>", "References": "<20260303111741.17417-1-johannes.goede@oss.qualcomm.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-Proofpoint-ORIG-GUID": "Q5asM91nASRsUa9nAb8bn1KAq6uwS_ze", "X-Authority-Analysis": "v=2.4 cv=dfmNHHXe c=1 sm=1 tr=0 ts=69a6c35c cx=c_pps\n\ta=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=Yq5XynenixoA:10\n\ta=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22\n\ta=Um2Pa8k9VHT-vaBCBUpS:22 a=20KFwNOVAAAA:8 a=EUspDBNiAAAA:8\n\ta=VvikW9XIONpR7lsxkDIA:9 a=bTQJ7kPSJx9SKPbeHEYW:22", "X-Proofpoint-GUID": "Q5asM91nASRsUa9nAb8bn1KAq6uwS_ze", "X-Proofpoint-Spam-Details-Enc": "AW1haW4tMjYwMzAzMDA4NiBTYWx0ZWRfXzldDBOH+uFGD\n\tvix6WvVJdlOwBS63sycOhVsIX60nCgU9TePsD/a23RGEYKvRnCcQLf0x3E0+n6fOMyI/jxX6d1k\n\tc2yYg+50a+ISgg1+TlY6LvuVLZbVkzx/qpWJ2WGqA1SuyO9dOF+qFTuXa9QwtzqZSOcCRXHaYgW\n\tZ4tqZpJ5lVqyuSy98SXgr2WKvqd6QHSj6Qu+Y3U3ZhovU38DJzD512wWjDv3eKP6gDY6gjPD6Do\n\tVTSsLX/JCpHF0+rH0mwCNexJ0Zvr8BjzU/iEjVtEDCSE2jiNJvFj47QIwtMzkd5RTRKX6dFK3nr\n\tv3litK4DjTMdGSkqkiQphbv3q/Km8k067jK0ZRHQR7MRygOe/mf9SJmvXtgEWbyOkGTq53qGciA\n\tQzWIaOf4cBZE0PadfeMB0V/Ru2sgPfHxjQIJ7cUbOo4XK7pbng0Y0UDNgrvY0rmQHzNYyCGVdDs\n\t5nEx/2v0j+hKVp8upHw==", "X-Proofpoint-Virus-Version": "vendor=baseguard\n\tengine=ICAP:2.0.293, Aquarius:18.0.1121, Hydra:6.1.51,\n\tFMLib:17.12.100.49\n\tdefinitions=2026-03-02_05,2026-03-03_01,2025-10-01_01", "X-Proofpoint-Spam-Details": "rule=outbound_notspam policy=outbound score=0\n\tmalwarescore=0 bulkscore=0 impostorscore=0 phishscore=0 clxscore=1015\n\tspamscore=0 adultscore=0 suspectscore=0 lowpriorityscore=0\n\tpriorityscore=1501\n\tclassifier=typeunknown authscore=0 authtc= authcc= route=outbound\n\tadjust=0\n\treason=mlx scancount=1 engine=8.22.0-2602130000\n\tdefinitions=main-2603030086", "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": "Make the storage used to accumulate the RGB sums and the Y histogram\nvalue a vector of SwIspStats objects instead of a single object so\nthat when using multi-threading every thread can use its own storage to\ncollect intermediate stats to avoid cache-line bouncing.\n\nBenchmarking with the GPU-ISP which does separate swstats benchmarking,\non the Arduino Uno-Q which has a weak CPU which is good for performance\ntesting, shows 20ms to generate stats for a 3272x2464 frame both before\nand after this change.\n\nReviewed-by: Milan Zamazal <mzamazal@redhat.com>\nSigned-off-by: Hans de Goede <johannes.goede@oss.qualcomm.com>\n---\nChanges in v4:\n- Use const in for (const auto &s : stats_) {} in SwStatsCpu::finishFrame()\n- Add Milan's Reviewed-by\n\nChanges in v3:\n- Use for (auto &s : stats_) {}\n\nChanges in v2:\n- Move the allocation of the vector of SwIspStats objects to inside\n the SwStatsCpu class, controlled by a configure() arguments instead\n of making the caller allocate the objects\n---\n .../internal/software_isp/swstats_cpu.h | 25 ++++-----\n src/libcamera/software_isp/swstats_cpu.cpp | 54 +++++++++++++------\n 2 files changed, 50 insertions(+), 29 deletions(-)", "diff": "diff --git a/include/libcamera/internal/software_isp/swstats_cpu.h b/include/libcamera/internal/software_isp/swstats_cpu.h\nindex 64b3e23f5..feee92f99 100644\n--- a/include/libcamera/internal/software_isp/swstats_cpu.h\n+++ b/include/libcamera/internal/software_isp/swstats_cpu.h\n@@ -12,6 +12,7 @@\n #pragma once\n \n #include <stdint.h>\n+#include <vector>\n \n #include <libcamera/base/signal.h>\n \n@@ -51,13 +52,13 @@ public:\n \n \tconst Size &patternSize() { return patternSize_; }\n \n-\tint configure(const StreamConfiguration &inputCfg);\n+\tint configure(const StreamConfiguration &inputCfg, unsigned int statsBufferCount = 1);\n \tvoid setWindow(const Rectangle &window);\n \tvoid startFrame(uint32_t frame);\n \tvoid finishFrame(uint32_t frame, uint32_t bufferId);\n \tvoid processFrame(uint32_t frame, uint32_t bufferId, FrameBuffer *input);\n \n-\tvoid processLine0(uint32_t frame, unsigned int y, const uint8_t *src[])\n+\tvoid processLine0(uint32_t frame, unsigned int y, const uint8_t *src[], unsigned int statsBufferIndex = 0)\n \t{\n \t\tif (frame % kStatPerNumFrames)\n \t\t\treturn;\n@@ -66,10 +67,10 @@ public:\n \t\t y >= (window_.y + window_.height))\n \t\t\treturn;\n \n-\t\t(this->*stats0_)(src);\n+\t\t(this->*stats0_)(src, stats_[statsBufferIndex]);\n \t}\n \n-\tvoid processLine2(uint32_t frame, unsigned int y, const uint8_t *src[])\n+\tvoid processLine2(uint32_t frame, unsigned int y, const uint8_t *src[], unsigned int statsBufferIndex = 0)\n \t{\n \t\tif (frame % kStatPerNumFrames)\n \t\t\treturn;\n@@ -78,25 +79,25 @@ public:\n \t\t y >= (window_.y + window_.height))\n \t\t\treturn;\n \n-\t\t(this->*stats2_)(src);\n+\t\t(this->*stats2_)(src, stats_[statsBufferIndex]);\n \t}\n \n \tSignal<uint32_t, uint32_t> statsReady;\n \n private:\n-\tusing statsProcessFn = void (SwStatsCpu::*)(const uint8_t *src[]);\n+\tusing statsProcessFn = void (SwStatsCpu::*)(const uint8_t *src[], SwIspStats &stats);\n \tusing processFrameFn = void (SwStatsCpu::*)(MappedFrameBuffer &in);\n \n \tint setupStandardBayerOrder(BayerFormat::Order order);\n \t/* Bayer 8 bpp unpacked */\n-\tvoid statsBGGR8Line0(const uint8_t *src[]);\n+\tvoid statsBGGR8Line0(const uint8_t *src[], SwIspStats &stats);\n \t/* Bayer 10 bpp unpacked */\n-\tvoid statsBGGR10Line0(const uint8_t *src[]);\n+\tvoid statsBGGR10Line0(const uint8_t *src[], SwIspStats &stats);\n \t/* Bayer 12 bpp unpacked */\n-\tvoid statsBGGR12Line0(const uint8_t *src[]);\n+\tvoid statsBGGR12Line0(const uint8_t *src[], SwIspStats &stats);\n \t/* Bayer 10 bpp packed */\n-\tvoid statsBGGR10PLine0(const uint8_t *src[]);\n-\tvoid statsGBRG10PLine0(const uint8_t *src[]);\n+\tvoid statsBGGR10PLine0(const uint8_t *src[], SwIspStats &stats);\n+\tvoid statsGBRG10PLine0(const uint8_t *src[], SwIspStats &stats);\n \n \tvoid processBayerFrame2(MappedFrameBuffer &in);\n \n@@ -116,8 +117,8 @@ private:\n \tunsigned int xShift_;\n \tunsigned int stride_;\n \n+\tstd::vector<SwIspStats> stats_;\n \tSharedMemObject<SwIspStats> sharedStats_;\n-\tSwIspStats stats_;\n \tBenchmark bench_;\n };\n \ndiff --git a/src/libcamera/software_isp/swstats_cpu.cpp b/src/libcamera/software_isp/swstats_cpu.cpp\nindex 1cedcfbc1..ded0dcf1a 100644\n--- a/src/libcamera/software_isp/swstats_cpu.cpp\n+++ b/src/libcamera/software_isp/swstats_cpu.cpp\n@@ -74,11 +74,12 @@ namespace libcamera {\n */\n \n /**\n- * \\fn void SwStatsCpu::processLine0(uint32_t frame, unsigned int y, const uint8_t *src[])\n+ * \\fn void SwStatsCpu::processLine0(uint32_t frame, unsigned int y, const uint8_t *src[], unsigned int statsBufferIndex = 0)\n * \\brief Process line 0\n * \\param[in] frame The frame number\n * \\param[in] y The y coordinate.\n * \\param[in] src The input data.\n+ * \\param[in] statsBufferIndex Index of stats buffer to use for multi-threading.\n *\n * This function processes line 0 for input formats with\n * patternSize height == 1.\n@@ -97,14 +98,18 @@ namespace libcamera {\n * to the line in plane 0, etc.\n *\n * For non Bayer single plane input data only a single src pointer is required.\n+ *\n+ * The statsBufferIndex value must be less than the statsBufferCount value passed\n+ * to configure().\n */\n \n /**\n- * \\fn void SwStatsCpu::processLine2(uint32_t frame, unsigned int y, const uint8_t *src[])\n+ * \\fn void SwStatsCpu::processLine2(uint32_t frame, unsigned int y, const uint8_t *src[], unsigned int statsBufferIndex = 0)\n * \\brief Process line 2 and 3\n * \\param[in] frame The frame number\n * \\param[in] y The y coordinate.\n * \\param[in] src The input data.\n+ * \\param[in] statsBufferIndex Index of stats buffer to use for multi-threading.\n *\n * This function processes line 2 and 3 for input formats with\n * patternSize height == 4.\n@@ -182,14 +187,14 @@ static constexpr unsigned int kBlueYMul = 29; /* 0.114 * 256 */\n \tyVal = r * kRedYMul; \\\n \tyVal += g * kGreenYMul; \\\n \tyVal += b * kBlueYMul; \\\n-\tstats_.yHistogram[yVal * SwIspStats::kYHistogramSize / (256 * 256 * (div))]++;\n+\tstats.yHistogram[yVal * SwIspStats::kYHistogramSize / (256 * 256 * (div))]++;\n \n #define SWSTATS_FINISH_LINE_STATS() \\\n-\tstats_.sum_.r() += sumR; \\\n-\tstats_.sum_.g() += sumG; \\\n-\tstats_.sum_.b() += sumB;\n+\tstats.sum_.r() += sumR; \\\n+\tstats.sum_.g() += sumG; \\\n+\tstats.sum_.b() += sumB;\n \n-void SwStatsCpu::statsBGGR8Line0(const uint8_t *src[])\n+void SwStatsCpu::statsBGGR8Line0(const uint8_t *src[], SwIspStats &stats)\n {\n \tconst uint8_t *src0 = src[1] + window_.x;\n \tconst uint8_t *src1 = src[2] + window_.x;\n@@ -214,7 +219,7 @@ void SwStatsCpu::statsBGGR8Line0(const uint8_t *src[])\n \tSWSTATS_FINISH_LINE_STATS()\n }\n \n-void SwStatsCpu::statsBGGR10Line0(const uint8_t *src[])\n+void SwStatsCpu::statsBGGR10Line0(const uint8_t *src[], SwIspStats &stats)\n {\n \tconst uint16_t *src0 = (const uint16_t *)src[1] + window_.x;\n \tconst uint16_t *src1 = (const uint16_t *)src[2] + window_.x;\n@@ -240,7 +245,7 @@ void SwStatsCpu::statsBGGR10Line0(const uint8_t *src[])\n \tSWSTATS_FINISH_LINE_STATS()\n }\n \n-void SwStatsCpu::statsBGGR12Line0(const uint8_t *src[])\n+void SwStatsCpu::statsBGGR12Line0(const uint8_t *src[], SwIspStats &stats)\n {\n \tconst uint16_t *src0 = (const uint16_t *)src[1] + window_.x;\n \tconst uint16_t *src1 = (const uint16_t *)src[2] + window_.x;\n@@ -266,7 +271,7 @@ void SwStatsCpu::statsBGGR12Line0(const uint8_t *src[])\n \tSWSTATS_FINISH_LINE_STATS()\n }\n \n-void SwStatsCpu::statsBGGR10PLine0(const uint8_t *src[])\n+void SwStatsCpu::statsBGGR10PLine0(const uint8_t *src[], SwIspStats &stats)\n {\n \tconst uint8_t *src0 = src[1] + window_.x * 5 / 4;\n \tconst uint8_t *src1 = src[2] + window_.x * 5 / 4;\n@@ -292,7 +297,7 @@ void SwStatsCpu::statsBGGR10PLine0(const uint8_t *src[])\n \tSWSTATS_FINISH_LINE_STATS()\n }\n \n-void SwStatsCpu::statsGBRG10PLine0(const uint8_t *src[])\n+void SwStatsCpu::statsGBRG10PLine0(const uint8_t *src[], SwIspStats &stats)\n {\n \tconst uint8_t *src0 = src[1] + window_.x * 5 / 4;\n \tconst uint8_t *src1 = src[2] + window_.x * 5 / 4;\n@@ -332,8 +337,10 @@ void SwStatsCpu::startFrame(uint32_t frame)\n \tif (window_.width == 0)\n \t\tLOG(SwStatsCpu, Error) << \"Calling startFrame() without setWindow()\";\n \n-\tstats_.sum_ = RGB<uint64_t>({ 0, 0, 0 });\n-\tstats_.yHistogram.fill(0);\n+\tfor (auto &s : stats_) {\n+\t\ts.sum_ = RGB<uint64_t>({ 0, 0, 0 });\n+\t\ts.yHistogram.fill(0);\n+\t}\n }\n \n /**\n@@ -345,8 +352,19 @@ void SwStatsCpu::startFrame(uint32_t frame)\n */\n void SwStatsCpu::finishFrame(uint32_t frame, uint32_t bufferId)\n {\n-\tstats_.valid = frame % kStatPerNumFrames == 0;\n-\t*sharedStats_ = stats_;\n+\tbool valid = frame % kStatPerNumFrames == 0;\n+\n+\tif (valid) {\n+\t\tsharedStats_->sum_ = RGB<uint64_t>({ 0, 0, 0 });\n+\t\tsharedStats_->yHistogram.fill(0);\n+\t\tfor (const auto &s : stats_) {\n+\t\t\tsharedStats_->sum_ += s.sum_;\n+\t\t\tfor (unsigned int j = 0; j < SwIspStats::kYHistogramSize; j++)\n+\t\t\t\tsharedStats_->yHistogram[j] += s.yHistogram[j];\n+\t\t}\n+\t}\n+\n+\tsharedStats_->valid = valid;\n \tstatsReady.emit(frame, bufferId);\n }\n \n@@ -389,12 +407,14 @@ int SwStatsCpu::setupStandardBayerOrder(BayerFormat::Order order)\n /**\n * \\brief Configure the statistics object for the passed in input format\n * \\param[in] inputCfg The input format\n+ * \\param[in] statsBufferCount number of internal stats buffers to use for multi-threading\n *\n * \\return 0 on success, a negative errno value on failure\n */\n-int SwStatsCpu::configure(const StreamConfiguration &inputCfg)\n+int SwStatsCpu::configure(const StreamConfiguration &inputCfg, unsigned int statsBufferCount)\n {\n \tstride_ = inputCfg.stride;\n+\tstats_.resize(statsBufferCount);\n \n \tBayerFormat bayerFormat =\n \t\tBayerFormat::fromPixelFormat(inputCfg.pixelFormat);\n@@ -504,7 +524,7 @@ void SwStatsCpu::processBayerFrame2(MappedFrameBuffer &in)\n \t\t/* linePointers[0] is not used by any stats0_ functions */\n \t\tlinePointers[1] = src;\n \t\tlinePointers[2] = src + stride_;\n-\t\t(this->*stats0_)(linePointers);\n+\t\t(this->*stats0_)(linePointers, stats_[0]);\n \t\tsrc += stride_ * 2;\n \t}\n }\n", "prefixes": [ "v4", "1/4" ] }