Patch Detail
Show a patch.
GET /api/1.1/patches/23270/?format=api
{ "id": 23270, "url": "https://patchwork.libcamera.org/api/1.1/patches/23270/?format=api", "web_url": "https://patchwork.libcamera.org/patch/23270/", "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": "<20250428084418.1251085-4-barnabas.pocze@ideasonboard.com>", "date": "2025-04-28T08:44:17", "name": "[v3,3/4] apps: cam: sdl_texture: Add `SDLTexture1Plane`", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "af2f4ddc47220bc44d964b062ce1b3cc74c0027f", "submitter": { "id": 216, "url": "https://patchwork.libcamera.org/api/1.1/people/216/?format=api", "name": "Barnabás Pőcze", "email": "barnabas.pocze@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/23270/mbox/", "series": [ { "id": 5147, "url": "https://patchwork.libcamera.org/api/1.1/series/5147/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5147", "date": "2025-04-28T08:44:14", "name": "apps: cam: sdl_sink: Support more RGB and YUV formats", "version": 3, "mbox": "https://patchwork.libcamera.org/series/5147/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/23270/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/23270/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 7542DC331E\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 28 Apr 2025 08:44:36 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8480768AD7;\n\tMon, 28 Apr 2025 10:44:31 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CDC7168AD0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 28 Apr 2025 10:44:22 +0200 (CEST)", "from pb-laptop.local (185.221.141.190.nat.pool.zt.hu\n\t[185.221.141.190])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id EC2ED7E6;\n\tMon, 28 Apr 2025 10:44:17 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"k3I0zg4T\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1745829858;\n\tbh=oNFT4aL+GvpAwoE50WzPZTbNAO0+59J28ELcz8A4KrI=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=k3I0zg4Tsf56mUz//8YRdXFq1htgeidYPqoP/ou1PROmB6IwO/Bw5rRPez5kg+gNm\n\txKknTS95+AyGovT+rzq+20SOfj0fJStOJh8zxVbM81mJmYy5g1/CVz8HBY62094uiv\n\t9Tv5cHHULBiXkbQW4PW6LL7iRwwsGPk55Z+8RWoA=", "From": "=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= <barnabas.pocze@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Kieran Bingham <kieran.bingham@ideasonboard.com>,\n\tLaurent Pinchart <laurent.pinchart@ideasonboard.com>", "Subject": "[PATCH v3 3/4] apps: cam: sdl_texture: Add `SDLTexture1Plane`", "Date": "Mon, 28 Apr 2025 10:44:17 +0200", "Message-ID": "<20250428084418.1251085-4-barnabas.pocze@ideasonboard.com>", "X-Mailer": "git-send-email 2.49.0", "In-Reply-To": "<20250428084418.1251085-1-barnabas.pocze@ideasonboard.com>", "References": "<20250428084418.1251085-1-barnabas.pocze@ideasonboard.com>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "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": "`SDLTextureYUYV` uses `SDL_PIXELFORMAT_YUY2`, which is a single plane\nformat. To support other single plane formats, replace `SDLTextureYUYV`\nwith `SDLTexture1Plane` that can be instantiated with an arbitrary SDL\npixel format and that uses `SDL_UpdateTexture()` to update the texture\nusing exactly a single plane.\n\nSigned-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/apps/cam/meson.build | 1 +\n src/apps/cam/sdl_sink.cpp | 3 ++-\n src/apps/cam/sdl_texture_1plane.cpp | 17 +++++++++++++++++\n src/apps/cam/sdl_texture_1plane.h | 18 ++++++++++++++++++\n src/apps/cam/sdl_texture_yuv.cpp | 10 ----------\n src/apps/cam/sdl_texture_yuv.h | 7 -------\n 6 files changed, 38 insertions(+), 18 deletions(-)\n create mode 100644 src/apps/cam/sdl_texture_1plane.cpp\n create mode 100644 src/apps/cam/sdl_texture_1plane.h", "diff": "diff --git a/src/apps/cam/meson.build b/src/apps/cam/meson.build\nindex c70ca3cd2..2833c86e9 100644\n--- a/src/apps/cam/meson.build\n+++ b/src/apps/cam/meson.build\n@@ -34,6 +34,7 @@ if libsdl2.found()\n cam_sources += files([\n 'sdl_sink.cpp',\n 'sdl_texture.cpp',\n+ 'sdl_texture_1plane.cpp',\n 'sdl_texture_yuv.cpp',\n ])\n \ndiff --git a/src/apps/cam/sdl_sink.cpp b/src/apps/cam/sdl_sink.cpp\nindex 8355dd5ed..b295675dc 100644\n--- a/src/apps/cam/sdl_sink.cpp\n+++ b/src/apps/cam/sdl_sink.cpp\n@@ -22,6 +22,7 @@\n #include \"../common/event_loop.h\"\n #include \"../common/image.h\"\n \n+#include \"sdl_texture_1plane.h\"\n #ifdef HAVE_LIBJPEG\n #include \"sdl_texture_mjpg.h\"\n #endif\n@@ -74,7 +75,7 @@ int SDLSink::configure(const libcamera::CameraConfiguration &config)\n \t\tbreak;\n #endif\n \tcase libcamera::formats::YUYV:\n-\t\ttexture_ = std::make_unique<SDLTextureYUYV>(rect_, cfg.stride);\n+\t\ttexture_ = std::make_unique<SDLTexture1Plane>(rect_, SDL_PIXELFORMAT_YUY2, cfg.stride);\n \t\tbreak;\n \tdefault:\n \t\tstd::cerr << \"Unsupported pixel format \"\ndiff --git a/src/apps/cam/sdl_texture_1plane.cpp b/src/apps/cam/sdl_texture_1plane.cpp\nnew file mode 100644\nindex 000000000..b97015bc1\n--- /dev/null\n+++ b/src/apps/cam/sdl_texture_1plane.cpp\n@@ -0,0 +1,17 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2025, Ideas on Board Oy\n+ *\n+ * SDL single plane textures\n+ */\n+\n+#include \"sdl_texture_1plane.h\"\n+\n+#include <assert.h>\n+\n+void SDLTexture1Plane::update(libcamera::Span<const libcamera::Span<const uint8_t>> data)\n+{\n+\tassert(data.size() == 1);\n+\tassert(data[0].size_bytes() == std::size_t(rect_.h) * std::size_t(stride_));\n+\tSDL_UpdateTexture(ptr_, nullptr, data[0].data(), stride_);\n+}\ndiff --git a/src/apps/cam/sdl_texture_1plane.h b/src/apps/cam/sdl_texture_1plane.h\nnew file mode 100644\nindex 000000000..795e1fa4f\n--- /dev/null\n+++ b/src/apps/cam/sdl_texture_1plane.h\n@@ -0,0 +1,18 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2025, Ideas on Board Oy\n+ *\n+ * SDL single plane textures\n+ */\n+\n+#pragma once\n+\n+#include \"sdl_texture.h\"\n+\n+class SDLTexture1Plane final : public SDLTexture\n+{\n+public:\n+\tusing SDLTexture::SDLTexture;\n+\n+\tvoid update(libcamera::Span<const libcamera::Span<const uint8_t>> data) override;\n+};\ndiff --git a/src/apps/cam/sdl_texture_yuv.cpp b/src/apps/cam/sdl_texture_yuv.cpp\nindex 7e2ce3f49..bed297d28 100644\n--- a/src/apps/cam/sdl_texture_yuv.cpp\n+++ b/src/apps/cam/sdl_texture_yuv.cpp\n@@ -21,13 +21,3 @@ void SDLTextureNV12::update(libcamera::Span<const libcamera::Span<const uint8_t>\n \t\t\t data[1].data(), stride_);\n }\n #endif\n-\n-SDLTextureYUYV::SDLTextureYUYV(const SDL_Rect &rect, unsigned int stride)\n-\t: SDLTexture(rect, SDL_PIXELFORMAT_YUY2, stride)\n-{\n-}\n-\n-void SDLTextureYUYV::update(libcamera::Span<const libcamera::Span<const uint8_t>> data)\n-{\n-\tSDL_UpdateTexture(ptr_, nullptr, data[0].data(), stride_);\n-}\ndiff --git a/src/apps/cam/sdl_texture_yuv.h b/src/apps/cam/sdl_texture_yuv.h\nindex db877f503..c271f901b 100644\n--- a/src/apps/cam/sdl_texture_yuv.h\n+++ b/src/apps/cam/sdl_texture_yuv.h\n@@ -17,10 +17,3 @@ public:\n \tvoid update(libcamera::Span<const libcamera::Span<const uint8_t>> data) override;\n };\n #endif\n-\n-class SDLTextureYUYV : public SDLTexture\n-{\n-public:\n-\tSDLTextureYUYV(const SDL_Rect &rect, unsigned int stride);\n-\tvoid update(libcamera::Span<const libcamera::Span<const uint8_t>> data) override;\n-};\n", "prefixes": [ "v3", "3/4" ] }