{"id":25181,"url":"https://patchwork.libcamera.org/api/patches/25181/?format=json","web_url":"https://patchwork.libcamera.org/patch/25181/","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":"<20251125162851.2301793-3-stefan.klug@ideasonboard.com>","date":"2025-11-25T16:28:14","name":"[v3,02/29] libcamera: converter: Utilise shared MediaDevice pointers","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"24f1ed4fa946a9884c7d0df50752190ed56cd7d2","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/people/184/?format=json","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/25181/mbox/","series":[{"id":5613,"url":"https://patchwork.libcamera.org/api/series/5613/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5613","date":"2025-11-25T16:28:12","name":"Full dewarper support on imx8mp","version":3,"mbox":"https://patchwork.libcamera.org/series/5613/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/25181/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/25181/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 91A2EC333C\n\tfor ;\n\tTue, 25 Nov 2025 16:29:03 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4335D60AA1;\n\tTue, 25 Nov 2025 17:29:03 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 54D7C609E0\n\tfor ;\n\tTue, 25 Nov 2025 17:29:01 +0100 (CET)","from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:bae1:340c:573c:570b])\n\tby perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id 5C733FDB;\n\tTue, 25 Nov 2025 17:26:52 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"pu0xY3Oo\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1764088012;\n\tbh=n+gNvg8g0oaH8LMVT8N2zaukIHp892CqNUtWD6tdjjo=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=pu0xY3OoaVgt0S7WeKVL4kwnos/aXxZTjOFPfKNffPdzbtgl/WXa69x0dCrMm7+Ph\n\tkx6AKlOOqWUoPt2qPaxXvCd9VgDtX17tUcmT4uW1mfmocYVPDJdnSGIQb4Ba6DcgtD\n\to8GX5gSZVSy9f9pi8gzm33MtB87nmVCJMVUnjO6E=","From":"Stefan Klug ","To":"libcamera-devel@lists.libcamera.org","Cc":"Stefan Klug ,\n\tPaul Elder ,\n\tIsaac Scott ","Subject":"[PATCH v3 02/29] libcamera: converter: Utilise shared MediaDevice\n\tpointers","Date":"Tue, 25 Nov 2025 17:28:14 +0100","Message-ID":"<20251125162851.2301793-3-stefan.klug@ideasonboard.com>","X-Mailer":"git-send-email 2.51.0","In-Reply-To":"<20251125162851.2301793-1-stefan.klug@ideasonboard.com>","References":"<20251125162851.2301793-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":"","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":"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 \nReviewed-by: Paul Elder \nReviewed-by: Isaac Scott \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 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 &compatibles() const { return compatibles_; }\n \n-\tstatic std::unique_ptr create(MediaDevice *media);\n+\tstatic std::unique_ptr create(std::shared_ptr media);\n \tstatic std::vector &factories();\n \tstatic std::vector names();\n \n@@ -116,7 +116,8 @@ private:\n \n \tstatic void registerType(ConverterFactoryBase *factory);\n \n-\tvirtual std::unique_ptr createInstance(MediaDevice *media) const = 0;\n+\tvirtual std::unique_ptr\n+\tcreateInstance(std::shared_ptr media) const = 0;\n \n \tstd::string name_;\n \tstd::vector compatibles_;\n@@ -131,7 +132,7 @@ public:\n \t{\n \t}\n \n-\tstd::unique_ptr createInstance(MediaDevice *media) const override\n+\tstd::unique_ptr createInstance(std::shared_ptr 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 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 \n+#include \n \n #include \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 media, Features features)\n {\n \tconst std::vector &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 ConverterFactoryBase::create(MediaDevice *media)\n+std::unique_ptr ConverterFactoryBase::create(std::shared_ptr media)\n {\n \tconst std::vector &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 \n #include \n+#include \n #include \n \n #include \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 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 d108acfbad9f..dbd6bf9673ff 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 dwpMediaDevice = enumerator->search(dwp);\n \tif (dwpMediaDevice) {\n-\t\tdewarper_ = std::make_unique(dwpMediaDevice.get());\n+\t\tdewarper_ = std::make_unique(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 5e81a6b25920..7cebc9ac3824 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 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 converter = pipe->converter();\n \tif (converter) {\n \t\tconverter_ = ConverterFactoryBase::create(converter);\n \t\tif (!converter_) {\n","prefixes":["v3","02/29"]}