Patch Detail
Show a patch.
GET /api/1.1/patches/23136/?format=api
{ "id": 23136, "url": "https://patchwork.libcamera.org/api/1.1/patches/23136/?format=api", "web_url": "https://patchwork.libcamera.org/patch/23136/", "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": "<20250404074624.2975182-3-paul.elder@ideasonboard.com>", "date": "2025-04-04T07:46:22", "name": "[2/3] libcamera: pipeline: utilise shared MediaDevice pointers", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "372e7f0ddcb4ae3a976470c9e96fb77538379a6c", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/1.1/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/23136/mbox/", "series": [ { "id": 5113, "url": "https://patchwork.libcamera.org/api/1.1/series/5113/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5113", "date": "2025-04-04T07:46:20", "name": "libcamera: pipeline: Use shared pointers for MediaDevice", "version": 1, "mbox": "https://patchwork.libcamera.org/series/5113/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/23136/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/23136/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 5C730C3284\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 4 Apr 2025 07:46:41 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7870C689AB;\n\tFri, 4 Apr 2025 09:46:40 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 69DD368994\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 4 Apr 2025 09:46:38 +0200 (CEST)", "from neptunite.flets-east.jp (unknown\n\t[IPv6:2404:7a81:160:2100:cd45:d129:c842:b4ce])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 09DD2710;\n\tFri, 4 Apr 2025 09:44:42 +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=\"DxGFZwh/\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1743752684;\n\tbh=8b0nqoC5zuWIoG+JqdXRWPJN9yWv3vtuOd/nenj2OQk=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=DxGFZwh/YZVsiDAZpGf7Qx8OJ4ADFCpxMTK+UqQoyh12C5OcA7sdew0n9++K/PJAh\n\tEO9Irkyh0+SUne0wDyqpQ6jmXJ7DWt9wLlaLScGTZHfTSgVyP7IeCsGdF3tx129Kie\n\tASVLOID7rkCE9pGQiwU3x0zpGSKdVr1z562IyaDs=", "From": "Paul Elder <paul.elder@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Kieran Bingham <kieran.bingham@ideasonboard.com>,\n\tPaul Elder <paul.elder@ideasonboard.com>", "Subject": "[PATCH 2/3] libcamera: pipeline: utilise shared MediaDevice pointers", "Date": "Fri, 4 Apr 2025 16:46:22 +0900", "Message-ID": "<20250404074624.2975182-3-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.47.2", "In-Reply-To": "<20250404074624.2975182-1-paul.elder@ideasonboard.com>", "References": "<20250404074624.2975182-1-paul.elder@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\nSigned-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\n---\n include/libcamera/internal/pipeline_handler.h | 8 ++++----\n src/libcamera/pipeline/imx8-isi/imx8-isi.cpp | 2 +-\n src/libcamera/pipeline/ipu3/cio2.cpp | 2 +-\n src/libcamera/pipeline/ipu3/cio2.h | 2 +-\n src/libcamera/pipeline/ipu3/imgu.cpp | 3 ++-\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 | 2 +-\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 +-\n src/libcamera/pipeline/rkisp1/rkisp1_path.cpp | 2 +-\n src/libcamera/pipeline/rkisp1/rkisp1_path.h | 2 +-\n .../pipeline/rpi/common/pipeline_base.cpp | 6 ++++--\n src/libcamera/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 | 6 +++---\n src/libcamera/pipeline_handler.cpp | 14 ++++++++------\n test/delayed_controls.cpp | 2 +-\n test/libtest/buffer_source.cpp | 2 +-\n 21 files changed, 65 insertions(+), 49 deletions(-)", "diff": "diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h\nindex 5fa8bc2f66ee..0199ab7911c0 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@@ -74,7 +74,7 @@ protected:\n \tvoid clearMediaDevices();\n \n \tvoid registerCamera(std::shared_ptr<Camera> camera);\n-\tvoid hotplugMediaDevice(MediaDevice *media);\n+\tvoid hotplugMediaDevice(std::shared_ptr<MediaDevice> media);\n \n \tvirtual int queueRequestDevice(Camera *camera, Request *request) = 0;\n \tvirtual void stopDevice(Camera *camera) = 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 4e66b3368d5a..850dbfcdc64b 100644\n--- a/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp\n+++ b/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp\n@@ -139,7 +139,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_;\ndiff --git a/src/libcamera/pipeline/ipu3/cio2.cpp b/src/libcamera/pipeline/ipu3/cio2.cpp\nindex aa544d7b0303..ebbd424c56ea 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 \ndiff --git a/src/libcamera/pipeline/ipu3/cio2.h b/src/libcamera/pipeline/ipu3/cio2.h\nindex 963c2f6b93a4..fdf85f2655f0 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..391e000f6e12 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 \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 e31e3879dcc9..17205f96446a 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 a05e11fccf8d..7615122d907b 100644\n--- a/src/libcamera/pipeline/mali-c55/mali-c55.cpp\n+++ b/src/libcamera/pipeline/mali-c55/mali-c55.cpp\n@@ -684,7 +684,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_;\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 705615b86b0c..d4ec538f478b 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -200,7 +200,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_;\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\nindex eee5b09e2ff0..2e567ace0b78 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\n@@ -59,7 +59,7 @@ 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\";\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.h b/src/libcamera/pipeline/rkisp1/rkisp1_path.h\nindex 2a1ef0abe6d1..154310ac37c1 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1_path.h\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.h\n@@ -36,7 +36,7 @@ class RkISP1Path\n public:\n \tRkISP1Path(const char *name, const Span<const PixelFormat> &formats);\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 1f13e5230fae..23ce54eca144 100644\n--- a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n+++ b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n@@ -784,8 +784,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 aae0c2f35888..e422bbf7405f 100644\n--- a/src/libcamera/pipeline/rpi/common/pipeline_base.h\n+++ b/src/libcamera/pipeline/rpi/common/pipeline_base.h\n@@ -229,13 +229,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 91e7f4c94d96..d0cb71b49e11 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 fe910bdf2ff9..d58035ecd198 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 451491f5608e..feaa16094b65 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -407,7 +407,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@@ -427,7 +427,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@@ -438,7 +439,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@@ -1663,7 +1664,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@@ -1681,7 +1682,7 @@ bool SimplePipelineHandler::matchDevice(MediaDevice *media,\n \tswIspEnabled_ = info.swIspEnabled;\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@@ -1799,7 +1800,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 5adc89fdb29c..a1e036a32d5f 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@@ -449,7 +449,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@@ -491,7 +491,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 07273bd2b6c3..59c564b8a9f6 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@@ -476,7 +476,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 \ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex 8f12957b75fa..5fe2c64c8bc6 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -125,10 +125,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@@ -139,7 +141,7 @@ MediaDevice *PipelineHandler::acquireMediaDevice(DeviceEnumerator *enumerator,\n \n \tmediaDevices_.push_back(media);\n \n-\treturn media.get();\n+\treturn media;\n }\n \n /**\n@@ -712,7 +714,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@@ -720,7 +722,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/delayed_controls.cpp b/test/delayed_controls.cpp\nindex 7bd30e7aead8..b305be48aafc 100644\n--- a/test/delayed_controls.cpp\n+++ b/test/delayed_controls.cpp\n@@ -47,7 +47,7 @@ protected:\n \t\t\treturn TestSkip;\n \t\t}\n \n-\t\tdev_ = V4L2VideoDevice::fromEntityName(media_.get(), \"vivid-000-vid-cap\");\n+\t\tdev_ = V4L2VideoDevice::fromEntityName(media_, \"vivid-000-vid-cap\");\n \t\tif (dev_->open()) {\n \t\t\tcerr << \"Failed to open video device\" << endl;\n \t\t\treturn TestFail;\ndiff --git a/test/libtest/buffer_source.cpp b/test/libtest/buffer_source.cpp\nindex dde11f365e43..19b25fed50a0 100644\n--- a/test/libtest/buffer_source.cpp\n+++ b/test/libtest/buffer_source.cpp\n@@ -52,7 +52,7 @@ 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_, videoDeviceName);\n \tif (!video) {\n \t\tstd::cout << \"Failed to get video device from entity \"\n \t\t\t << videoDeviceName << std::endl;\n", "prefixes": [ "2/3" ] }