Patch Detail
Show a patch.
GET /api/patches/24653/?format=api
{ "id": 24653, "url": "https://patchwork.libcamera.org/api/patches/24653/?format=api", "web_url": "https://patchwork.libcamera.org/patch/24653/", "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": "<20251015012251.17508-9-bryan.odonoghue@linaro.org>", "date": "2025-10-15T01:22:20", "name": "[v3,08/39] libcamera: swstats_cpu: Add processFrame() method", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "6cc8fb5b6c81fcb664e35787af92d2bc4f14c659", "submitter": { "id": 175, "url": "https://patchwork.libcamera.org/api/people/175/?format=api", "name": "Bryan O'Donoghue", "email": "bryan.odonoghue@linaro.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/24653/mbox/", "series": [ { "id": 5503, "url": "https://patchwork.libcamera.org/api/series/5503/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5503", "date": "2025-10-15T01:22:12", "name": "Add GLES 2.0 GPUISP to libcamera", "version": 3, "mbox": "https://patchwork.libcamera.org/series/5503/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/24653/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/24653/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 B6B4DC3331\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 15 Oct 2025 01:23:11 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2E9F66062B;\n\tWed, 15 Oct 2025 03:23:11 +0200 (CEST)", "from mail-ej1-x630.google.com (mail-ej1-x630.google.com\n\t[IPv6:2a00:1450:4864:20::630])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 644DF60612\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 15 Oct 2025 03:23:03 +0200 (CEST)", "by mail-ej1-x630.google.com with SMTP id\n\ta640c23a62f3a-afcb7ae6ed0so1019340966b.3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 14 Oct 2025 18:23:03 -0700 (PDT)", "from inspiron14p-linux.nxsw.local (188-141-3-146.dynamic.upc.ie.\n\t[188.141.3.146]) by smtp.gmail.com with ESMTPSA id\n\ta640c23a62f3a-b5ccd7b202dsm98348466b.82.2025.10.14.18.23.01\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 14 Oct 2025 18:23:02 -0700 (PDT)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=linaro.org header.i=@linaro.org\n\theader.b=\"nCJz3kWw\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=linaro.org; s=google; t=1760491383; x=1761096183;\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=K3FoQV7xQAgIgQqS1yVdt6nWFXu6g4HjccATVbBtrDE=;\n\tb=nCJz3kWwMt90XTKCh0VTvIRxwNAoT7zbHlJw3tZtbvm3RnMHdF9xD3Whje/HupUkKv\n\tyDCNGQd+5z0zk0Qmriij4ndVp+HXZexNwvOiU6CzYwHYlXu6BgFTrCetbRzzu+1GclKN\n\tbTEcCwR1tB1VGm+UTqCH1WyUPy3YiTMK0SWdma0CLnrG2mT9gow6lKNTviGOow3zI2WF\n\tqSYUR7Vw8+0xFg0KXDX9EyavmMWCsWxgIARxf1lhtvRMg8hTfDgWI1aGBjF+gQCnOWps\n\typlpQLZXVqWI9e4iSWzguPbXLFKdwsi/o8tVFwVfpFSR0YCythToNSPvQVPUci8guSCq\n\ttrjA==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1760491383; x=1761096183;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=K3FoQV7xQAgIgQqS1yVdt6nWFXu6g4HjccATVbBtrDE=;\n\tb=c359c78raLj48SA62F7KBdkEpkUxBFLWm0Chusy9G2sP2k0Ql9bFN7jw+RhzM6TP0f\n\t+P/ZsQ7O0RNxxo4er/33S4z9z8YnsGBH5MdSK/nUams7pwsATWn9HVzbva7+89jHNLYy\n\tBK0BiO8dUZGTLEBfeWZiTH0CfObz3qncDr9ytsXN0TDqb83JXolHn4Urlwq0XWS8buC3\n\tQ8PkRh04lcxeB1bZlcbk2RSEbvf0PQJzm/CgJehByFzucY7TCaVexEph9CPurb7XzeYW\n\tDn9qXAvAc6xovyH0vH74pBGwKghYVuYeaMyAnA5ZG28zkmn44GZ6lgJMFb5a2KAdQSoE\n\thIMw==", "X-Gm-Message-State": "AOJu0YwRPOn8QziUMs4y1rTGdIVLAByYgsv/410JrJxWZv1der0n/1F7\n\tRB2TkjCh3J5APrjnK9njvyzmTfRLZiKDVmQPl8yGBe/059I/S0eCrMHrj26qfVos3HNdwe+m2ch\n\tV3J0z", "X-Gm-Gg": "ASbGnctl1dgbNmULZSJj89kPxA78vlBhKWerruWFfyptEUH2kCfzXYFkGE7zEd1tk+x\n\t2lNVaTb47eOALcJz2tJ+WzRQ3jELCUdVLyrphffk0exAsfOWDdNLJSRTK5l8i2BJdKW6GfAk16O\n\tEoYJZkXwG2TjduFymoOVJ78ggMBRxqezXHav1aWeDOgbyNMFipTz6Y86fU+Gef+dZ2H47X+pnHn\n\tFwYmqEnl2y3e+87/nEV12gdtBCM2kIwXbYG8KdSkZ+I4+4M6ub6Umh8/jHBl2/whER2sBq4OSCa\n\tgTA6mZ7o7uQjJVcE4koRrgrewGi8ww48T8HPCwwrNuJXBHayyh5wjSYdP5uSEdPdapP9otnWJHh\n\tudnXMH16scU/XWTRf3jts6nHsaxg9fjSfOpxsQ8wZZB158lEfMDxcUkZoVs41/dn0rQnPQw1lkx\n\tlXBMmaQuKSSVCH+jNpAEwvBOM+YyXO1BwwPMN/tJE+", "X-Google-Smtp-Source": "AGHT+IFu7TXzYDOw5vPrHJev2fFl+vpINNy7wwph4Z68XiLd0VEdVFPLowVBtVpLhfdcK9U+KCTQxg==", "X-Received": "by 2002:a17:907:c06:b0:b3d:cc4a:a2fa with SMTP id\n\ta640c23a62f3a-b50ac1cc3afmr2492271066b.36.1760491382516; \n\tTue, 14 Oct 2025 18:23:02 -0700 (PDT)", "From": "Bryan O'Donoghue <bryan.odonoghue@linaro.org>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "hdegoede@redhat.com, mzamazal@redhat.com, bryan.odonoghue@linaro.org,\n\tbod.linux@nxsw.ie", "Subject": "[PATCH v3 08/39] libcamera: swstats_cpu: Add processFrame() method", "Date": "Wed, 15 Oct 2025 02:22:20 +0100", "Message-ID": "<20251015012251.17508-9-bryan.odonoghue@linaro.org>", "X-Mailer": "git-send-email 2.51.0", "In-Reply-To": "<20251015012251.17508-1-bryan.odonoghue@linaro.org>", "References": "<20251015012251.17508-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": "<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": "From: Hans de Goede <hdegoede@redhat.com>\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 <mzamazal@redhat.com>\nSigned-off-by: Hans de Goede <hdegoede@redhat.com>\n[bod: various rebase spalts fixed]\nSigned-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>\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 | 55 ++++++++++++++++++-\n 3 files changed, 70 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 fae575f8..64b3e23f 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 <libcamera/geometry.h>\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<SwIspStats> 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 b7651b7d..6f1f88fe 100644\n--- a/src/libcamera/software_isp/software_isp.cpp\n+++ b/src/libcamera/software_isp/software_isp.cpp\n@@ -107,14 +107,15 @@ SoftwareIsp::SoftwareIsp(PipelineHandler *pipe, const CameraSensor *sensor,\n \t\treturn;\n \t}\n \n-\tauto stats = std::make_unique<SwStatsCpu>();\n+\tconst GlobalConfiguration &configuration = pipe->cameraManager()->_d()->configuration();\n+\n+\tauto stats = std::make_unique<SwStatsCpu>(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<DebayerCpu>(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 55e764b0..48d12c51 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 <libcamera/stream.h>\n \n #include \"libcamera/internal/bayer_format.h\"\n+#include \"libcamera/internal/mapped_framebuffer.h\"\n \n namespace libcamera {\n \n@@ -144,8 +145,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 +387,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 +415,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 +480,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": [ "v3", "08/39" ] }