Patch Detail
Show a patch.
GET /api/patches/24732/?format=api
{ "id": 24732, "url": "https://patchwork.libcamera.org/api/patches/24732/?format=api", "web_url": "https://patchwork.libcamera.org/patch/24732/", "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": "<20251023144841.403689-5-stefan.klug@ideasonboard.com>", "date": "2025-10-23T14:48:05", "name": "[v2,04/35] libcamera: converter: Utilise shared MediaDevice pointers", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "24f1ed4fa946a9884c7d0df50752190ed56cd7d2", "submitter": { "id": 184, "url": "https://patchwork.libcamera.org/api/people/184/?format=api", "name": "Stefan Klug", "email": "stefan.klug@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/24732/mbox/", "series": [ { "id": 5520, "url": "https://patchwork.libcamera.org/api/series/5520/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5520", "date": "2025-10-23T14:48:01", "name": "Full dewarper support on imx8mp", "version": 2, "mbox": "https://patchwork.libcamera.org/series/5520/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/24732/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/24732/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 29552C3259\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 23 Oct 2025 14:49:01 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2C6DA607F8;\n\tThu, 23 Oct 2025 16:49:00 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id EF117606DE\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 23 Oct 2025 16:48:57 +0200 (CEST)", "from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:7328:357b:4ce1:72b6])\n\tby perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id 0536319E5; \n\tThu, 23 Oct 2025 16:47:12 +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=\"nncI7e0w\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1761230833;\n\tbh=DQ4Dk4FvJ+uYS9yZjd701CRURlrCQeMEmCNaJG8L/xw=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=nncI7e0wlZgQmrY9JpWSpnTV/ut6iPBlcOA0uEYcCJ92PKNcQ4zpc32pnQ1ie3VtM\n\tG1ZCWsT/1X9DruMswpVE4FDkihCJI9HxJyqReySYsmAeBkFXhGiOMeG3MEMqUmwrj4\n\tdrf4u1YnRDcuSw6D0ZrATDUAm7G2gX53FVXbxfoc=", "From": "Stefan Klug <stefan.klug@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Stefan Klug <stefan.klug@ideasonboard.com>", "Subject": "[PATCH v2 04/35] libcamera: converter: Utilise shared MediaDevice\n\tpointers", "Date": "Thu, 23 Oct 2025 16:48:05 +0200", "Message-ID": "<20251023144841.403689-5-stefan.klug@ideasonboard.com>", "X-Mailer": "git-send-email 2.48.1", "In-Reply-To": "<20251023144841.403689-1-stefan.klug@ideasonboard.com>", "References": "<20251023144841.403689-1-stefan.klug@ideasonboard.com>", "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": "With the upcoming addition of V4L2 requests support, the converters need\nto keep a handle to the corresponding media device.\n\nPrepare for that by changing the constructor parameter from a raw\npointer to a shared pointer.\n\nSigned-off-by: Stefan Klug <stefan.klug@ideasonboard.com>\n---\n include/libcamera/internal/converter.h | 9 +++++----\n .../libcamera/internal/converter/converter_v4l2_m2m.h | 2 +-\n src/libcamera/converter.cpp | 5 +++--\n src/libcamera/converter/converter_v4l2_m2m.cpp | 4 ++--\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 +-\n src/libcamera/pipeline/simple/simple.cpp | 4 ++--\n 6 files changed, 14 insertions(+), 12 deletions(-)", "diff": "diff --git a/include/libcamera/internal/converter.h b/include/libcamera/internal/converter.h\nindex 644ec429bb25..4915af7ac5de 100644\n--- a/include/libcamera/internal/converter.h\n+++ b/include/libcamera/internal/converter.h\n@@ -46,7 +46,7 @@ public:\n \t\tUp,\n \t};\n \n-\tConverter(MediaDevice *media, Features features = Feature::None);\n+\tConverter(std::shared_ptr<MediaDevice> media, Features features = Feature::None);\n \tvirtual ~Converter();\n \n \tvirtual int loadConfiguration(const std::string &filename) = 0;\n@@ -107,7 +107,7 @@ public:\n \n \tconst std::vector<std::string> &compatibles() const { return compatibles_; }\n \n-\tstatic std::unique_ptr<Converter> create(MediaDevice *media);\n+\tstatic std::unique_ptr<Converter> create(std::shared_ptr<MediaDevice> media);\n \tstatic std::vector<ConverterFactoryBase *> &factories();\n \tstatic std::vector<std::string> names();\n \n@@ -116,7 +116,8 @@ private:\n \n \tstatic void registerType(ConverterFactoryBase *factory);\n \n-\tvirtual std::unique_ptr<Converter> createInstance(MediaDevice *media) const = 0;\n+\tvirtual std::unique_ptr<Converter>\n+\tcreateInstance(std::shared_ptr<MediaDevice> media) const = 0;\n \n \tstd::string name_;\n \tstd::vector<std::string> compatibles_;\n@@ -131,7 +132,7 @@ public:\n \t{\n \t}\n \n-\tstd::unique_ptr<Converter> createInstance(MediaDevice *media) const override\n+\tstd::unique_ptr<Converter> createInstance(std::shared_ptr<MediaDevice> media) const override\n \t{\n \t\treturn std::make_unique<_Converter>(media);\n \t}\ndiff --git a/include/libcamera/internal/converter/converter_v4l2_m2m.h b/include/libcamera/internal/converter/converter_v4l2_m2m.h\nindex 0ad7bf7fdbe2..d316754040dd 100644\n--- a/include/libcamera/internal/converter/converter_v4l2_m2m.h\n+++ b/include/libcamera/internal/converter/converter_v4l2_m2m.h\n@@ -36,7 +36,7 @@ class V4L2M2MDevice;\n class V4L2M2MConverter : public Converter\n {\n public:\n-\tV4L2M2MConverter(MediaDevice *media);\n+\tV4L2M2MConverter(std::shared_ptr<MediaDevice> media);\n \n \tint loadConfiguration([[maybe_unused]] const std::string &filename) override { return 0; }\n \tbool isValid() const override { return m2m_ != nullptr; }\ndiff --git a/src/libcamera/converter.cpp b/src/libcamera/converter.cpp\nindex d551b908d523..142fb29a1272 100644\n--- a/src/libcamera/converter.cpp\n+++ b/src/libcamera/converter.cpp\n@@ -8,6 +8,7 @@\n #include \"libcamera/internal/converter.h\"\n \n #include <algorithm>\n+#include <memory>\n \n #include <libcamera/base/log.h>\n \n@@ -68,7 +69,7 @@ LOG_DEFINE_CATEGORY(Converter)\n * This searches for the entity implementing the data streaming function in the\n * media graph entities and use its device node as the converter device node.\n */\n-Converter::Converter(MediaDevice *media, Features features)\n+Converter::Converter(std::shared_ptr<MediaDevice> media, Features features)\n {\n \tconst std::vector<MediaEntity *> &entities = media->entities();\n \tauto it = std::find_if(entities.begin(), entities.end(),\n@@ -332,7 +333,7 @@ ConverterFactoryBase::ConverterFactoryBase(const std::string name, std::initiali\n * \\return A new instance of the converter subclass corresponding to the media\n * device, or null if the media device driver name doesn't match anything\n */\n-std::unique_ptr<Converter> ConverterFactoryBase::create(MediaDevice *media)\n+std::unique_ptr<Converter> ConverterFactoryBase::create(std::shared_ptr<MediaDevice> media)\n {\n \tconst std::vector<ConverterFactoryBase *> &factories =\n \t\tConverterFactoryBase::factories();\ndiff --git a/src/libcamera/converter/converter_v4l2_m2m.cpp b/src/libcamera/converter/converter_v4l2_m2m.cpp\nindex 0ce7a7a67f11..b2bd54f368d8 100644\n--- a/src/libcamera/converter/converter_v4l2_m2m.cpp\n+++ b/src/libcamera/converter/converter_v4l2_m2m.cpp\n@@ -10,6 +10,7 @@\n \n #include <algorithm>\n #include <limits.h>\n+#include <memory>\n #include <set>\n \n #include <libcamera/base/log.h>\n@@ -261,8 +262,7 @@ void V4L2M2MConverter::V4L2M2MStream::captureBufferReady(FrameBuffer *buffer)\n * \\brief Construct a V4L2M2MConverter instance\n * \\param[in] media The media device implementing the converter\n */\n-\n-V4L2M2MConverter::V4L2M2MConverter(MediaDevice *media)\n+V4L2M2MConverter::V4L2M2MConverter(std::shared_ptr<MediaDevice> media)\n \t: Converter(media)\n {\n \tif (deviceNode().empty())\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 959cdb41fe7e..0e2a210e1e80 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -1445,7 +1445,7 @@ bool PipelineHandlerRkISP1::match(DeviceEnumerator *enumerator)\n \n \tstd::shared_ptr<MediaDevice> dwpMediaDevice = enumerator->search(dwp);\n \tif (dwpMediaDevice) {\n-\t\tdewarper_ = std::make_unique<V4L2M2MConverter>(dwpMediaDevice.get());\n+\t\tdewarper_ = std::make_unique<V4L2M2MConverter>(dwpMediaDevice);\n \t\tif (dewarper_->isValid()) {\n \t\t\tdewarper_->outputBufferReady.connect(\n \t\t\t\tthis, &PipelineHandlerRkISP1::dewarpBufferReady);\ndiff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 1183be9a6b07..204b29f92907 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -413,7 +413,7 @@ public:\n \n \tV4L2VideoDevice *video(const MediaEntity *entity);\n \tV4L2Subdevice *subdev(const MediaEntity *entity);\n-\tMediaDevice *converter() { return converter_.get(); }\n+\tstd::shared_ptr<MediaDevice> converter() { return converter_; }\n \tbool swIspEnabled() const { return swIspEnabled_; }\n \n protected:\n@@ -586,7 +586,7 @@ int SimpleCameraData::init()\n \tint ret;\n \n \t/* Open the converter, if any. */\n-\tMediaDevice *converter = pipe->converter();\n+\tstd::shared_ptr<MediaDevice> converter = pipe->converter();\n \tif (converter) {\n \t\tconverter_ = ConverterFactoryBase::create(converter);\n \t\tif (!converter_) {\n", "prefixes": [ "v2", "04/35" ] }