{"id":25109,"url":"https://patchwork.libcamera.org/api/patches/25109/?format=json","web_url":"https://patchwork.libcamera.org/patch/25109/","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":"<20251120232019.3590-9-bryan.odonoghue@linaro.org>","date":"2025-11-20T23:20:05","name":"[08/22] libcamera: swstats_cpu: Add processFrame() method","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"bb4d0bcb272f0cf4bfcdb4f1f0a006223a9bbaa6","submitter":{"id":175,"url":"https://patchwork.libcamera.org/api/people/175/?format=json","name":"Bryan O'Donoghue","email":"bryan.odonoghue@linaro.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/25109/mbox/","series":[{"id":5599,"url":"https://patchwork.libcamera.org/api/series/5599/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5599","date":"2025-11-20T23:19:57","name":"GPUISP precursor series","version":1,"mbox":"https://patchwork.libcamera.org/series/5599/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/25109/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/25109/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 36E85C3330\n\tfor ;\n\tThu, 20 Nov 2025 23:20:42 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C120B60A80;\n\tFri, 21 Nov 2025 00:20:41 +0100 (CET)","from mail-wm1-x332.google.com (mail-wm1-x332.google.com\n\t[IPv6:2a00:1450:4864:20::332])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A92DA60A80\n\tfor ;\n\tFri, 21 Nov 2025 00:20:39 +0100 (CET)","by mail-wm1-x332.google.com with SMTP id\n\t5b1f17b1804b1-47790b080e4so7868475e9.3\n\tfor ;\n\tThu, 20 Nov 2025 15:20:39 -0800 (PST)","from inspiron14p-linux.ht.home (188-141-3-146.dynamic.upc.ie.\n\t[188.141.3.146]) by smtp.gmail.com with ESMTPSA id\n\t5b1f17b1804b1-477bf3af0ecsm11618415e9.9.2025.11.20.15.20.37\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 20 Nov 2025 15:20:38 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=linaro.org header.i=@linaro.org\n\theader.b=\"J2zaqsXK\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=linaro.org; s=google; t=1763680839; x=1764285639;\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=yrAaF8kfmIMdOuL0ewQtH4n9iA/J3ddd4eeCQCFdbAQ=;\n\tb=J2zaqsXKdYfb4qR5zRPZx9zUi3QgHE7nYaPzk8avgI+obGylmPvslxCEg1gicJIB9s\n\tzOFuMqbi6pG3qJJmRnaC9dujeK4dBwrA71XxBalcnUisIVyQY1j85qYHyZYLCtIKv1LZ\n\t6BIShXxOFJBtQhilw5NPDP7kFKwdtZm/TS+Y55J/6+7ZJVFW/aFwtD82ajc7JtIJXRgp\n\tjAS7RutHSa0nv3uJNTR3TS/j3CD+b1IhdZh4WfrBliJgHmJ19vwFMuYbWj58ZrWvLyqj\n\tJ1PljdaZWRytJd2wP2TWnPeLszhj8kCBeSUDKy9U8paiGRUs1An7vfo+jDiEmgKENX1I\n\tgkvg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1763680839; x=1764285639;\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=yrAaF8kfmIMdOuL0ewQtH4n9iA/J3ddd4eeCQCFdbAQ=;\n\tb=vi9lkEGNPyPUc9Q5gxdSf2WqCTOR0P152Zzn8thvNcWdXUY9SNS5u49rnORn7xSrJ7\n\tB1X0/ZYjiC/430EqZH2llKOB1m5t3JXioOstKocbnCxfywvN/ZT1A6pChYqNUHIRIDk5\n\t2FOb3MV25JuhPxbNlz8sY9wj3RjROJOcSPWLqvfzJqbVdp1nE1HeNdnRHdXmiQMnDlLI\n\tIGA4mDSnIrDd+S6DkeakDqtaIblVP2B9tid6KybwP8/sSK6OdmegC4VbEe2Y8Kl7ERuO\n\tv06oJiSXZ7nNvKRG4669FF8aTqpmI73f7ObwRS/FE0eFgKP6WZ6heV+lDQXt8ZDsfipS\n\tTlzQ==","X-Gm-Message-State":"AOJu0Ywk3566R2CKwBRUX/R8Gvso16HYIm/lfVabqvaiaU6rCOl0O+lK\n\tFRMIyvC1llguz4BUaDhNWWPNNkpIRGrDU3zevMK+L2Lb7pqN+3+kN5JNLFtnFkxDLHd25V/ICWd\n\tVpoP/61Y=","X-Gm-Gg":"ASbGncssvz/g6RmNFwOcbx3cgr6ENYrpm1xGKGC3BU6N4lj6K0Xo2qlRh1juclirtGU\n\t+ravdMLrvXSp/fdr1zNLVk0ZMynopggGtntvCvsyr9q4EfYvyng9Gs+IWHObDYs7s8HJWYnMb5i\n\tl4u2GjQ+tJkkHmhieDzRJnNGbat3AiZ8tH3G2TAuKb2X/MlrUgkmUCH1aykaXT+lC1gPr+oBcVj\n\trs+kKXVMuifJi+kzJkECDcnobjQhqbf0XlHdim1Inu9g6QhG3nSxTSV28oF1kZ5Zyzo8T5mSISy\n\tF49wyS+ymem2fuu6bCZgFuMlOcQLvPy2mzHDtkCzA0H7WgOdssz76xe4ZNf7dBDT23dJre3ZkqG\n\t+IcAAQEWI0z8Mic56lLiRmZrtaETpYg/vw/SLvuyCCZ9N2KH8Vt6X95yZwBeoT7QPA684gHblaG\n\tY5xWQFN02cgRwwtUZl1iObH92wbblk5l8W6IbqlrjkNhp4PiTPmoG4TM/k4e9DKb9IgeY=","X-Google-Smtp-Source":"AGHT+IGgZPdT5NZicNYjfh8wf1cTv/cHhtJi3V01I6n5XNRPO7z9oA9MFXsK8cnXMGEp2jgP3xFT+A==","X-Received":"by 2002:a05:600c:19d4:b0:477:63b5:6f3a with SMTP id\n\t5b1f17b1804b1-477c112635amr345725e9.27.1763680838921; \n\tThu, 20 Nov 2025 15:20:38 -0800 (PST)","From":"Bryan O'Donoghue ","To":"libcamera-devel@lists.libcamera.org","Cc":"pavel@ucw.cz, Hans de Goede ,\n\tMilan Zamazal ,\n\tKieran Bingham ,\n\tBryan O'Donoghue ","Subject":"[PATCH 08/22] libcamera: swstats_cpu: Add processFrame() method","Date":"Thu, 20 Nov 2025 23:20:05 +0000","Message-ID":"<20251120232019.3590-9-bryan.odonoghue@linaro.org>","X-Mailer":"git-send-email 2.51.2","In-Reply-To":"<20251120232019.3590-1-bryan.odonoghue@linaro.org>","References":"<20251120232019.3590-1-bryan.odonoghue@linaro.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","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":"From: Hans de Goede \n\nAdd a method to the SwstatsCpu class to process a whole Framebuffer in\none go, rather then line by line. This is useful for gathering stats\nwhen debayering is not necessary or is not done on the CPU.\n\nReviewed-by: Milan Zamazal \nSigned-off-by: Hans de Goede \n[bod: various rebase splats fixed]\n[bod: Added constructor Doxygen header]\nReviewed-by: Kieran Bingham \nSigned-off-by: Bryan O'Donoghue \n---\n .../internal/software_isp/swstats_cpu.h | 15 ++++-\n src/libcamera/software_isp/software_isp.cpp | 5 +-\n src/libcamera/software_isp/swstats_cpu.cpp | 64 ++++++++++++++++++-\n 3 files changed, 79 insertions(+), 5 deletions(-)","diff":"diff --git a/include/libcamera/internal/software_isp/swstats_cpu.h b/include/libcamera/internal/software_isp/swstats_cpu.h\nindex fae575f85..64b3e23f5 100644\n--- a/include/libcamera/internal/software_isp/swstats_cpu.h\n+++ b/include/libcamera/internal/software_isp/swstats_cpu.h\n@@ -18,18 +18,23 @@\n #include \n \n #include \"libcamera/internal/bayer_format.h\"\n+#include \"libcamera/internal/framebuffer.h\"\n+#include \"libcamera/internal/global_configuration.h\"\n #include \"libcamera/internal/shared_mem_object.h\"\n #include \"libcamera/internal/software_isp/swisp_stats.h\"\n \n+#include \"benchmark.h\"\n+\n namespace libcamera {\n \n class PixelFormat;\n+class MappedFrameBuffer;\n struct StreamConfiguration;\n \n class SwStatsCpu\n {\n public:\n-\tSwStatsCpu();\n+\tSwStatsCpu(const GlobalConfiguration &configuration);\n \t~SwStatsCpu() = default;\n \n \t/*\n@@ -50,6 +55,7 @@ public:\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 \t{\n@@ -79,6 +85,7 @@ public:\n \n private:\n \tusing statsProcessFn = void (SwStatsCpu::*)(const uint8_t *src[]);\n+\tusing processFrameFn = void (SwStatsCpu::*)(MappedFrameBuffer &in);\n \n \tint setupStandardBayerOrder(BayerFormat::Order order);\n \t/* Bayer 8 bpp unpacked */\n@@ -91,6 +98,10 @@ private:\n \tvoid statsBGGR10PLine0(const uint8_t *src[]);\n \tvoid statsGBRG10PLine0(const uint8_t *src[]);\n \n+\tvoid processBayerFrame2(MappedFrameBuffer &in);\n+\n+\tprocessFrameFn processFrame_;\n+\n \t/* Variables set by configure(), used every line */\n \tstatsProcessFn stats0_;\n \tstatsProcessFn stats2_;\n@@ -103,9 +114,11 @@ private:\n \tSize patternSize_;\n \n \tunsigned int xShift_;\n+\tunsigned int stride_;\n \n \tSharedMemObject sharedStats_;\n \tSwIspStats stats_;\n+\tBenchmark bench_;\n };\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp\nindex 341c0352c..928a2520c 100644\n--- a/src/libcamera/software_isp/software_isp.cpp\n+++ b/src/libcamera/software_isp/software_isp.cpp\n@@ -108,14 +108,15 @@ SoftwareIsp::SoftwareIsp(PipelineHandler *pipe, const CameraSensor *sensor,\n \t\treturn;\n \t}\n \n-\tauto stats = std::make_unique();\n+\tconst GlobalConfiguration &configuration = pipe->cameraManager()->_d()->configuration();\n+\n+\tauto stats = std::make_unique(configuration);\n \tif (!stats->isValid()) {\n \t\tLOG(SoftwareIsp, Error) << \"Failed to create SwStatsCpu object\";\n \t\treturn;\n \t}\n \tstats->statsReady.connect(this, &SoftwareIsp::statsReady);\n \n-\tconst GlobalConfiguration &configuration = pipe->cameraManager()->_d()->configuration();\n \tdebayer_ = std::make_unique(std::move(stats), configuration);\n \tdebayer_->inputBufferReady.connect(this, &SoftwareIsp::inputReady);\n \tdebayer_->outputBufferReady.connect(this, &SoftwareIsp::outputReady);\ndiff --git a/src/libcamera/software_isp/swstats_cpu.cpp b/src/libcamera/software_isp/swstats_cpu.cpp\nindex 55e764b0a..f5906197b 100644\n--- a/src/libcamera/software_isp/swstats_cpu.cpp\n+++ b/src/libcamera/software_isp/swstats_cpu.cpp\n@@ -16,6 +16,7 @@\n #include \n \n #include \"libcamera/internal/bayer_format.h\"\n+#include \"libcamera/internal/mapped_framebuffer.h\"\n \n namespace libcamera {\n \n@@ -34,6 +35,15 @@ namespace libcamera {\n * instead of processing the whole frame.\n */\n \n+/**\n+ * \\fn SwStatsCpu::SwStatsCpu(const GlobalConfiguration &configuration)\n+ * \\brief Construct a SwStatsCpu object\n+ * \\param[in] configuration Global configuration reference\n+ *\n+ * Creates a SwStatsCpu object and initialises shared memory for statistics\n+ * exchange.\n+ */\n+\n /**\n * \\fn bool SwStatsCpu::isValid() const\n * \\brief Gets whether the statistics object is valid\n@@ -144,8 +154,8 @@ namespace libcamera {\n \n LOG_DEFINE_CATEGORY(SwStatsCpu)\n \n-SwStatsCpu::SwStatsCpu()\n-\t: sharedStats_(\"softIsp_stats\")\n+SwStatsCpu::SwStatsCpu(const GlobalConfiguration &configuration)\n+\t: sharedStats_(\"softIsp_stats\"), bench_(configuration)\n {\n \tif (!sharedStats_)\n \t\tLOG(SwStatsCpu, Error)\n@@ -386,11 +396,14 @@ int SwStatsCpu::setupStandardBayerOrder(BayerFormat::Order order)\n */\n int SwStatsCpu::configure(const StreamConfiguration &inputCfg)\n {\n+\tstride_ = inputCfg.stride;\n+\n \tBayerFormat bayerFormat =\n \t\tBayerFormat::fromPixelFormat(inputCfg.pixelFormat);\n \n \tif (bayerFormat.packing == BayerFormat::Packing::None &&\n \t setupStandardBayerOrder(bayerFormat.order) == 0) {\n+\t\tprocessFrame_ = &SwStatsCpu::processBayerFrame2;\n \t\tswitch (bayerFormat.bitDepth) {\n \t\tcase 8:\n \t\t\tstats0_ = &SwStatsCpu::statsBGGR8Line0;\n@@ -411,6 +424,7 @@ int SwStatsCpu::configure(const StreamConfiguration &inputCfg)\n \t\t/* Skip every 3th and 4th line, sample every other 2x2 block */\n \t\tySkipMask_ = 0x02;\n \t\txShift_ = 0;\n+\t\tprocessFrame_ = &SwStatsCpu::processBayerFrame2;\n \n \t\tswitch (bayerFormat.order) {\n \t\tcase BayerFormat::BGGR:\n@@ -475,4 +489,50 @@ void SwStatsCpu::setWindow(const Rectangle &window)\n \twindow_.height &= ~(patternSize_.height - 1);\n }\n \n+void SwStatsCpu::processBayerFrame2(MappedFrameBuffer &in)\n+{\n+\tconst uint8_t *src = in.planes()[0].data();\n+\tconst uint8_t *linePointers[3];\n+\n+\t/* Adjust src for starting at window_.y */\n+\tsrc += window_.y * stride_;\n+\n+\tfor (unsigned int y = 0; y < window_.height; y += 2) {\n+\t\tif (y & ySkipMask_) {\n+\t\t\tsrc += stride_ * 2;\n+\t\t\tcontinue;\n+\t\t}\n+\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\tsrc += stride_ * 2;\n+\t}\n+}\n+\n+/**\n+ * \\brief Calculate statistics for a frame in one go\n+ * \\param[in] frame The frame number\n+ * \\param[in] bufferId ID of the statistics buffer\n+ * \\param[in] input The frame to process\n+ *\n+ * This may only be called after a successful setWindow() call.\n+ */\n+void SwStatsCpu::processFrame(uint32_t frame, uint32_t bufferId, FrameBuffer *input)\n+{\n+\tbench_.startFrame();\n+\tstartFrame(frame);\n+\n+\tMappedFrameBuffer in(input, MappedFrameBuffer::MapFlag::Read);\n+\tif (!in.isValid()) {\n+\t\tLOG(SwStatsCpu, Error) << \"mmap-ing buffer(s) failed\";\n+\t\treturn;\n+\t}\n+\n+\t(this->*processFrame_)(in);\n+\tfinishFrame(frame, bufferId);\n+\tbench_.finishFrame();\n+}\n+\n } /* namespace libcamera */\n","prefixes":["08/22"]}