{"id":26271,"url":"https://patchwork.libcamera.org/api/patches/26271/?format=json","web_url":"https://patchwork.libcamera.org/patch/26271/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20260310120106.79922-2-johannes.goede@oss.qualcomm.com>","date":"2026-03-10T12:01:02","name":"[v7,1/5] software_isp: swstats_cpu: Prepare for multi-threading support","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"0cf12c28f9da8090733e4008e68663fc2ea05468","submitter":{"id":242,"url":"https://patchwork.libcamera.org/api/people/242/?format=json","name":"Hans de Goede","email":"johannes.goede@oss.qualcomm.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/26271/mbox/","series":[{"id":5825,"url":"https://patchwork.libcamera.org/api/series/5825/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5825","date":"2026-03-10T12:01:01","name":"software_isp: debayer_cpu: Add multi-threading support","version":7,"mbox":"https://patchwork.libcamera.org/series/5825/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/26271/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/26271/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 71A06BE086\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 10 Mar 2026 12:01:20 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1318062657;\n\tTue, 10 Mar 2026 13:01:20 +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 7B0C0622F1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 10 Mar 2026 13:01:18 +0100 (CET)","from pps.filterd (m0279866.ppops.net [127.0.0.1])\n\tby mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id\n\t62ABc4gI2021657 for <libcamera-devel@lists.libcamera.org>;\n\tTue, 10 Mar 2026 12:01:17 GMT","from mail-ua1-f69.google.com (mail-ua1-f69.google.com\n\t[209.85.222.69])\n\tby mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cte3w977v-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, 10 Mar 2026 12:01:16 +0000 (GMT)","by mail-ua1-f69.google.com with SMTP id\n\ta1e0cc1a2514c-94ea8c27188so11702729241.1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 10 Mar 2026 05:01:16 -0700 (PDT)","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\t5b1f17b1804b1-48541aa7aacsm87843405e9.13.2026.03.10.05.01.10\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 10 Mar 2026 05:01:10 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=qualcomm.com header.i=@qualcomm.com\n\theader.b=\"ZmR+DHXZ\"; dkim=pass (2048-bit key;\n\tunprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com\n\theader.b=\"L0d9fckY\"; 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=pf95oxuDZJ2\n\tGr6M9VS6ydxNzYiU2Skcmi0Q2u9BrCxo=; b=ZmR+DHXZrlDiSovhoxafo2qlmRw\n\tKgGB9bcXfsMhWANw+p0Qb/4RGGTsUTBERhrV9jGr9vWCkTEZpdzjqRGhZcqFp9DS\n\t9dgkeBwNQ8JQpQqg2JJRBosAoxqNlGtJB+Xl8JD+fPj8AGqrabAx3ZnMVfspemNq\n\tl5JNtD0e2IFo63HNOgErGQHTCQt8pwqEdRgl8aTTl7xFF/ZQ1rhxjdKTUk0uztiP\n\tPE5yzVSf3XQiIOspS/ZpPCSRkBYxhMW7ASRadW/8g3eySM/Vvy/vv5y7b6Arihrn\n\tg1sG+5WBQK5+ke1XYQTe+JbqXrs8nLuufIWRmeOizmaayVrZtMtXH7R558g==","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=oss.qualcomm.com; s=google; t=1773144075; x=1773748875;\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=pf95oxuDZJ2Gr6M9VS6ydxNzYiU2Skcmi0Q2u9BrCxo=;\n\tb=L0d9fckYKr+rC5sKlux2J+tdkrC4fVZ5s9+XhUnjmsONqRzoccbqRKAT+JBnilCdng\n\tuUXePVVGa4djbTMIhiCSJsNStVc9I2Kx7aLbWhjfkteWNyVmOv7zC2hIk8NGNcnZeB99\n\ti4BdFJSjzI82LH3A1ZwCkr07V3vS9/sB0ql25jfN5Md5ecTLL7TKNUk1zNMl9insa4Sc\n\tJ2UIBmaNqd5ppKP7iVry1K77ox1XFMxkAQoxwhUE8JkQaJzuurIbVZlajXUWXpuL/kVa\n\tsTfIwHcy+N25U3qMeSwnxqkQeDGRBqMndkuCq4UyyLo0DcsjPj667Br8QTdZXMTg8yaY\n\tSMTw=="],"X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1773144075; x=1773748875;\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=pf95oxuDZJ2Gr6M9VS6ydxNzYiU2Skcmi0Q2u9BrCxo=;\n\tb=ljfO4i3jmrLigIpYv1IlQcfokYiZj6viZo7Mdjp5VJRFSrIGbsDV7YUqmfcZYWWJtZ\n\tONxr7hHRyqVqbXlMR7QDsP2c08kJedTjFsUGjMvegWSYELKnmRzCqj4+MWc8jjXvuBes\n\t6d1qvRo64MJpXZNjQ/k6XvS34TIQPUyhzGpb2qowRf2vy+XVl4G97Ef4/kIPTRw+fp2y\n\t/TTS69HMB1GgjlfXTXeZ3mtoMoEVXUrMRDb6JYh3H2MCsBKB+D9lxGgzlalWRuRLmzNy\n\tMi7xlRgypjenRDhS0RdNd+wXt5zwuzQSPtAM2qMVO2WTkHm5PVt/rRB2eWf3zin5ON2F\n\tCHmA==","X-Gm-Message-State":"AOJu0YySmjytw5GIijTHnsa8i//hPPq3K6UstfPuhL1LDlOiOvw/bGY5\n\tXzOb8kxWGmqgdlkXy2dbR/3kPCAZNFV2jwAYD4c5moKLEQs2dJi8Z0sMlh/GMC8rmaAwixyQedf\n\tt7ooTSOk611nLM6h21nvdG83nQrSJKMQbvcnH8wXu3Je9MDcjvFUr3IH7yIV/vcDkbB+NKKWbrM\n\thtGY3twDn/","X-Gm-Gg":"ATEYQzyYNn5YtJw/R06EBJLa0x6wpYQ2fFmXny35loqTfVdJpAxEg+XBww1b6V/9ZBU\n\t8gVx4HLNbaKy/zDDfk4eU8yVkLmY/bgyuWWiAoNrova8f4h0UJBJwne2fb2dDQ/j0aFu4SzCJB9\n\tqyRMWs0kBdAZeRaD/NT+W9OiPGfGd8hhkerq9mHAlwnBXnBmTa8ZaFsRIWRduzSisAl5H+RFCR+\n\t+EWDvSVfEfAjNq/SdNMfvzKfkLj/C3yoWAZNYPu5rrBF1OTuTcqSciNTAqXP5kKQ6LoODe9G5jQ\n\tOXoe2gRuIwXs03Z1z7dITmjPuMjN3QlUzvGLJunNQketAjZZbZS1Z7FEQm110ej5h1KwVi1pmZt\n\tc9cFYuyJLtM6FnnxgDOOv6bGAcE+CbmT67mhQ9V/dhH6e+tDHmWWjdzkevM+I1B4lcK+URbenbt\n\tEHayvRhqUkcSdDcW/qmcIHmsD17aIPRxqn1Q==","X-Received":["by 2002:a05:6102:292a:b0:5f5:2e63:f574 with SMTP id\n\tada2fe7eead31-5ffe61e56f1mr5982796137.29.1773144073684; \n\tTue, 10 Mar 2026 05:01:13 -0700 (PDT)","by 2002:a05:6102:292a:b0:5f5:2e63:f574 with SMTP id\n\tada2fe7eead31-5ffe61e56f1mr5982644137.29.1773144071586; \n\tTue, 10 Mar 2026 05:01:11 -0700 (PDT)"],"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 v7 1/5] software_isp: swstats_cpu: Prepare for\n\tmulti-threading support","Date":"Tue, 10 Mar 2026 13:01:02 +0100","Message-ID":"<20260310120106.79922-2-johannes.goede@oss.qualcomm.com>","X-Mailer":"git-send-email 2.53.0","In-Reply-To":"<20260310120106.79922-1-johannes.goede@oss.qualcomm.com>","References":"<20260310120106.79922-1-johannes.goede@oss.qualcomm.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Proofpoint-Spam-Details-Enc":"AW1haW4tMjYwMzEwMDEwNCBTYWx0ZWRfX5HIBTM3/0TIu\n\ttVtvqIAJSfUB58Z5FVD/dSlbTD8+0JAgsn5FXsrwpkm7FxSWf6LQ0LQ7BGIDlzJF9WxgE/jXWpM\n\tewTfX2Y/nho8eWRMhMnPlNHduUSaYrC9noQRuj/C2ewOlL8h9a7W8v/Ukoea5KzfGV0PJC6bCKg\n\tFg6CS5GrE/MtMtxchxfAESdpHA3VW52MSjOaKjmfS9djEUi2bUfkA7q4/ph9JdlKQAbXlfzcS8x\n\tJsMkRXq5+7R0c9DEgXXC7KNatCFlVnSq5A4kQ5pNFRyG/EhDuNBI1roFbfs7FoGzUJVyOseWvvY\n\trguLffFWe0Bw88W1NVMVrOC5Z+MlI+ppwN4RFKcBCZsKYFwqnkhUgINMIWvWMllK21xNZ6r7YFU\n\tMJaVJae9ruYUPn1n7xE0fAHyOYCOA5FPyJ2rpz04EZNOaSMnwveXprDrImYkwZ0LMPm+eOp1DwG\n\tFhMYPD9oU+F6viekkvQ==","X-Authority-Analysis":"v=2.4 cv=GtFPO01C c=1 sm=1 tr=0 ts=69b0080c cx=c_pps\n\ta=UbhLPJ621ZpgOD2l3yZY1w==:117 a=xqWC_Br6kY4A:10 a=Yq5XynenixoA:10\n\ta=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22\n\ta=YMgV9FUhrdKAYTUUvYB2:22 a=20KFwNOVAAAA:8 a=EUspDBNiAAAA:8\n\ta=VvikW9XIONpR7lsxkDIA:9 a=TOPH6uDL9cOC6tEoww4z:22","X-Proofpoint-ORIG-GUID":"66G8xABiWie1LNNBnPyj6IjKjo6AE9-9","X-Proofpoint-GUID":"66G8xABiWie1LNNBnPyj6IjKjo6AE9-9","X-Proofpoint-Virus-Version":"vendor=baseguard\n\tengine=ICAP:2.0.293, Aquarius:18.0.1143, Hydra:6.1.51,\n\tFMLib:17.12.100.49\n\tdefinitions=2026-03-10_02,2026-03-09_02,2025-10-01_01","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n\tbulkscore=0 phishscore=0 malwarescore=0 clxscore=1015\n\tlowpriorityscore=0\n\tspamscore=0 suspectscore=0 priorityscore=1501 impostorscore=0\n\tadultscore=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-2603100104","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":["v7","1/5"]}