Patch Detail
Show a patch.
GET /api/1.1/patches/24188/?format=api
{ "id": 24188, "url": "https://patchwork.libcamera.org/api/1.1/patches/24188/?format=api", "web_url": "https://patchwork.libcamera.org/patch/24188/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20250824-b4-v0-5-2-gpuisp-v2-a-v2-5-96f4576c814e@linaro.org>", "date": "2025-08-24T00:48:17", "name": "[v2,05/37] libcamera: swstats_cpu: Add processFrame() method", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "2d17decffe9749a830f95c0f75ce6aaed8ab3e81", "submitter": { "id": 175, "url": "https://patchwork.libcamera.org/api/1.1/people/175/?format=api", "name": "Bryan O'Donoghue", "email": "bryan.odonoghue@linaro.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/24188/mbox/", "series": [ { "id": 5400, "url": "https://patchwork.libcamera.org/api/1.1/series/5400/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5400", "date": "2025-08-24T00:48:12", "name": "Add GLES 2.0 GPUISP to libcamera", "version": 2, "mbox": "https://patchwork.libcamera.org/series/5400/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/24188/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/24188/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 4404EC32BB\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSun, 24 Aug 2025 00:48:52 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2B6A069309;\n\tSun, 24 Aug 2025 02:48:49 +0200 (CEST)", "from mail-wm1-x329.google.com (mail-wm1-x329.google.com\n\t[IPv6:2a00:1450:4864:20::329])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 45E58692F3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun, 24 Aug 2025 02:48:41 +0200 (CEST)", "by mail-wm1-x329.google.com with SMTP id\n\t5b1f17b1804b1-45a1abf5466so20830845e9.0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 23 Aug 2025 17:48:41 -0700 (PDT)", "from [192.168.0.13] (188-141-3-146.dynamic.upc.ie. [188.141.3.146])\n\tby smtp.gmail.com with ESMTPSA id\n\t5b1f17b1804b1-45b4e1d530esm69347225e9.0.2025.08.23.17.48.39\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tSat, 23 Aug 2025 17:48:40 -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=\"PJbSxArD\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=linaro.org; s=google; t=1755996521; x=1756601321;\n\tdarn=lists.libcamera.org; \n\th=cc:to:in-reply-to:references:message-id:content-transfer-encoding\n\t:mime-version:subject:date:from:from:to:cc:subject:date:message-id\n\t:reply-to; bh=NGF5nV7Z4LkgV9ObL3ETdEhX8lK4F6LQvhvfeDnOBfA=;\n\tb=PJbSxArD/SsTkpXr+eqv5iYxg4D6Bl8YUkCBIqfKsYoUKx4GsvN2H/8XKrFaRrcV2q\n\t/SaU8k//1u+5feEI0FW7mVyTU75t0BHQa1bfJTeIWjfRW+4NaPcNmOloKrkZFlepOvsc\n\taTjM7C5I9ETumIhOT1VHrewiEm9LX5M8JS3VBJ5U2pfxzqT/5XAhQbSM0BeWXS9lLrEn\n\tKu2yEazw47kM7snk68p1fHeq1csyI3xDNfBPXarE+cGR7vu1nCndyOjyM1IC/C/Z5DDj\n\tOA7TBQa+43rrXpAgA7lunHafkHdp5gesACKwGjZ7nkKjUu1+Itce2CNSaLazlQ6cKzjE\n\tG8uA==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1755996521; x=1756601321;\n\th=cc:to:in-reply-to:references:message-id:content-transfer-encoding\n\t:mime-version:subject:date:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=NGF5nV7Z4LkgV9ObL3ETdEhX8lK4F6LQvhvfeDnOBfA=;\n\tb=BSSVT6dqWtElUNwoJ1zv+m6p37bzLf7bT3qaS/sT2lXttRgvWoVYrWVRDm98fwhmn3\n\t3pqOu1cQf6oaOrgp9+bGj7XQK6Ry5Q/B1HfF7X7sxlKgP2z2a2hyOsAuiIBONameIPlg\n\til/UFvlVjzr2GefKI8+u70dD0fx8TqNIwxhHPjwkXmBxX4lXvCOr6WVobjQ1ipkHXKUD\n\tnordR6MVENTBZep4U4KgviyQ68oG/GHbSdJnrn38lbwtlJ8Rwm0V60NQaNlR+s2j8vVR\n\ty1QEWBoDJKWv0TUYGSX5kubS7Dlnle0G/mTTRw72RDTV0uzx/oy6eabw/220lCm6aP3N\n\tIiqw==", "X-Gm-Message-State": "AOJu0YwEKDx4aMddP8XVh8CxIXaCAd3fZcbZHfttKbEz+btEF4qf9WDl\n\tIVMJ6sAPSmvelZCGFJbwC3DyyswQqKMveLYV4Y57W8v8wBimlpoDrR5kzb4gqCqlcvo=", "X-Gm-Gg": "ASbGnctrqYFvqCCLXYB2K97Ns9uLvh9XOILPn2mNybqPORDgkF2fogCR8XIlsZUC/ET\n\tkGPVDzqAX3xQfm+qbJdpUgCtcUTfEANuC7IfrKnckg8/aIrw7xIXwHR20iufwCcF+4mXVvuyhPV\n\tlck3LeDa+Chu1gNLocf7rZZ20e4RZoz9h2sWQDLijcFE8NFTUohDgu8cr3QFETPrI6exT5FYjyx\n\tzdMyL2K+m90cHIYqKPicjHfO6iUSx49lriyBtSUXVLG5MtBJMTzlpTF18bGnYSWAo/Ze6+U8In6\n\tE+D/Pffi2JVwkFhDBs07qty8lzI9KIXIbUsC7UpUgI4mFwdafi3HEYehhhrsnIYVYj7qG1+or3u\n\tGEdhl9wLLbyUzAB5QJK8mIvfWWDxVYdYv09WVY8tpcGOS57vJpkykdnkuHPpXx/TKwLQvNm2IWF\n\t+tYr6uzc7gp1K39ywHqv1u", "X-Google-Smtp-Source": "AGHT+IHTdKzlMZ1KCyfSfv2B7hl+zgpJ22W49Sj/JfBJaM9/aWUBEg6d6VQiHgX+WLbSXoE+404ViQ==", "X-Received": "by 2002:a05:600c:4f49:b0:439:4b23:9e8e with SMTP id\n\t5b1f17b1804b1-45b5416dc42mr54925125e9.3.1755996520728; \n\tSat, 23 Aug 2025 17:48:40 -0700 (PDT)", "From": "Bryan O'Donoghue <bryan.odonoghue@linaro.org>", "Date": "Sun, 24 Aug 2025 01:48:17 +0100", "Subject": "[PATCH v2 05/37] libcamera: swstats_cpu: Add processFrame() method", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "7bit", "Message-Id": "<20250824-b4-v0-5-2-gpuisp-v2-a-v2-5-96f4576c814e@linaro.org>", "References": "<20250824-b4-v0-5-2-gpuisp-v2-a-v2-0-96f4576c814e@linaro.org>", "In-Reply-To": "<20250824-b4-v0-5-2-gpuisp-v2-a-v2-0-96f4576c814e@linaro.org>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Bryan O'Donoghue <bryan.odonoghue@linaro.org>, \n\tHans de Goede <hdegoede@redhat.com>, Milan Zamazal <mzamazal@redhat.com>", "X-Mailer": "b4 0.14.2", "X-Developer-Signature": "v=1; a=openpgp-sha256; l=5199;\n\ti=bryan.odonoghue@linaro.org; h=from:subject:message-id;\n\tbh=b8XaxNg/2llfAP9VuIKy9JajGNNOdI7TmUN8CE9bpcg=;\n\tb=owEBbQKS/ZANAwAKASJxO7Ohjcg6AcsmYgBoqmFdjy28eG4IZmQ/67ozOeNtrQeQh4BmR1eMP\n\tMPvnRSm2eOJAjMEAAEKAB0WIQTmk/sqq6Nt4Rerb7QicTuzoY3IOgUCaKphXQAKCRAicTuzoY3I\n\tOtk2EACpX6lb3Y4doEhNEyZh6f3uLD2IvSaC/WUgj/ZC4CAp7tXtGUR+4wEsOy6QDDNotb86jB/\n\tRb28uKMmsHEhMuTBFCFP2zaw/uHScaXvV70zJSmfhH53oIbT9uB3ZfdxvLBqqUpROyY6sVOC0qz\n\tWeW/Z22rcJIUJq2AFm8mUtEAo2aF7dOH6Cc0T85p1KZ1GPeYmCiqa99NrzIdDCsD07Hbk4DNSaR\n\tn5AQLPqEFm5eNqlLKaGgA9/V9pbhZLWrY05pskXQL8FQyZUf+1OFjsDNpmambAyecQMmjxa2KF6\n\tRz+afwrbyLI1UgGcblJ30/N3gEiQmo0djCv0NcL+d/XuKLB9B6XTxVIGXtKtvBuSRa420vil43C\n\tVTV8eEdCHwPOWr5KhVjfbOOZiSXHpcwybTVNVw4AyxV1mliCWF8nTa0w+y6y2iNoumA8mVQ9bCh\n\tZKmt08q9t74neOfbtTy8KGV0ntDFwmMPAa1oe6faUDyjOFGu5Q6rhev3GDth3A20SEjLT+wJXYi\n\tHDA79HKZSWMY0QdGWBGQ5JxNi9Sg8fPxoyNZb/ta8SNWYykcVqJKMxzDSVjnKQwfnGvY0ay211v\n\tpUqDylIY2vNpUpy/41Bu5cJI5tw2acHXE+OkoQpiNM72pmrBWIC+JtUXHbteOmRfJp79aO40MqB\n\tsMpCtRIPhu2tpLA==", "X-Developer-Key": "i=bryan.odonoghue@linaro.org; a=openpgp;\n\tfpr=E693FB2AABA36DE117AB6FB422713BB3A18DC83A", "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>\nSigned-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>\n---\n .../libcamera/internal/software_isp/swstats_cpu.h | 12 +++++\n src/libcamera/software_isp/swstats_cpu.cpp | 51 ++++++++++++++++++++++\n 2 files changed, 63 insertions(+)", "diff": "diff --git a/include/libcamera/internal/software_isp/swstats_cpu.h b/include/libcamera/internal/software_isp/swstats_cpu.h\nindex 26a2f462eb1eea359abbb9366e3eba5704ee293f..fa47cec91c1ffce28f9a212bc7a29499daed8be5 100644\n--- a/include/libcamera/internal/software_isp/swstats_cpu.h\n+++ b/include/libcamera/internal/software_isp/swstats_cpu.h\n@@ -18,12 +18,16 @@\n #include <libcamera/geometry.h>\n \n #include \"libcamera/internal/bayer_format.h\"\n+#include \"libcamera/internal/framebuffer.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@@ -42,6 +46,7 @@ public:\n \tvoid setWindow(const Rectangle &window);\n \tvoid startFrame();\n \tvoid finishFrame(uint32_t frame, uint32_t bufferId);\n+\tvoid processFrame(uint32_t frame, uint32_t bufferId, FrameBuffer *input);\n \n \tvoid processLine0(unsigned int y, const uint8_t *src[])\n \t{\n@@ -65,6 +70,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@@ -77,6 +83,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@@ -89,9 +99,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/swstats_cpu.cpp b/src/libcamera/software_isp/swstats_cpu.cpp\nindex 347fc32db13d81cef3d6d1bb7d64241e06d4ad0e..9d45d228e343621605cf5085711c3af9a6915ea4 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@@ -360,11 +361,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@@ -385,6 +389,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@@ -425,4 +430,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();\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": [ "v2", "05/37" ] }