Patch Detail
Show a patch.
GET /api/patches/26226/?format=api
{ "id": 26226, "url": "https://patchwork.libcamera.org/api/patches/26226/?format=api", "web_url": "https://patchwork.libcamera.org/patch/26226/", "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": "<20260223160930.27913-2-johannes.goede@oss.qualcomm.com>", "date": "2026-02-23T16:09:27", "name": "[v2,1/4] software_isp: swstats_cpu: Prepare for multi-threading support", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "842f9bbcb2ad11ee97180241b54704d5223e2ba6", "submitter": { "id": 242, "url": "https://patchwork.libcamera.org/api/people/242/?format=api", "name": "Hans de Goede", "email": "johannes.goede@oss.qualcomm.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/26226/mbox/", "series": [ { "id": 5809, "url": "https://patchwork.libcamera.org/api/series/5809/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5809", "date": "2026-02-23T16:09:27", "name": "software_isp: debayer_cpu: Add multi-threading support", "version": 2, "mbox": "https://patchwork.libcamera.org/series/5809/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/26226/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/26226/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 09C29BE175\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 23 Feb 2026 16:09:39 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 061E462293;\n\tMon, 23 Feb 2026 17:09:38 +0100 (CET)", "from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com\n\t[205.220.180.131])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 94063621CE\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 23 Feb 2026 17:09:36 +0100 (CET)", "from pps.filterd (m0279868.ppops.net [127.0.0.1])\n\tby mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id\n\t61NAX3F33698602 for <libcamera-devel@lists.libcamera.org>;\n\tMon, 23 Feb 2026 16:09:35 GMT", "from mail-vs1-f70.google.com (mail-vs1-f70.google.com\n\t[209.85.217.70])\n\tby mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cgn8191e0-1\n\t(version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT)\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 23 Feb 2026 16:09:35 +0000 (GMT)", "by mail-vs1-f70.google.com with SMTP id\n\tada2fe7eead31-5fdede3f1ceso65109217137.1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 23 Feb 2026 08:09:35 -0800 (PST)", "from t14s.vakwerkhuis.com ([78.108.130.194])\n\tby smtp.gmail.com with ESMTPSA id\n\ta640c23a62f3a-b9084c60b91sm338284066b.14.2026.02.23.08.09.32\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 23 Feb 2026 08:09:33 -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=\"h2Dz0XUi\"; dkim=pass (2048-bit key;\n\tunprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com\n\theader.b=\"dsLHR58Y\"; 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=2RrMTepel0f\n\t/n7pSHRAfooxWOp7CWavPYXh9mXTSMB4=; b=h2Dz0XUiqUQhM4AdDG9YhuR3cB9\n\tEawSIHalryjNmdbjSq7snowYNbPWj31rga5N8b0Nmkkoxq13ZZMPqkd65DiwNIFh\n\tkhZiW/TFiA0ZotnLbVFdXxemTTsGt5A2wG7nYx59Q37i8d203DEHaPvRqL5JfX6z\n\ty5E5zThE4lJ1GD9bQ3j85zrgz9ugLceLQG+oV2vk++4998D3an/mM1C8ZILBrgdV\n\thZT7oPFHzp29A047oU4R5AJhGNpLJQm1bXQIEw2PVvR88nixd4BOd4uNHwtVWVix\n\tskp/qAAQ8FWcISpkJOI1+185hvdZAwNySbuhe8CLPeDVMCl3Iv9lBS3n1UQ==", "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=oss.qualcomm.com; s=google; t=1771862974; x=1772467774;\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=2RrMTepel0f/n7pSHRAfooxWOp7CWavPYXh9mXTSMB4=;\n\tb=dsLHR58YMzTbiEmsxJi6OUh6OJRgjPJfjLaacn3uw32y6GQX3noACNW/GDyipeXMn8\n\tC02Ius8y/iK4f1YfQiqwXXDnY8GSwngK+wnqnfWvhMC7OE1oPcBVr5pfL6yNmlXDMa60\n\tcoYwKa8CN9YEggHk8TFrZcMlvQyH+MqdivybzVuQUWRK8Jhai8Z+AVpnZDuAfLnvQjU5\n\tIyvKtGeOFf0HUUJLGUZzg9CQhSUb9HUsRh7jZrnIRWkrYuCTguBD1XcMMbHklyBCDNoP\n\tCfRyJIy6O2jEILfHKPjm1Cx0tSLuBbr1I67gQAIsb798ButoLGxAowZ3SRmvZSMRigIV\n\ty4eg==" ], "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1771862974; x=1772467774;\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=2RrMTepel0f/n7pSHRAfooxWOp7CWavPYXh9mXTSMB4=;\n\tb=X4ErM/TXSeEnTudWxrsTjUVlLxRP2WOxPEX+QtCXhIpqyDpgcKwp5WVD1sGgawIIHx\n\tlgBPzv6x2dwWGY0hTT2K9K1eCj02U6AqBbacz7h7OvGx8wcXxcOr/YTub9Q2wHPE/t5O\n\tLzaAb2a5G7GqKuL34mXoAAkEusqeJsw7i/Enm3c/iQy9+y3Wfqg3oROHnEIrkps/NTzO\n\tiEOYbeecXJTQGM+r6yi7JLBG32Oh+UAzgqr1V7Z6wsxcUvlm7T5r8Fo61AmNGt7CPAiJ\n\tFXXrfoBXZePukofRTsXDpwbN5mcTeqsAaS+iUrex+xueGO8GKCLqcMwVxw3m8+CKiQBU\n\tF9iA==", "X-Gm-Message-State": "AOJu0Yxiwg6QTOzpjwx4+mA5ONRAqjL7e+Z4qsTzdmuQ8uA5t5SCyhr5\n\tatHqDCzJmu+TDgf9lA94iaU9nmjbLBgjF4tdc90n1Tuhm7O9aV5wxfEftBwk1lYJMpDerCFOfjQ\n\tQpaRGLVIwhnSSVFsEKYZ1hoTQaWZVnI9G98ifYZ77QE2yRM154sfF+sHPHMbKpJ48r8rcBZ9Ao3\n\tpE9uZY3cY8", "X-Gm-Gg": "AZuq6aJgHKc7RlfFalEZcCYq/hKh6+jTTHs7rSDGd8LCFvV2DggoChl/p+QtGAGe3Zq\n\tWd18EpT0tPuiK7P9Hikg3ko0wLliaPeyfvLKAIICmuFxHzITcM1P7yG3rAirbOYURx1tcdVeQRz\n\tQ/2UrXpqfZLJQqK9yZo/zHqEught57SxtPTZt9wDczvVHiSQSBnE9wIAHI8rK3m+52rBnk+YbZ2\n\tHyXEponUikGhEBxpmsK8c4+TYIhLDChyf+UiOW6JQChq1uK9UpCrBbGVshgzpI+OzlCSiQl76Ge\n\tWc+2jBfEykxR6FaZTYhdaAt+PHQSYkpGMfeuHkHmxSA8flWA86/t3q0Dzq+gjVkl5qj50IpTlJ8\n\tY286VC7GCmIdAeNFqRbc1Gjg+hbbT+siYwSI766ohebSBY+KtzA==", "X-Received": [ "by 2002:a05:6102:dca:b0:5f7:24e9:6e91 with SMTP id\n\tada2fe7eead31-5feb30faaebmr4985325137.36.1771862974238; \n\tMon, 23 Feb 2026 08:09:34 -0800 (PST)", "by 2002:a05:6102:dca:b0:5f7:24e9:6e91 with SMTP id\n\tada2fe7eead31-5feb30faaebmr4985314137.36.1771862973768; \n\tMon, 23 Feb 2026 08:09:33 -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 v2 1/4] software_isp: swstats_cpu: Prepare for\n\tmulti-threading support", "Date": "Mon, 23 Feb 2026 17:09:27 +0100", "Message-ID": "<20260223160930.27913-2-johannes.goede@oss.qualcomm.com>", "X-Mailer": "git-send-email 2.52.0", "In-Reply-To": "<20260223160930.27913-1-johannes.goede@oss.qualcomm.com>", "References": "<20260223160930.27913-1-johannes.goede@oss.qualcomm.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-Proofpoint-GUID": "MM-xm84Y-0IxP98ELwm4l6TJ7sAkBWYR", "X-Proofpoint-ORIG-GUID": "MM-xm84Y-0IxP98ELwm4l6TJ7sAkBWYR", "X-Authority-Analysis": "v=2.4 cv=CbsFJbrl c=1 sm=1 tr=0 ts=699c7bbf cx=c_pps\n\ta=N1BjEkVkxJi3uNfLdpvX3g==:117 a=rrvG0T/C2D967D07Ol03YQ==:17\n\ta=HzLeVaNsDn8A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22\n\ta=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8\n\ta=VvikW9XIONpR7lsxkDIA:9 a=crWF4MFLhNY0qMRaF8an:22", "X-Proofpoint-Spam-Details-Enc": "AW1haW4tMjYwMjIzMDEzOSBTYWx0ZWRfX647zS9HdaeHr\n\tGejI4lJZIGpr3hqx+0CwoPR/Sgq+PknAIn/3TzY2diPip0ReGnTwQJpIlsXvSQScqKzQKQkiVUB\n\tIcVr8vNKnlGImDFBGzeIAJKZrR2UG20mnlkzymA0y0f5eVB+NIcwMHFAd8c5OfTM+csEewFZb2m\n\tVjzrRL8Nct1FV7pM+cavmfwXyKxuxgqWY8UEmzsddeQvxoFMZiURQfCtXDuDGDrJ4PnzMqEw6uZ\n\tXJZjgrC1RzNcr6gNJUWp8vTrv6UtZ6JP1XXPh76/V6RdjEH2nxnva7i+CHAe9Gl89RUrt7s1+Zx\n\tyOhKlEZuKS7eaCbLZwdmUhReNZaDiKOxOFwAhJChSuboNIuvJC0ReS49ZwRgDxuOf0Ujnocyojf\n\t+yungaeu9oL1Xibw5kjt/U+FYFdNkFAw4ujnWyDc6ujdWDHXl1KNcBzBRSnObxnrHGwnJ1iaTpt\n\tzOBhosGP5GjPnKiwE5g==", "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-23_03,2026-02-23_03,2025-10-01_01", "X-Proofpoint-Spam-Details": "rule=outbound_notspam policy=outbound score=0\n\tlowpriorityscore=0 adultscore=0 impostorscore=0 priorityscore=1501\n\tsuspectscore=0 phishscore=0 spamscore=0 malwarescore=0 clxscore=1015\n\tbulkscore=0 classifier=typeunknown authscore=0 authtc= authcc=\n\troute=outbound\n\tadjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000\n\tdefinitions=main-2602230139", "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\nSigned-off-by: Hans de Goede <johannes.goede@oss.qualcomm.com>\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..7c71aed96 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 (unsigned int i = 0; i < stats_.size(); i++) {\n+\t\tstats_[i].sum_ = RGB<uint64_t>({ 0, 0, 0 });\n+\t\tstats_[i].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 (unsigned int i = 0; i < stats_.size(); i++) {\n+\t\t\tsharedStats_->sum_ += stats_[i].sum_;\n+\t\t\tfor (unsigned int j = 0; j < SwIspStats::kYHistogramSize; j++)\n+\t\t\t\tsharedStats_->yHistogram[j] += stats_[i].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": [ "v2", "1/4" ] }