{"id":24730,"url":"https://patchwork.libcamera.org/api/1.1/patches/24730/?format=json","web_url":"https://patchwork.libcamera.org/patch/24730/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20251023144841.403689-3-stefan.klug@ideasonboard.com>","date":"2025-10-23T14:48:03","name":"[v2,02/35] libcamera: pipeline: utilise shared MediaDevice pointers","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"0c8f8b56fa66b86668aa83b3043077c27f8a7674","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/1.1/people/184/?format=json","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/24730/mbox/","series":[{"id":5520,"url":"https://patchwork.libcamera.org/api/1.1/series/5520/?format=json","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/24730/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/24730/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 1B635C3331\n\tfor ;\n\tThu, 23 Oct 2025 14:48:53 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9EA03607E6;\n\tThu, 23 Oct 2025 16:48:53 +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 1E2D0607C9\n\tfor ;\n\tThu, 23 Oct 2025 16:48:52 +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 09A2D195E; \n\tThu, 23 Oct 2025 16:47:06 +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=\"AisOJ9kK\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1761230827;\n\tbh=0d5hrByq/o6Nd32z9ToB6bQsbJeSVhRqP1Xu8EyvMXM=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=AisOJ9kKZTuwcR9fwVL3RfMFPaDI7hPx6GC6s01sqAUEdlCPUFHgr1ec3fSDrbyVa\n\tLyC+HN9AL5I3k8lM0Lw1uFrEiZjtZA47d08B95uj35YeI0/isezCL3703Aa/nmjrNO\n\tBsL8x/VaKuMLxesIttidII/Dn5BTp9yL/QkeHkeE=","From":"Stefan Klug ","To":"libcamera-devel@lists.libcamera.org","Cc":"Stefan Klug ,\n\tKieran Bingham ,\n\tPaul Elder ","Subject":"[PATCH v2 02/35] libcamera: pipeline: utilise shared MediaDevice\n\tpointers","Date":"Thu, 23 Oct 2025 16:48:03 +0200","Message-ID":"<20251023144841.403689-3-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":"","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":"From: Kieran Bingham \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 accordingly.\n\nSigned-off-by: Kieran Bingham \nSigned-off-by: Paul Elder \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 e89d6a33e398..0b25cffb44e5 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 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);\n-\tvoid hotplugMediaDevice(MediaDevice *media);\n+\tvoid hotplugMediaDevice(std::shared_ptr media);\n \n \tvirtual int queueRequestDevice(Camera *camera, Request *request) = 0;\n \tvirtual void stopDevice(Camera *camera) = 0;\n@@ -86,7 +86,7 @@ protected:\n private:\n \tvoid unlockMediaDevices();\n \n-\tvoid mediaDeviceDisconnected(MediaDevice *media);\n+\tvoid mediaDeviceDisconnected(std::shared_ptr 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 de09431cb9b9..3f414676ec28 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 isiDev_;\n \n \tstd::unique_ptr crossbar_;\n \tstd::vector 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 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 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 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 formats() const;\n \tstd::vector sizes(const PixelFormat &format) const;\n \n-\tint init(const MediaDevice *media, unsigned int index);\n+\tint init(std::shared_ptr 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 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 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 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 cio2MediaDev_;\n+\tstd::shared_ptr imguMediaDev_;\n \n \tstd::vector ipaBuffers_;\n };\ndiff --git a/src/libcamera/pipeline/mali-c55/mali-c55.cpp b/src/libcamera/pipeline/mali-c55/mali-c55.cpp\nindex 38bdc6138ed1..434b2d5e8a5f 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 media_;\n \tstd::unique_ptr isp_;\n \tstd::unique_ptr stats_;\n \tstd::unique_ptr params_;\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex ecd13831539f..959cdb41fe7e 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 media_;\n \tstd::unique_ptr isp_;\n \tstd::unique_ptr param_;\n \tstd::unique_ptr stat_;\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\nindex d318bea92446..8d5298c04833 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\n@@ -64,7 +64,7 @@ RkISP1Path::RkISP1Path(const char *name, const Span &formats,\n {\n }\n \n-bool RkISP1Path::init(MediaDevice *media)\n+bool RkISP1Path::init(std::shared_ptr 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 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 &formats,\n \t\t const Size &minResolution, const Size &maxResolution);\n \n-\tbool init(MediaDevice *media);\n+\tbool init(std::shared_ptr 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 &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 frontend,\n+\t\t\t\t\tconst std::string &frontendName,\n+\t\t\t\t\tstd::shared_ptr 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 &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 frontend,\n+\t\t\t const std::string &frontendName,\n+\t\t\t std::shared_ptr 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,\n-\t\t\t\t MediaDevice *unicam, MediaDevice *isp) = 0;\n+\t\t\t\t std::shared_ptr unicam,\n+\t\t\t\t std::shared_ptr 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 &cameraData,\n-\t\t\t MediaDevice *cfe, MediaDevice *isp) override;\n+\t\t\t std::shared_ptr cfe,\n+\t\t\t std::shared_ptr 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 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 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 &cameraData,\n-\t\t\t\t\t MediaDevice *cfe, MediaDevice *isp)\n+\t\t\t\t\t std::shared_ptr cfe,\n+\t\t\t\t\t std::shared_ptr isp)\n {\n \tPiSPCameraData *data = static_cast(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 \n+\n #include \n #include \n #include \n@@ -158,7 +160,8 @@ private:\n \n \tint prepareBuffers(Camera *camera) override;\n \tint platformRegister(std::unique_ptr &cameraData,\n-\t\t\t MediaDevice *unicam, MediaDevice *isp) override;\n+\t\t\t std::shared_ptr unicam,\n+\t\t\t std::shared_ptr 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 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 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 &cameraData, MediaDevice *unicam, MediaDevice *isp)\n+int PipelineHandlerVc4::platformRegister(std::unique_ptr &cameraData,\n+\t\t\t\t\t std::shared_ptr unicam,\n+\t\t\t\t\t std::shared_ptr isp)\n {\n \tVc4CameraData *data = static_cast(cameraData.get());\n \ndiff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 7b0783cdbc32..1183be9a6b07 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(camera->_d());\n \t}\n \n-\tbool matchDevice(MediaDevice *media, const SimplePipelineInfo &info,\n+\tbool matchDevice(std::shared_ptr media,\n+\t\t\t const SimplePipelineInfo &info,\n \t\t\t DeviceEnumerator *enumerator);\n \n \tstd::vector locateSensors(MediaDevice *media);\n@@ -445,7 +446,7 @@ private:\n \n \tstd::map entities_;\n \n-\tMediaDevice *converter_;\n+\tstd::shared_ptr converter_;\n \tbool swIspEnabled_;\n };\n \n@@ -1684,7 +1685,7 @@ int SimplePipelineHandler::resetRoutingTable(V4L2Subdevice *subdev)\n \treturn 0;\n }\n \n-bool SimplePipelineHandler::matchDevice(MediaDevice *media,\n+bool SimplePipelineHandler::matchDevice(std::shared_ptr media,\n \t\t\t\t\tconst SimplePipelineInfo &info,\n \t\t\t\t\tDeviceEnumerator *enumerator)\n {\n@@ -1715,7 +1716,7 @@ bool SimplePipelineHandler::matchDevice(MediaDevice *media,\n \t}\n \n \t/* Locate the sensors. */\n-\tstd::vector sensors = locateSensors(media);\n+\tstd::vector sensors = locateSensors(media.get());\n \tif (sensors.empty()) {\n \t\tLOG(SimplePipeline, Info) << \"No sensor found for \" << media->deviceNode();\n \t\treturn false;\n@@ -1833,7 +1834,7 @@ bool SimplePipelineHandler::matchDevice(MediaDevice *media,\n \n bool SimplePipelineHandler::match(DeviceEnumerator *enumerator)\n {\n-\tMediaDevice *media;\n+\tstd::shared_ptr 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 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 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 media)\n {\n \tint ret;\n \ndiff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\nindex 5022101505a1..fdb92b4a82d9 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 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 flags);\n \n-\tMediaDevice *media_;\n+\tstd::shared_ptr media_;\n \tstd::unique_ptr sensor_;\n \tstd::unique_ptr debayer_;\n \tstd::unique_ptr 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 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 e5f9e55c9783..825b8767fe3b 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\n+PipelineHandler::acquireMediaDevice(DeviceEnumerator *enumerator,\n+\t\t\t\t const DeviceMatch &dm)\n {\n \tstd::shared_ptr 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@@ -725,7 +727,7 @@ void PipelineHandler::registerCamera(std::shared_ptr 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 media)\n {\n \tmedia->disconnected.connect(this, [this, media] { mediaDeviceDisconnected(media); });\n }\n@@ -733,7 +735,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 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 video = V4L2VideoDevice::fromEntityName(media_.get(), videoDeviceName);\n+\tstd::unique_ptr 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":["v2","02/35"]}