Patch Detail
Show a patch.
GET /api/1.1/patches/25180/?format=api
{ "id": 25180, "url": "https://patchwork.libcamera.org/api/1.1/patches/25180/?format=api", "web_url": "https://patchwork.libcamera.org/patch/25180/", "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": "<20251125162851.2301793-2-stefan.klug@ideasonboard.com>", "date": "2025-11-25T16:28:13", "name": "[v3,01/29] libcamera: pipeline: utilise shared MediaDevice pointers", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "fc9e0d000516866e8bf64fbc2aec2d3e79f33a5d", "submitter": { "id": 184, "url": "https://patchwork.libcamera.org/api/1.1/people/184/?format=api", "name": "Stefan Klug", "email": "stefan.klug@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/25180/mbox/", "series": [ { "id": 5613, "url": "https://patchwork.libcamera.org/api/1.1/series/5613/?format=api", "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/25180/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/25180/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 8CBCBC333C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 25 Nov 2025 16:29:00 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 34E0760AA2;\n\tTue, 25 Nov 2025 17:29:00 +0100 (CET)", "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 4CBD0609E0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 25 Nov 2025 17:28:58 +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 5B69E524;\n\tTue, 25 Nov 2025 17:26:49 +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=\"V8rH3ZlR\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1764088009;\n\tbh=A0gbPQ56Ijn8abbRp394XVOou8XJIhZmdsHUv8sJx2g=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=V8rH3ZlRBNKfOD/W7+T53bOklP59meEAuhaw3XHFm29j4Mr77KKT+LJq6DPX/6y+m\n\tWORAO1xbB2ph5FMYhya9QG+W/UVCJDtii0fWcJ8kg567Nl3t0PYU3xFsbqiK+vzZ82\n\twAXgrsZfN/ENEW57C74M99x0MszgCxT2EELlwsYw=", "From": "Stefan Klug <stefan.klug@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Stefan Klug <stefan.klug@ideasonboard.com>,\n\tKieran Bingham <kieran.bingham@ideasonboard.com>,\n\tPaul Elder <paul.elder@ideasonboard.com>,\n\tIsaac Scott <isaac.scott@ideasonboard.com>", "Subject": "[PATCH v3 01/29] libcamera: pipeline: utilise shared MediaDevice\n\tpointers", "Date": "Tue, 25 Nov 2025 17:28:13 +0100", "Message-ID": "<20251125162851.2301793-2-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": "<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: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\nAdapt the PipelineHandler::acquireMediaDevice() support function to\nreturn a shared pointer instead of the underlying raw pointer.\n\nPropagate this update to all pipeline handlers that use the MediaDevice\nand store a std::shared_ptr<MediaDevice> accordingly.\n\nThis is required to support media devices that are potentially shared\namong multiple pipeline handlers, like a dewarper implemented as v4l2\nm2m device.\n\nSigned-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\nSigned-off-by: Stefan Klug <stefan.klug@ideasonboard.com>\nReviewed-by: Isaac Scott <isaac.scott@ideasonboard.com>\n\n---\n\nChanges in v3:\n- Call fromEntityName() with a pointer, as the shared_ptr overload was\n dropped\n---\n include/libcamera/internal/pipeline_handler.h | 8 ++++----\n src/libcamera/pipeline/imx8-isi/imx8-isi.cpp | 8 ++++----\n src/libcamera/pipeline/ipu3/cio2.cpp | 4 ++--\n src/libcamera/pipeline/ipu3/cio2.h | 2 +-\n src/libcamera/pipeline/ipu3/imgu.cpp | 15 ++++++++-------\n src/libcamera/pipeline/ipu3/imgu.h | 4 ++--\n src/libcamera/pipeline/ipu3/ipu3.cpp | 4 ++--\n src/libcamera/pipeline/mali-c55/mali-c55.cpp | 16 ++++++++--------\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 8 ++++----\n src/libcamera/pipeline/rkisp1/rkisp1_path.cpp | 6 +++---\n src/libcamera/pipeline/rkisp1/rkisp1_path.h | 2 +-\n .../pipeline/rpi/common/pipeline_base.cpp | 6 ++++--\n .../pipeline/rpi/common/pipeline_base.h | 9 ++++++---\n src/libcamera/pipeline/rpi/pisp/pisp.cpp | 10 ++++++----\n src/libcamera/pipeline/rpi/vc4/vc4.cpp | 13 +++++++++----\n src/libcamera/pipeline/simple/simple.cpp | 13 +++++++------\n src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 6 +++---\n src/libcamera/pipeline/vimc/vimc.cpp | 14 +++++++-------\n src/libcamera/pipeline_handler.cpp | 14 ++++++++------\n test/libtest/buffer_source.cpp | 3 ++-\n 20 files changed, 91 insertions(+), 74 deletions(-)", "diff": "diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h\nindex b2078577f5a4..b4f97477acec 100644\n--- a/include/libcamera/internal/pipeline_handler.h\n+++ b/include/libcamera/internal/pipeline_handler.h\n@@ -38,8 +38,8 @@ public:\n \tvirtual ~PipelineHandler();\n \n \tvirtual bool match(DeviceEnumerator *enumerator) = 0;\n-\tMediaDevice *acquireMediaDevice(DeviceEnumerator *enumerator,\n-\t\t\t\t\tconst DeviceMatch &dm);\n+\tstd::shared_ptr<MediaDevice> acquireMediaDevice(DeviceEnumerator *enumerator,\n+\t\t\t\t\t\t\tconst DeviceMatch &dm);\n \n \tbool acquire(Camera *camera);\n \tvoid release(Camera *camera);\n@@ -72,7 +72,7 @@ public:\n \n protected:\n \tvoid registerCamera(std::shared_ptr<Camera> camera);\n-\tvoid hotplugMediaDevice(MediaDevice *media);\n+\tvoid hotplugMediaDevice(std::shared_ptr<MediaDevice> media);\n \tunsigned int useCount() const { return useCount_; }\n \n \tvirtual int queueRequestDevice(Camera *camera, Request *request) = 0;\n@@ -87,7 +87,7 @@ protected:\n private:\n \tvoid unlockMediaDevices();\n \n-\tvoid mediaDeviceDisconnected(MediaDevice *media);\n+\tvoid mediaDeviceDisconnected(std::shared_ptr<MediaDevice> media);\n \tvirtual void disconnect();\n \n \tvoid doQueueRequest(Request *request);\ndiff --git a/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp b/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp\nindex 9550f54600c4..049d9b1c44cb 100644\n--- a/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp\n+++ b/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp\n@@ -141,7 +141,7 @@ private:\n \n \tvoid bufferReady(FrameBuffer *buffer);\n \n-\tMediaDevice *isiDev_;\n+\tstd::shared_ptr<MediaDevice> isiDev_;\n \n \tstd::unique_ptr<V4L2Subdevice> crossbar_;\n \tstd::vector<Pipe> pipes_;\n@@ -996,7 +996,7 @@ bool PipelineHandlerISI::match(DeviceEnumerator *enumerator)\n \t * Acquire the subdevs and video nodes for the crossbar switch and the\n \t * processing pipelines.\n \t */\n-\tcrossbar_ = V4L2Subdevice::fromEntityName(isiDev_, \"crossbar\");\n+\tcrossbar_ = V4L2Subdevice::fromEntityName(isiDev_.get(), \"crossbar\");\n \tif (!crossbar_)\n \t\treturn false;\n \n@@ -1007,7 +1007,7 @@ bool PipelineHandlerISI::match(DeviceEnumerator *enumerator)\n \tfor (unsigned int i = 0; ; ++i) {\n \t\tstd::string entityName = \"mxc_isi.\" + std::to_string(i);\n \t\tstd::unique_ptr<V4L2Subdevice> isi =\n-\t\t\tV4L2Subdevice::fromEntityName(isiDev_, entityName);\n+\t\t\tV4L2Subdevice::fromEntityName(isiDev_.get(), entityName);\n \t\tif (!isi)\n \t\t\tbreak;\n \n@@ -1017,7 +1017,7 @@ bool PipelineHandlerISI::match(DeviceEnumerator *enumerator)\n \n \t\tentityName += \".capture\";\n \t\tstd::unique_ptr<V4L2VideoDevice> capture =\n-\t\t\tV4L2VideoDevice::fromEntityName(isiDev_, entityName);\n+\t\t\tV4L2VideoDevice::fromEntityName(isiDev_.get(), entityName);\n \t\tif (!capture)\n \t\t\treturn false;\n \ndiff --git a/src/libcamera/pipeline/ipu3/cio2.cpp b/src/libcamera/pipeline/ipu3/cio2.cpp\nindex aa544d7b0303..6f9c055f4d12 100644\n--- a/src/libcamera/pipeline/ipu3/cio2.cpp\n+++ b/src/libcamera/pipeline/ipu3/cio2.cpp\n@@ -112,7 +112,7 @@ std::vector<SizeRange> CIO2Device::sizes(const PixelFormat &format) const\n * \\return 0 on success or a negative error code otherwise\n * \\retval -ENODEV No supported image sensor is connected to this CIO2 instance\n */\n-int CIO2Device::init(const MediaDevice *media, unsigned int index)\n+int CIO2Device::init(std::shared_ptr<const MediaDevice> media, unsigned int index)\n {\n \tint ret;\n \n@@ -170,7 +170,7 @@ int CIO2Device::init(const MediaDevice *media, unsigned int index)\n \t\treturn ret;\n \n \tstd::string cio2Name = \"ipu3-cio2 \" + std::to_string(index);\n-\toutput_ = V4L2VideoDevice::fromEntityName(media, cio2Name);\n+\toutput_ = V4L2VideoDevice::fromEntityName(media.get(), cio2Name);\n \treturn output_->open();\n }\n \ndiff --git a/src/libcamera/pipeline/ipu3/cio2.h b/src/libcamera/pipeline/ipu3/cio2.h\nindex 3aa3a1ca8ef8..d844cb7ae831 100644\n--- a/src/libcamera/pipeline/ipu3/cio2.h\n+++ b/src/libcamera/pipeline/ipu3/cio2.h\n@@ -38,7 +38,7 @@ public:\n \tstd::vector<PixelFormat> formats() const;\n \tstd::vector<SizeRange> sizes(const PixelFormat &format) const;\n \n-\tint init(const MediaDevice *media, unsigned int index);\n+\tint init(std::shared_ptr<const MediaDevice> media, unsigned int index);\n \tint configure(const Size &size, const Transform &transform,\n \t\t V4L2DeviceFormat *outputFormat);\n \ndiff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp\nindex 7be780913fae..bb36c06e8dea 100644\n--- a/src/libcamera/pipeline/ipu3/imgu.cpp\n+++ b/src/libcamera/pipeline/ipu3/imgu.cpp\n@@ -330,7 +330,8 @@ FOV calcFOV(const Size &in, const ImgUDevice::PipeConfig &pipe)\n *\n * \\return 0 on success or a negative error code otherwise\n */\n-int ImgUDevice::init(MediaDevice *media, unsigned int index)\n+int ImgUDevice::init(std::shared_ptr<libcamera::MediaDevice> media,\n+\t\t unsigned int index)\n {\n \tint ret;\n \n@@ -342,32 +343,32 @@ int ImgUDevice::init(MediaDevice *media, unsigned int index)\n \t * by the match() function: no need to check for newly created\n \t * video devices and subdevice validity here.\n \t */\n-\timgu_ = V4L2Subdevice::fromEntityName(media, name_);\n+\timgu_ = V4L2Subdevice::fromEntityName(media.get(), name_);\n \tret = imgu_->open();\n \tif (ret)\n \t\treturn ret;\n \n-\tinput_ = V4L2VideoDevice::fromEntityName(media, name_ + \" input\");\n+\tinput_ = V4L2VideoDevice::fromEntityName(media.get(), name_ + \" input\");\n \tret = input_->open();\n \tif (ret)\n \t\treturn ret;\n \n-\toutput_ = V4L2VideoDevice::fromEntityName(media, name_ + \" output\");\n+\toutput_ = V4L2VideoDevice::fromEntityName(media.get(), name_ + \" output\");\n \tret = output_->open();\n \tif (ret)\n \t\treturn ret;\n \n-\tviewfinder_ = V4L2VideoDevice::fromEntityName(media, name_ + \" viewfinder\");\n+\tviewfinder_ = V4L2VideoDevice::fromEntityName(media.get(), name_ + \" viewfinder\");\n \tret = viewfinder_->open();\n \tif (ret)\n \t\treturn ret;\n \n-\tparam_ = V4L2VideoDevice::fromEntityName(media, name_ + \" parameters\");\n+\tparam_ = V4L2VideoDevice::fromEntityName(media.get(), name_ + \" parameters\");\n \tret = param_->open();\n \tif (ret)\n \t\treturn ret;\n \n-\tstat_ = V4L2VideoDevice::fromEntityName(media, name_ + \" 3a stat\");\n+\tstat_ = V4L2VideoDevice::fromEntityName(media.get(), name_ + \" 3a stat\");\n \tret = stat_->open();\n \tif (ret)\n \t\treturn ret;\ndiff --git a/src/libcamera/pipeline/ipu3/imgu.h b/src/libcamera/pipeline/ipu3/imgu.h\nindex fa508316b301..272f861f98c4 100644\n--- a/src/libcamera/pipeline/ipu3/imgu.h\n+++ b/src/libcamera/pipeline/ipu3/imgu.h\n@@ -64,7 +64,7 @@ public:\n \t\tSize viewfinder;\n \t};\n \n-\tint init(MediaDevice *media, unsigned int index);\n+\tint init(std::shared_ptr<MediaDevice> media, unsigned int index);\n \n \tPipeConfig calculatePipeConfig(Pipe *pipe);\n \n@@ -118,7 +118,7 @@ private:\n \t\t\t\t V4L2DeviceFormat *outputFormat);\n \n \tstd::string name_;\n-\tMediaDevice *media_;\n+\tstd::shared_ptr<MediaDevice> media_;\n };\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex d6b7edcb5a7f..695762c750f8 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -164,8 +164,8 @@ private:\n \n \tImgUDevice imgu0_;\n \tImgUDevice imgu1_;\n-\tMediaDevice *cio2MediaDev_;\n-\tMediaDevice *imguMediaDev_;\n+\tstd::shared_ptr<MediaDevice> cio2MediaDev_;\n+\tstd::shared_ptr<MediaDevice> imguMediaDev_;\n \n \tstd::vector<IPABuffer> ipaBuffers_;\n };\ndiff --git a/src/libcamera/pipeline/mali-c55/mali-c55.cpp b/src/libcamera/pipeline/mali-c55/mali-c55.cpp\nindex 38bdc6138ed1..cf0cb15f8bb3 100644\n--- a/src/libcamera/pipeline/mali-c55/mali-c55.cpp\n+++ b/src/libcamera/pipeline/mali-c55/mali-c55.cpp\n@@ -682,7 +682,7 @@ private:\n \tbool registerTPGCamera(MediaLink *link);\n \tbool registerSensorCamera(MediaLink *link);\n \n-\tMediaDevice *media_;\n+\tstd::shared_ptr<MediaDevice> media_;\n \tstd::unique_ptr<V4L2Subdevice> isp_;\n \tstd::unique_ptr<V4L2VideoDevice> stats_;\n \tstd::unique_ptr<V4L2VideoDevice> params_;\n@@ -1647,24 +1647,24 @@ bool PipelineHandlerMaliC55::match(DeviceEnumerator *enumerator)\n \tif (!media_)\n \t\treturn false;\n \n-\tisp_ = V4L2Subdevice::fromEntityName(media_, \"mali-c55 isp\");\n+\tisp_ = V4L2Subdevice::fromEntityName(media_.get(), \"mali-c55 isp\");\n \tif (isp_->open() < 0)\n \t\treturn false;\n \n-\tstats_ = V4L2VideoDevice::fromEntityName(media_, \"mali-c55 3a stats\");\n+\tstats_ = V4L2VideoDevice::fromEntityName(media_.get(), \"mali-c55 3a stats\");\n \tif (stats_->open() < 0)\n \t\treturn false;\n \n-\tparams_ = V4L2VideoDevice::fromEntityName(media_, \"mali-c55 3a params\");\n+\tparams_ = V4L2VideoDevice::fromEntityName(media_.get(), \"mali-c55 3a params\");\n \tif (params_->open() < 0)\n \t\treturn false;\n \n \tMaliC55Pipe *frPipe = &pipes_[MaliC55FR];\n-\tfrPipe->resizer = V4L2Subdevice::fromEntityName(media_, \"mali-c55 resizer fr\");\n+\tfrPipe->resizer = V4L2Subdevice::fromEntityName(media_.get(), \"mali-c55 resizer fr\");\n \tif (frPipe->resizer->open() < 0)\n \t\treturn false;\n \n-\tfrPipe->cap = V4L2VideoDevice::fromEntityName(media_, \"mali-c55 fr\");\n+\tfrPipe->cap = V4L2VideoDevice::fromEntityName(media_.get(), \"mali-c55 fr\");\n \tif (frPipe->cap->open() < 0)\n \t\treturn false;\n \n@@ -1682,11 +1682,11 @@ bool PipelineHandlerMaliC55::match(DeviceEnumerator *enumerator)\n \n \t\tMaliC55Pipe *dsPipe = &pipes_[MaliC55DS];\n \n-\t\tdsPipe->resizer = V4L2Subdevice::fromEntityName(media_, \"mali-c55 resizer ds\");\n+\t\tdsPipe->resizer = V4L2Subdevice::fromEntityName(media_.get(), \"mali-c55 resizer ds\");\n \t\tif (dsPipe->resizer->open() < 0)\n \t\t\treturn false;\n \n-\t\tdsPipe->cap = V4L2VideoDevice::fromEntityName(media_, \"mali-c55 ds\");\n+\t\tdsPipe->cap = V4L2VideoDevice::fromEntityName(media_.get(), \"mali-c55 ds\");\n \t\tif (dsPipe->cap->open() < 0)\n \t\t\treturn false;\n \ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex d7195b6c484d..d108acfbad9f 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -218,7 +218,7 @@ private:\n \n \tint updateControls(RkISP1CameraData *data);\n \n-\tMediaDevice *media_;\n+\tstd::shared_ptr<MediaDevice> media_;\n \tstd::unique_ptr<V4L2Subdevice> isp_;\n \tstd::unique_ptr<V4L2VideoDevice> param_;\n \tstd::unique_ptr<V4L2VideoDevice> stat_;\n@@ -1412,16 +1412,16 @@ bool PipelineHandlerRkISP1::match(DeviceEnumerator *enumerator)\n \thasSelfPath_ = !!media_->getEntityByName(\"rkisp1_selfpath\");\n \n \t/* Create the V4L2 subdevices we will need. */\n-\tisp_ = V4L2Subdevice::fromEntityName(media_, \"rkisp1_isp\");\n+\tisp_ = V4L2Subdevice::fromEntityName(media_.get(), \"rkisp1_isp\");\n \tif (isp_->open() < 0)\n \t\treturn false;\n \n \t/* Locate and open the stats and params video nodes. */\n-\tstat_ = V4L2VideoDevice::fromEntityName(media_, \"rkisp1_stats\");\n+\tstat_ = V4L2VideoDevice::fromEntityName(media_.get(), \"rkisp1_stats\");\n \tif (stat_->open() < 0)\n \t\treturn false;\n \n-\tparam_ = V4L2VideoDevice::fromEntityName(media_, \"rkisp1_params\");\n+\tparam_ = V4L2VideoDevice::fromEntityName(media_.get(), \"rkisp1_params\");\n \tif (param_->open() < 0)\n \t\treturn false;\n \ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\nindex d318bea92446..ef9cfbdc327a 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\n@@ -64,16 +64,16 @@ RkISP1Path::RkISP1Path(const char *name, const Span<const PixelFormat> &formats,\n {\n }\n \n-bool RkISP1Path::init(MediaDevice *media)\n+bool RkISP1Path::init(std::shared_ptr<MediaDevice> media)\n {\n \tstd::string resizer = std::string(\"rkisp1_resizer_\") + name_ + \"path\";\n \tstd::string video = std::string(\"rkisp1_\") + name_ + \"path\";\n \n-\tresizer_ = V4L2Subdevice::fromEntityName(media, resizer);\n+\tresizer_ = V4L2Subdevice::fromEntityName(media.get(), resizer);\n \tif (resizer_->open() < 0)\n \t\treturn false;\n \n-\tvideo_ = V4L2VideoDevice::fromEntityName(media, video);\n+\tvideo_ = V4L2VideoDevice::fromEntityName(media.get(), video);\n \tif (video_->open() < 0)\n \t\treturn false;\n \ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.h b/src/libcamera/pipeline/rkisp1/rkisp1_path.h\nindex 0b60c499ac64..0c68e9eb99af 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1_path.h\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.h\n@@ -37,7 +37,7 @@ public:\n \tRkISP1Path(const char *name, const Span<const PixelFormat> &formats,\n \t\t const Size &minResolution, const Size &maxResolution);\n \n-\tbool init(MediaDevice *media);\n+\tbool init(std::shared_ptr<MediaDevice> media);\n \n \tint setEnabled(bool enable) { return link_->setEnabled(enable); }\n \tbool isEnabled() const { return link_->flags() & MEDIA_LNK_FL_ENABLED; }\ndiff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\nindex c209aa596311..9d65dc83573b 100644\n--- a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n+++ b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n@@ -786,8 +786,10 @@ int PipelineHandlerBase::queueRequestDevice(Camera *camera, Request *request)\n }\n \n int PipelineHandlerBase::registerCamera(std::unique_ptr<RPi::CameraData> &cameraData,\n-\t\t\t\t\tMediaDevice *frontend, const std::string &frontendName,\n-\t\t\t\t\tMediaDevice *backend, MediaEntity *sensorEntity)\n+\t\t\t\t\tstd::shared_ptr<MediaDevice> frontend,\n+\t\t\t\t\tconst std::string &frontendName,\n+\t\t\t\t\tstd::shared_ptr<MediaDevice> backend,\n+\t\t\t\t\tMediaEntity *sensorEntity)\n {\n \tCameraData *data = cameraData.get();\n \tint ret;\ndiff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.h b/src/libcamera/pipeline/rpi/common/pipeline_base.h\nindex 4bce4ec4f978..15628259afc6 100644\n--- a/src/libcamera/pipeline/rpi/common/pipeline_base.h\n+++ b/src/libcamera/pipeline/rpi/common/pipeline_base.h\n@@ -224,13 +224,16 @@ public:\n \n protected:\n \tint registerCamera(std::unique_ptr<RPi::CameraData> &cameraData,\n-\t\t\t MediaDevice *frontent, const std::string &frontendName,\n-\t\t\t MediaDevice *backend, MediaEntity *sensorEntity);\n+\t\t\t std::shared_ptr<MediaDevice> frontend,\n+\t\t\t const std::string &frontendName,\n+\t\t\t std::shared_ptr<MediaDevice> backend,\n+\t\t\t MediaEntity *sensorEntity);\n \n \tvoid mapBuffers(Camera *camera, const BufferMap &buffers, unsigned int mask);\n \n \tvirtual int platformRegister(std::unique_ptr<CameraData> &cameraData,\n-\t\t\t\t MediaDevice *unicam, MediaDevice *isp) = 0;\n+\t\t\t\t std::shared_ptr<MediaDevice> unicam,\n+\t\t\t\t std::shared_ptr<MediaDevice> isp) = 0;\n \n private:\n \tCameraData *cameraData(Camera *camera)\ndiff --git a/src/libcamera/pipeline/rpi/pisp/pisp.cpp b/src/libcamera/pipeline/rpi/pisp/pisp.cpp\nindex 082724c5a0fb..77acd2f64092 100644\n--- a/src/libcamera/pipeline/rpi/pisp/pisp.cpp\n+++ b/src/libcamera/pipeline/rpi/pisp/pisp.cpp\n@@ -866,7 +866,8 @@ private:\n \n \tint prepareBuffers(Camera *camera) override;\n \tint platformRegister(std::unique_ptr<RPi::CameraData> &cameraData,\n-\t\t\t MediaDevice *cfe, MediaDevice *isp) override;\n+\t\t\t std::shared_ptr<MediaDevice> cfe,\n+\t\t\t std::shared_ptr<MediaDevice> isp) override;\n };\n \n bool PipelineHandlerPiSP::match(DeviceEnumerator *enumerator)\n@@ -884,7 +885,7 @@ bool PipelineHandlerPiSP::match(DeviceEnumerator *enumerator)\n \t\tcfe.add(\"rp1-cfe-fe-image0\");\n \t\tcfe.add(\"rp1-cfe-fe-stats\");\n \t\tcfe.add(\"rp1-cfe-fe-config\");\n-\t\tMediaDevice *cfeDevice = acquireMediaDevice(enumerator, cfe);\n+\t\tstd::shared_ptr<MediaDevice> cfeDevice = acquireMediaDevice(enumerator, cfe);\n \n \t\tif (!cfeDevice) {\n \t\t\tLOG(RPI, Debug) << \"Unable to acquire a CFE instance\";\n@@ -900,7 +901,7 @@ bool PipelineHandlerPiSP::match(DeviceEnumerator *enumerator)\n \t\tisp.add(\"pispbe-tdn_input\");\n \t\tisp.add(\"pispbe-stitch_output\");\n \t\tisp.add(\"pispbe-stitch_input\");\n-\t\tMediaDevice *ispDevice = acquireMediaDevice(enumerator, isp);\n+\t\tstd::shared_ptr<MediaDevice> ispDevice = acquireMediaDevice(enumerator, isp);\n \n \t\tif (!ispDevice) {\n \t\t\tLOG(RPI, Debug) << \"Unable to acquire ISP instance\";\n@@ -1065,7 +1066,8 @@ int PipelineHandlerPiSP::prepareBuffers(Camera *camera)\n }\n \n int PipelineHandlerPiSP::platformRegister(std::unique_ptr<RPi::CameraData> &cameraData,\n-\t\t\t\t\t MediaDevice *cfe, MediaDevice *isp)\n+\t\t\t\t\t std::shared_ptr<MediaDevice> cfe,\n+\t\t\t\t\t std::shared_ptr<MediaDevice> isp)\n {\n \tPiSPCameraData *data = static_cast<PiSPCameraData *>(cameraData.get());\n \tint ret;\ndiff --git a/src/libcamera/pipeline/rpi/vc4/vc4.cpp b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\nindex 99d43bd0a2f5..f0cb99d59e74 100644\n--- a/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n+++ b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n@@ -5,6 +5,8 @@\n * Pipeline handler for VC4-based Raspberry Pi devices\n */\n \n+#include <memory>\n+\n #include <linux/bcm2835-isp.h>\n #include <linux/v4l2-controls.h>\n #include <linux/videodev2.h>\n@@ -158,7 +160,8 @@ private:\n \n \tint prepareBuffers(Camera *camera) override;\n \tint platformRegister(std::unique_ptr<RPi::CameraData> &cameraData,\n-\t\t\t MediaDevice *unicam, MediaDevice *isp) override;\n+\t\t\t std::shared_ptr<MediaDevice> unicam,\n+\t\t\t std::shared_ptr<MediaDevice> isp) override;\n };\n \n bool PipelineHandlerVc4::match(DeviceEnumerator *enumerator)\n@@ -173,7 +176,7 @@ bool PipelineHandlerVc4::match(DeviceEnumerator *enumerator)\n \t */\n \tfor (unsigned int i = 0; i < numUnicamDevices; i++) {\n \t\tDeviceMatch unicam(\"unicam\");\n-\t\tMediaDevice *unicamDevice = acquireMediaDevice(enumerator, unicam);\n+\t\tstd::shared_ptr<MediaDevice> unicamDevice = acquireMediaDevice(enumerator, unicam);\n \n \t\tif (!unicamDevice) {\n \t\t\tLOG(RPI, Debug) << \"Unable to acquire a Unicam instance\";\n@@ -181,7 +184,7 @@ bool PipelineHandlerVc4::match(DeviceEnumerator *enumerator)\n \t\t}\n \n \t\tDeviceMatch isp(\"bcm2835-isp\");\n-\t\tMediaDevice *ispDevice = acquireMediaDevice(enumerator, isp);\n+\t\tstd::shared_ptr<MediaDevice> ispDevice = acquireMediaDevice(enumerator, isp);\n \n \t\tif (!ispDevice) {\n \t\t\tLOG(RPI, Debug) << \"Unable to acquire ISP instance\";\n@@ -303,7 +306,9 @@ int PipelineHandlerVc4::prepareBuffers(Camera *camera)\n \treturn 0;\n }\n \n-int PipelineHandlerVc4::platformRegister(std::unique_ptr<RPi::CameraData> &cameraData, MediaDevice *unicam, MediaDevice *isp)\n+int PipelineHandlerVc4::platformRegister(std::unique_ptr<RPi::CameraData> &cameraData,\n+\t\t\t\t\t std::shared_ptr<MediaDevice> unicam,\n+\t\t\t\t\t std::shared_ptr<MediaDevice> isp)\n {\n \tVc4CameraData *data = static_cast<Vc4CameraData *>(cameraData.get());\n \ndiff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 118b4186c8bf..5e81a6b25920 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_; }\n+\tMediaDevice *converter() { return converter_.get(); }\n \tbool swIspEnabled() const { return swIspEnabled_; }\n \n protected:\n@@ -434,7 +434,8 @@ private:\n \t\treturn static_cast<SimpleCameraData *>(camera->_d());\n \t}\n \n-\tbool matchDevice(MediaDevice *media, const SimplePipelineInfo &info,\n+\tbool matchDevice(std::shared_ptr<MediaDevice> media,\n+\t\t\t const SimplePipelineInfo &info,\n \t\t\t DeviceEnumerator *enumerator);\n \n \tstd::vector<MediaEntity *> locateSensors(MediaDevice *media);\n@@ -445,7 +446,7 @@ private:\n \n \tstd::map<const MediaEntity *, EntityData> entities_;\n \n-\tMediaDevice *converter_;\n+\tstd::shared_ptr<MediaDevice> converter_;\n \tbool swIspEnabled_;\n };\n \n@@ -1690,7 +1691,7 @@ int SimplePipelineHandler::resetRoutingTable(V4L2Subdevice *subdev)\n \treturn 0;\n }\n \n-bool SimplePipelineHandler::matchDevice(MediaDevice *media,\n+bool SimplePipelineHandler::matchDevice(std::shared_ptr<MediaDevice> media,\n \t\t\t\t\tconst SimplePipelineInfo &info,\n \t\t\t\t\tDeviceEnumerator *enumerator)\n {\n@@ -1721,7 +1722,7 @@ bool SimplePipelineHandler::matchDevice(MediaDevice *media,\n \t}\n \n \t/* Locate the sensors. */\n-\tstd::vector<MediaEntity *> sensors = locateSensors(media);\n+\tstd::vector<MediaEntity *> sensors = locateSensors(media.get());\n \tif (sensors.empty()) {\n \t\tLOG(SimplePipeline, Info) << \"No sensor found for \" << media->deviceNode();\n \t\treturn false;\n@@ -1839,7 +1840,7 @@ bool SimplePipelineHandler::matchDevice(MediaDevice *media,\n \n bool SimplePipelineHandler::match(DeviceEnumerator *enumerator)\n {\n-\tMediaDevice *media;\n+\tstd::shared_ptr<MediaDevice> media;\n \n \tfor (const SimplePipelineInfo &inf : supportedDevices) {\n \t\tDeviceMatch dm(inf.driver);\ndiff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\nindex 4b5816dfdde0..034f9c39d3e9 100644\n--- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n@@ -46,7 +46,7 @@ public:\n \t{\n \t}\n \n-\tint init(MediaDevice *media);\n+\tint init(std::shared_ptr<MediaDevice> media);\n \tvoid addControl(uint32_t cid, const ControlInfo &v4l2info,\n \t\t\tControlInfoMap::Map *ctrls);\n \tvoid imageBufferReady(FrameBuffer *buffer);\n@@ -466,7 +466,7 @@ int PipelineHandlerUVC::queueRequestDevice(Camera *camera, Request *request)\n \n bool PipelineHandlerUVC::match(DeviceEnumerator *enumerator)\n {\n-\tMediaDevice *media;\n+\tstd::shared_ptr<MediaDevice> media;\n \tDeviceMatch dm(\"uvcvideo\");\n \n \tmedia = acquireMediaDevice(enumerator, dm);\n@@ -508,7 +508,7 @@ void PipelineHandlerUVC::releaseDevice(Camera *camera)\n \tdata->video_->close();\n }\n \n-int UVCCameraData::init(MediaDevice *media)\n+int UVCCameraData::init(std::shared_ptr<MediaDevice> media)\n {\n \tint ret;\n \ndiff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\nindex 5022101505a1..cd3370e3d419 100644\n--- a/src/libcamera/pipeline/vimc/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc/vimc.cpp\n@@ -49,7 +49,7 @@ LOG_DEFINE_CATEGORY(VIMC)\n class VimcCameraData : public Camera::Private\n {\n public:\n-\tVimcCameraData(PipelineHandler *pipe, MediaDevice *media)\n+\tVimcCameraData(PipelineHandler *pipe, std::shared_ptr<MediaDevice> media)\n \t\t: Camera::Private(pipe), media_(media)\n \t{\n \t}\n@@ -59,7 +59,7 @@ public:\n \tvoid imageBufferReady(FrameBuffer *buffer);\n \tvoid paramsComputed(unsigned int id, const Flags<ipa::vimc::TestFlag> flags);\n \n-\tMediaDevice *media_;\n+\tstd::shared_ptr<MediaDevice> media_;\n \tstd::unique_ptr<CameraSensor> sensor_;\n \tstd::unique_ptr<V4L2Subdevice> debayer_;\n \tstd::unique_ptr<V4L2Subdevice> scaler_;\n@@ -479,7 +479,7 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)\n \tdm.add(\"RGB/YUV Input\");\n \tdm.add(\"Scaler\");\n \n-\tMediaDevice *media = acquireMediaDevice(enumerator, dm);\n+\tstd::shared_ptr<MediaDevice> media = acquireMediaDevice(enumerator, dm);\n \tif (!media)\n \t\treturn false;\n \n@@ -539,21 +539,21 @@ int VimcCameraData::init()\n \tif (!sensor_)\n \t\treturn -ENODEV;\n \n-\tdebayer_ = V4L2Subdevice::fromEntityName(media_, \"Debayer B\");\n+\tdebayer_ = V4L2Subdevice::fromEntityName(media_.get(), \"Debayer B\");\n \tif (debayer_->open())\n \t\treturn -ENODEV;\n \n-\tscaler_ = V4L2Subdevice::fromEntityName(media_, \"Scaler\");\n+\tscaler_ = V4L2Subdevice::fromEntityName(media_.get(), \"Scaler\");\n \tif (scaler_->open())\n \t\treturn -ENODEV;\n \n-\tvideo_ = V4L2VideoDevice::fromEntityName(media_, \"RGB/YUV Capture\");\n+\tvideo_ = V4L2VideoDevice::fromEntityName(media_.get(), \"RGB/YUV Capture\");\n \tif (video_->open())\n \t\treturn -ENODEV;\n \n \tvideo_->bufferReady.connect(this, &VimcCameraData::imageBufferReady);\n \n-\traw_ = V4L2VideoDevice::fromEntityName(media_, \"Raw Capture 1\");\n+\traw_ = V4L2VideoDevice::fromEntityName(media_.get(), \"Raw Capture 1\");\n \tif (raw_->open())\n \t\treturn -ENODEV;\n \ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex ca6215ec69ee..5c469e5bad24 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -129,10 +129,12 @@ PipelineHandler::~PipelineHandler()\n *\n * \\context This function shall be called from the CameraManager thread.\n *\n- * \\return A pointer to the matching MediaDevice, or nullptr if no match is found\n+ * \\return A shared pointer to the matching MediaDevice, or nullptr if no match\n+ * is found\n */\n-MediaDevice *PipelineHandler::acquireMediaDevice(DeviceEnumerator *enumerator,\n-\t\t\t\t\t\t const DeviceMatch &dm)\n+std::shared_ptr<MediaDevice>\n+PipelineHandler::acquireMediaDevice(DeviceEnumerator *enumerator,\n+\t\t\t\t const DeviceMatch &dm)\n {\n \tstd::shared_ptr<MediaDevice> media = enumerator->search(dm);\n \tif (!media)\n@@ -143,7 +145,7 @@ MediaDevice *PipelineHandler::acquireMediaDevice(DeviceEnumerator *enumerator,\n \n \tmediaDevices_.push_back(media);\n \n-\treturn media.get();\n+\treturn media;\n }\n \n /**\n@@ -734,7 +736,7 @@ void PipelineHandler::registerCamera(std::shared_ptr<Camera> camera)\n * handler gets notified and automatically disconnects all the cameras it has\n * registered without requiring any manual intervention.\n */\n-void PipelineHandler::hotplugMediaDevice(MediaDevice *media)\n+void PipelineHandler::hotplugMediaDevice(std::shared_ptr<MediaDevice> media)\n {\n \tmedia->disconnected.connect(this, [this, media] { mediaDeviceDisconnected(media); });\n }\n@@ -742,7 +744,7 @@ void PipelineHandler::hotplugMediaDevice(MediaDevice *media)\n /**\n * \\brief Slot for the MediaDevice disconnected signal\n */\n-void PipelineHandler::mediaDeviceDisconnected(MediaDevice *media)\n+void PipelineHandler::mediaDeviceDisconnected(std::shared_ptr<MediaDevice> media)\n {\n \tmedia->disconnected.disconnect(this);\n \ndiff --git a/test/libtest/buffer_source.cpp b/test/libtest/buffer_source.cpp\nindex dde11f365e43..97c8ae1cbd31 100644\n--- a/test/libtest/buffer_source.cpp\n+++ b/test/libtest/buffer_source.cpp\n@@ -52,7 +52,8 @@ int BufferSource::allocate(const StreamConfiguration &config)\n \t\treturn TestSkip;\n \t}\n \n-\tstd::unique_ptr<V4L2VideoDevice> video = V4L2VideoDevice::fromEntityName(media_.get(), videoDeviceName);\n+\tstd::unique_ptr<V4L2VideoDevice> video = V4L2VideoDevice::fromEntityName(media_.get(),\n+\t\t\t\t\t\t\t\t\t\t videoDeviceName);\n \tif (!video) {\n \t\tstd::cout << \"Failed to get video device from entity \"\n \t\t\t << videoDeviceName << std::endl;\n", "prefixes": [ "v3", "01/29" ] }