{"id":26233,"url":"https://patchwork.libcamera.org/api/1.1/patches/26233/?format=json","web_url":"https://patchwork.libcamera.org/patch/26233/","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":"<20260224193745.106186-2-johannes.goede@oss.qualcomm.com>","date":"2026-02-24T19:37:42","name":"[v3,1/4] software_isp: swstats_cpu: Prepare for multi-threading support","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"befc5954d220e0a2365ad3a1535396eb39fb6478","submitter":{"id":242,"url":"https://patchwork.libcamera.org/api/1.1/people/242/?format=json","name":"Hans de Goede","email":"johannes.goede@oss.qualcomm.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/26233/mbox/","series":[{"id":5811,"url":"https://patchwork.libcamera.org/api/1.1/series/5811/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5811","date":"2026-02-24T19:37:41","name":"software_isp: debayer_cpu: Add multi-threading support","version":3,"mbox":"https://patchwork.libcamera.org/series/5811/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/26233/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/26233/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 1AAE7C0DA4\n\tfor ;\n\tTue, 24 Feb 2026 19:37:55 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B8BF8622E3;\n\tTue, 24 Feb 2026 20:37:54 +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 EF724622AE\n\tfor ;\n\tTue, 24 Feb 2026 20:37:51 +0100 (CET)","from pps.filterd (m0279862.ppops.net [127.0.0.1])\n\tby mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id\n\t61OICGh2057305 for ;\n\tTue, 24 Feb 2026 19:37:50 GMT","from mail-qk1-f198.google.com (mail-qk1-f198.google.com\n\t[209.85.222.198])\n\tby mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ch9sa9vxk-1\n\t(version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT)\n\tfor ;\n\tTue, 24 Feb 2026 19:37:50 +0000 (GMT)","by mail-qk1-f198.google.com with SMTP id\n\taf79cd13be357-8c7166a4643so5440105685a.0\n\tfor ;\n\tTue, 24 Feb 2026 11:37:50 -0800 (PST)","from shalem\n\t(2001-1c00-0c32-7800-5bfa-a036-83f0-f9ec.cable.dynamic.v6.ziggo.nl.\n\t[2001:1c00:c32:7800:5bfa:a036:83f0:f9ec])\n\tby smtp.gmail.com with ESMTPSA id\n\ta640c23a62f3a-b9084e8cb3fsm458232866b.48.2026.02.24.11.37.47\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 24 Feb 2026 11:37:47 -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=\"o7AYJKKg\"; dkim=pass (2048-bit key;\n\tunprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com\n\theader.b=\"Cc3+kVW6\"; 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=5//7ZazaTSh\n\trjC8C7EEiB8EeyQWURuIBSfCyUyz5LZc=; b=o7AYJKKgsZNLQ6cS8PoG0twOOZZ\n\t/Dat3Ms9ylGPzfbMAEI2dqd8pCRNOoXA3yYFgHFhw6BlwDE1fgaz0fpVGoziV9JJ\n\tLfpus86QRAiOly2yZdIBnIF63WUGpAHBwyawerun4sAOBGkxQxW8egKs1PcWRKs4\n\tElDwTN7qcIAuJlXGEiD+e+sN8plmZN9o49j4JIkqckQDHE3BZRKMPFXlWImf6Z/Y\n\tgdYQKPnu6IbyGjMXhSK0QYQIyz3hhDtCHf1lTf37hCe5oA1gDK5JIEvLs4wOVE0R\n\taL9HCGwF5ksYMpqq4YRsAFlCDBoCpt2kXWSasm4orxhVmrdmUSsUuJ4z6JA==","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=oss.qualcomm.com; s=google; t=1771961869; x=1772566669;\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=5//7ZazaTShrjC8C7EEiB8EeyQWURuIBSfCyUyz5LZc=;\n\tb=Cc3+kVW6W7cRNmn2dX5YtL8qXIzO8V12ByUfOSthj7uJhK/WlUPv67N9VDTHff35Ki\n\tdqWTc4zVPGC9Q3WM4xFoNaGt8w2MsSxa2jqEyi7yDeesZ0hsHXgO93jV/z5d6fqBNajh\n\tKtAT2ikI7GLmxTrV0c0T4vH05SSz3XzNr6bVpv7ENr+CkJtGQ63+b9NX9xAXVnPE8U9P\n\tLclw7j5RePUa27PQ9s2rjQDBJ//mSu42UHvzya7YJOEe+kSEZcLyA/kRem1Zl3TqLGFv\n\tAFkRQa3brUf+vh4CRVmcmqgwV0Ug2rOfCehKnXWlXFSl70MM2iSC/bnvKrc9budA6YIA\n\tS4xg=="],"X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1771961869; x=1772566669;\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=5//7ZazaTShrjC8C7EEiB8EeyQWURuIBSfCyUyz5LZc=;\n\tb=LnHerFfOlJc7QIUtVzMocRazY+AdTU8Uzfc0ROMXlLfe+O/KaG8Q9ixCm/9JxLoY/I\n\t4Uad7EIFcT0BFKFbPnk5tybruO5Z0bqPsWRBVjpnhZ9x9CqThQI4DrCOOCryPm+KIbEE\n\tstlWa3glofzs8yTbYpAS/nfdjL7j8a00PXyj9Vg8DiuYVjFZwvGDKgsD7IGm7QzM//F+\n\tNkdjwopsQtu3CjgVSoCbDI95ktQuTrIYEc28EF4vgq/56+kTwJcScKDj6NBwWYpo815J\n\t5mtre6lU9h6m/Q/wNSmFUQDRw2EfQCAyvsMqoBe+ODSExMv3GLEy49gndQSb/DWEkFAy\n\txaXg==","X-Gm-Message-State":"AOJu0Yydns8TRdGJrODFQ7m/ZOPHyPAp2MQAVbzOFOzWXyBTCPvNgRCm\n\tQ/6UCWj8f8OB3a6Yfe46wOgB10kUKUltaZxnPFwaJbHQWyoToL0zr5ou7q+UXZ4AOrV0ohWI2g4\n\tF/JgR2nl7B7Z3tuZ50MJE1HWhGuaPtRH/PqiE4sTO4h6pOrrTWXWcjYgRV5jzffgvl2tSYfu7qU\n\tY0bCkoLJxQ","X-Gm-Gg":"AZuq6aJ2jklwrgo1elPCBgrrH59y8rAw5etwmnYefTFUYTxLJKuJ0DvyhLL59vfGIxR\n\tDmlnjTNNnDrv02ECdNYxTzKBeFAfSIareMAYCPY8+iZUt+a9toyRGqnC8FyqNkuGJGhotz97Vap\n\tYkeCvNZsNCYpzSCVuiWRlqC+xKfw/84xI5Xy58IOSaqj4yXpgQ7QBcn1XHTA82Ks9lvXjuS1Y7W\n\td9fKjJVvuSTEu+hkTmuHG+Lft64wqSFGa1v39Danqqd78V9gPZQhbjd5SKrbhfU6e9rENAeD03Y\n\tHsDZfr4PAVF1zqoICmWcEg2N0irkWD3uSh5hrdDWNXHh1A8viaqNZRNDxHXHCE5KD/VpTAsBAHZ\n\tZd731dR/jY1EjdEoWQDSDx2wzhat6hobOJMDncPZPx74DfSwTmUbNsSIxmrTYr+hkVoZokB/Pte\n\tjuaDjS9sjC5SXELM3oBOiABDh24kWM33TfDuWC","X-Received":["by 2002:a05:620a:f04:b0:8ca:3d7c:e74a with SMTP id\n\taf79cd13be357-8cb8ca7fac2mr1343406085a.56.1771961868792; \n\tTue, 24 Feb 2026 11:37:48 -0800 (PST)","by 2002:a05:620a:f04:b0:8ca:3d7c:e74a with SMTP id\n\taf79cd13be357-8cb8ca7fac2mr1343401685a.56.1771961868104; \n\tTue, 24 Feb 2026 11:37:48 -0800 (PST)"],"From":"Hans de Goede ","To":"libcamera-devel@lists.libcamera.org, Milan Zamazal ","Cc":"Hans de Goede ","Subject":"[PATCH v3 1/4] software_isp: swstats_cpu: Prepare for\n\tmulti-threading support","Date":"Tue, 24 Feb 2026 20:37:42 +0100","Message-ID":"<20260224193745.106186-2-johannes.goede@oss.qualcomm.com>","X-Mailer":"git-send-email 2.52.0","In-Reply-To":"<20260224193745.106186-1-johannes.goede@oss.qualcomm.com>","References":"<20260224193745.106186-1-johannes.goede@oss.qualcomm.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Proofpoint-Spam-Details-Enc":"AW1haW4tMjYwMjI0MDE2OCBTYWx0ZWRfX96OtKGSsy2Px\n\tUFl/K4SyfGxY7wOJtgJU4w5OiGMEjvrcIpA1AF03mUm58k4loyjaSHT0VH+dB7vyCF61w6RXRtC\n\taoZM95J8BI3rEUxN8p3CAwy689IVi1hFk3+LqUImIf+MXXi+o0KM1Wo0g68aE2Qfjw1YYk0lWJ1\n\tNkAeYTMnHxHUl27TymDL7U4ZEzHcdgUId704hKg82NW2mWa0gTJ5m4efXnWbb6T6vMSfq6SnYVz\n\tXdtEpT5f9hkdb/6fbfVgUHQurNAIOWd+TaLFKJXg5RZNOt7+xMcCKxHZ11rJ3DKxRjs49WszBAD\n\tFn79sovGa+s8ltr1c9qMU4Z6n6CAeALYpWDCaFsd4pNnny2YrwiXWK6NyAE/T/L+0jNCEnL+VSc\n\tO9Pt3kwj5hTRuQVOmpKxkCSYjyXN4cAl1poLoZh8W1DFbX8C85TnMa2u+wGSXlMu7h1gG+u8ZQr\n\tcgSbF/zunQiAiDpwNew==","X-Proofpoint-ORIG-GUID":"Un7l6alY7RW7IOB1Mh72NltnAk4PR6zH","X-Authority-Analysis":"v=2.4 cv=e7ELiKp/ c=1 sm=1 tr=0 ts=699dfe0e cx=c_pps\n\ta=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=HzLeVaNsDn8A:10\n\ta=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22\n\ta=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=VvikW9XIONpR7lsxkDIA:9\n\ta=NFOGd7dJGGMPyQGDc5-O:22","X-Proofpoint-GUID":"Un7l6alY7RW7IOB1Mh72NltnAk4PR6zH","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-02-24_02,2026-02-23_03,2025-10-01_01","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n\tmalwarescore=0 suspectscore=0 adultscore=0 priorityscore=1501\n\timpostorscore=0\n\tlowpriorityscore=0 clxscore=1015 phishscore=0 spamscore=0 bulkscore=0\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-2602240168","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":"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\nSigned-off-by: Hans de Goede \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 64b3e23f..feee92f9 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 \n+#include \n \n #include \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 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 stats_;\n \tSharedMemObject 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 1cedcfbc..41b73e43 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({ 0, 0, 0 });\n-\tstats_.yHistogram.fill(0);\n+\tfor (auto &s : stats_) {\n+\t\ts.sum_ = RGB({ 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({ 0, 0, 0 });\n+\t\tsharedStats_->yHistogram.fill(0);\n+\t\tfor (auto &s : stats_) {\n+\t\t\tsharedStats_->sum_ += s.sum_;\n+\t\t\tfor (unsigned int i = 0; i < SwIspStats::kYHistogramSize; i++)\n+\t\t\t\tsharedStats_->yHistogram[i] += s.yHistogram[i];\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":["v3","1/4"]}