PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: pipeline: Utilise shared MediaDevice pointers

Browse Source 
Adapt the PipelineHandler::acquireMediaDevice() support function to
return a shared pointer instead of the underlying raw pointer.

Propagate this update to all pipeline handlers that use the MediaDevice
and store a std::shared_ptr<MediaDevice> accordingly.

This is required to support media devices that are potentially shared
among multiple pipeline handlers, like a dewarper implemented as v4l2
m2m device.

Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
Reviewed-by: Isaac Scott <isaac.scott@ideasonboard.com>
This commit is contained in:
Kieran Bingham
2025-11-25 17:28:13 +01:00
committed by Stefan Klug
parent 4e720d5bae
commit 97227ebed3
20 changed files with 91 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcamera/pipeline/imx8-isi/imx8-isi.cpp
+4 -4
View File
@@ -141,7 +141,7 @@ private:
void bufferReady(FrameBuffer *buffer);
MediaDevice *isiDev_;
std::shared_ptr<MediaDevice> isiDev_;
std::unique_ptr<V4L2Subdevice> crossbar_;
std::vector<Pipe> pipes_;
@@ -996,7 +996,7 @@ bool PipelineHandlerISI::match(DeviceEnumerator *enumerator)
* Acquire the subdevs and video nodes for the crossbar switch and the
* processing pipelines.
*/
crossbar_ = V4L2Subdevice::fromEntityName(isiDev_, "crossbar");
crossbar_ = V4L2Subdevice::fromEntityName(isiDev_.get(), "crossbar");
if (!crossbar_)
return false;
@@ -1007,7 +1007,7 @@ bool PipelineHandlerISI::match(DeviceEnumerator *enumerator)
for (unsigned int i = 0; ; ++i) {
std::string entityName = "mxc_isi." + std::to_string(i);
std::unique_ptr<V4L2Subdevice> isi =
V4L2Subdevice::fromEntityName(isiDev_, entityName);
V4L2Subdevice::fromEntityName(isiDev_.get(), entityName);
if (!isi)
break;
@@ -1017,7 +1017,7 @@ bool PipelineHandlerISI::match(DeviceEnumerator *enumerator)
entityName += ".capture";
std::unique_ptr<V4L2VideoDevice> capture =
V4L2VideoDevice::fromEntityName(isiDev_, entityName);
V4L2VideoDevice::fromEntityName(isiDev_.get(), entityName);
if (!capture)
return false;
src/libcamera/pipeline/ipu3/cio2.cpp
+2 -2
View File
@@ -112,7 +112,7 @@ std::vector<SizeRange> CIO2Device::sizes(const PixelFormat &format) const
* \return 0 on success or a negative error code otherwise
* \retval -ENODEV No supported image sensor is connected to this CIO2 instance
*/
int CIO2Device::init(const MediaDevice *media, unsigned int index)
int CIO2Device::init(std::shared_ptr<const MediaDevice> media, unsigned int index)
{
int ret;
@@ -170,7 +170,7 @@ int CIO2Device::init(const MediaDevice *media, unsigned int index)
return ret;
std::string cio2Name = "ipu3-cio2 " + std::to_string(index);
output_ = V4L2VideoDevice::fromEntityName(media, cio2Name);
output_ = V4L2VideoDevice::fromEntityName(media.get(), cio2Name);
return output_->open();
}
src/libcamera/pipeline/ipu3/cio2.h
+1 -1
View File
@@ -38,7 +38,7 @@ public:
std::vector<PixelFormat> formats() const;
std::vector<SizeRange> sizes(const PixelFormat &format) const;
int init(const MediaDevice *media, unsigned int index);
int init(std::shared_ptr<const MediaDevice> media, unsigned int index);
int configure(const Size &size, const Transform &transform,
V4L2DeviceFormat *outputFormat);
src/libcamera/pipeline/ipu3/imgu.cpp
+8 -7
View File
@@ -330,7 +330,8 @@ FOV calcFOV(const Size &in, const ImgUDevice::PipeConfig &pipe)
*
* \return 0 on success or a negative error code otherwise
*/
int ImgUDevice::init(MediaDevice *media, unsigned int index)
int ImgUDevice::init(std::shared_ptr<libcamera::MediaDevice> media,
unsigned int index)
{
int ret;
@@ -342,32 +343,32 @@ int ImgUDevice::init(MediaDevice *media, unsigned int index)
* by the match() function: no need to check for newly created
* video devices and subdevice validity here.
*/
imgu_ = V4L2Subdevice::fromEntityName(media, name_);
imgu_ = V4L2Subdevice::fromEntityName(media.get(), name_);
ret = imgu_->open();
if (ret)
return ret;
input_ = V4L2VideoDevice::fromEntityName(media, name_ + " input");
input_ = V4L2VideoDevice::fromEntityName(media.get(), name_ + " input");
ret = input_->open();
if (ret)
return ret;
output_ = V4L2VideoDevice::fromEntityName(media, name_ + " output");
output_ = V4L2VideoDevice::fromEntityName(media.get(), name_ + " output");
ret = output_->open();
if (ret)
return ret;
viewfinder_ = V4L2VideoDevice::fromEntityName(media, name_ + " viewfinder");
viewfinder_ = V4L2VideoDevice::fromEntityName(media.get(), name_ + " viewfinder");
ret = viewfinder_->open();
if (ret)
return ret;
param_ = V4L2VideoDevice::fromEntityName(media, name_ + " parameters");
param_ = V4L2VideoDevice::fromEntityName(media.get(), name_ + " parameters");
ret = param_->open();
if (ret)
return ret;
stat_ = V4L2VideoDevice::fromEntityName(media, name_ + " 3a stat");
stat_ = V4L2VideoDevice::fromEntityName(media.get(), name_ + " 3a stat");
ret = stat_->open();
if (ret)
return ret;
src/libcamera/pipeline/ipu3/imgu.h
+2 -2
View File
@@ -64,7 +64,7 @@ public:
Size viewfinder;
};
int init(MediaDevice *media, unsigned int index);
int init(std::shared_ptr<MediaDevice> media, unsigned int index);
PipeConfig calculatePipeConfig(Pipe *pipe);
@@ -118,7 +118,7 @@ private:
V4L2DeviceFormat *outputFormat);
std::string name_;
MediaDevice *media_;
std::shared_ptr<MediaDevice> media_;
};
} /* namespace libcamera */
src/libcamera/pipeline/ipu3/ipu3.cpp
+2 -2
View File
@@ -164,8 +164,8 @@ private:
ImgUDevice imgu0_;
ImgUDevice imgu1_;
MediaDevice *cio2MediaDev_;
MediaDevice *imguMediaDev_;
std::shared_ptr<MediaDevice> cio2MediaDev_;
std::shared_ptr<MediaDevice> imguMediaDev_;
std::vector<IPABuffer> ipaBuffers_;
};
src/libcamera/pipeline/mali-c55/mali-c55.cpp
+8 -8
View File
@@ -682,7 +682,7 @@ private:
bool registerTPGCamera(MediaLink *link);
bool registerSensorCamera(MediaLink *link);
MediaDevice *media_;
std::shared_ptr<MediaDevice> media_;
std::unique_ptr<V4L2Subdevice> isp_;
std::unique_ptr<V4L2VideoDevice> stats_;
std::unique_ptr<V4L2VideoDevice> params_;
@@ -1647,24 +1647,24 @@ bool PipelineHandlerMaliC55::match(DeviceEnumerator *enumerator)
if (!media_)
return false;
isp_ = V4L2Subdevice::fromEntityName(media_, "mali-c55 isp");
isp_ = V4L2Subdevice::fromEntityName(media_.get(), "mali-c55 isp");
if (isp_->open() < 0)
return false;
stats_ = V4L2VideoDevice::fromEntityName(media_, "mali-c55 3a stats");
stats_ = V4L2VideoDevice::fromEntityName(media_.get(), "mali-c55 3a stats");
if (stats_->open() < 0)
return false;
params_ = V4L2VideoDevice::fromEntityName(media_, "mali-c55 3a params");
params_ = V4L2VideoDevice::fromEntityName(media_.get(), "mali-c55 3a params");
if (params_->open() < 0)
return false;
MaliC55Pipe *frPipe = &pipes_[MaliC55FR];
frPipe->resizer = V4L2Subdevice::fromEntityName(media_, "mali-c55 resizer fr");
frPipe->resizer = V4L2Subdevice::fromEntityName(media_.get(), "mali-c55 resizer fr");
if (frPipe->resizer->open() < 0)
return false;
frPipe->cap = V4L2VideoDevice::fromEntityName(media_, "mali-c55 fr");
frPipe->cap = V4L2VideoDevice::fromEntityName(media_.get(), "mali-c55 fr");
if (frPipe->cap->open() < 0)
return false;
@@ -1682,11 +1682,11 @@ bool PipelineHandlerMaliC55::match(DeviceEnumerator *enumerator)
MaliC55Pipe *dsPipe = &pipes_[MaliC55DS];
dsPipe->resizer = V4L2Subdevice::fromEntityName(media_, "mali-c55 resizer ds");
dsPipe->resizer = V4L2Subdevice::fromEntityName(media_.get(), "mali-c55 resizer ds");
if (dsPipe->resizer->open() < 0)
return false;
dsPipe->cap = V4L2VideoDevice::fromEntityName(media_, "mali-c55 ds");
dsPipe->cap = V4L2VideoDevice::fromEntityName(media_.get(), "mali-c55 ds");
if (dsPipe->cap->open() < 0)
return false;
src/libcamera/pipeline/rkisp1/rkisp1.cpp
+4 -4
View File
@@ -218,7 +218,7 @@ private:
int updateControls(RkISP1CameraData *data);
MediaDevice *media_;
std::shared_ptr<MediaDevice> media_;
std::unique_ptr<V4L2Subdevice> isp_;
std::unique_ptr<V4L2VideoDevice> param_;
std::unique_ptr<V4L2VideoDevice> stat_;
@@ -1412,16 +1412,16 @@ bool PipelineHandlerRkISP1::match(DeviceEnumerator *enumerator)
hasSelfPath_ = !!media_->getEntityByName("rkisp1_selfpath");
/* Create the V4L2 subdevices we will need. */
isp_ = V4L2Subdevice::fromEntityName(media_, "rkisp1_isp");
isp_ = V4L2Subdevice::fromEntityName(media_.get(), "rkisp1_isp");
if (isp_->open() < 0)
return false;
/* Locate and open the stats and params video nodes. */
stat_ = V4L2VideoDevice::fromEntityName(media_, "rkisp1_stats");
stat_ = V4L2VideoDevice::fromEntityName(media_.get(), "rkisp1_stats");
if (stat_->open() < 0)
return false;
param_ = V4L2VideoDevice::fromEntityName(media_, "rkisp1_params");
param_ = V4L2VideoDevice::fromEntityName(media_.get(), "rkisp1_params");
if (param_->open() < 0)
return false;
src/libcamera/pipeline/rkisp1/rkisp1_path.cpp
+3 -3
View File
@@ -64,16 +64,16 @@ RkISP1Path::RkISP1Path(const char *name, const Span<const PixelFormat> &formats,
{
}
bool RkISP1Path::init(MediaDevice *media)
bool RkISP1Path::init(std::shared_ptr<MediaDevice> media)
{
std::string resizer = std::string("rkisp1_resizer_") + name_ + "path";
std::string video = std::string("rkisp1_") + name_ + "path";
resizer_ = V4L2Subdevice::fromEntityName(media, resizer);
resizer_ = V4L2Subdevice::fromEntityName(media.get(), resizer);
if (resizer_->open() < 0)
return false;
video_ = V4L2VideoDevice::fromEntityName(media, video);
video_ = V4L2VideoDevice::fromEntityName(media.get(), video);
if (video_->open() < 0)
return false;
src/libcamera/pipeline/rkisp1/rkisp1_path.h
+1 -1
View File
@@ -37,7 +37,7 @@ public:
RkISP1Path(const char *name, const Span<const PixelFormat> &formats,
const Size &minResolution, const Size &maxResolution);
bool init(MediaDevice *media);
bool init(std::shared_ptr<MediaDevice> media);
int setEnabled(bool enable) { return link_->setEnabled(enable); }
bool isEnabled() const { return link_->flags() & MEDIA_LNK_FL_ENABLED; }
src/libcamera/pipeline/rpi/common/pipeline_base.cpp
+4 -2
View File
@@ -786,8 +786,10 @@ int PipelineHandlerBase::queueRequestDevice(Camera *camera, Request *request)
}
int PipelineHandlerBase::registerCamera(std::unique_ptr<RPi::CameraData> &cameraData,
MediaDevice *frontend, const std::string &frontendName,
MediaDevice *backend, MediaEntity *sensorEntity)
std::shared_ptr<MediaDevice> frontend,
const std::string &frontendName,
std::shared_ptr<MediaDevice> backend,
MediaEntity *sensorEntity)
{
CameraData *data = cameraData.get();
int ret;
src/libcamera/pipeline/rpi/common/pipeline_base.h
+6 -3
View File
@@ -224,13 +224,16 @@ public:
protected:
int registerCamera(std::unique_ptr<RPi::CameraData> &cameraData,
MediaDevice *frontent, const std::string &frontendName,
MediaDevice *backend, MediaEntity *sensorEntity);
std::shared_ptr<MediaDevice> frontend,
const std::string &frontendName,
std::shared_ptr<MediaDevice> backend,
MediaEntity *sensorEntity);
void mapBuffers(Camera *camera, const BufferMap &buffers, unsigned int mask);
virtual int platformRegister(std::unique_ptr<CameraData> &cameraData,
MediaDevice *unicam, MediaDevice *isp) = 0;
std::shared_ptr<MediaDevice> unicam,
std::shared_ptr<MediaDevice> isp) = 0;
private:
CameraData *cameraData(Camera *camera)
src/libcamera/pipeline/rpi/pisp/pisp.cpp
+6 -4
View File
@@ -866,7 +866,8 @@ private:
int prepareBuffers(Camera *camera) override;
int platformRegister(std::unique_ptr<RPi::CameraData> &cameraData,
MediaDevice *cfe, MediaDevice *isp) override;
std::shared_ptr<MediaDevice> cfe,
std::shared_ptr<MediaDevice> isp) override;
};
bool PipelineHandlerPiSP::match(DeviceEnumerator *enumerator)
@@ -884,7 +885,7 @@ bool PipelineHandlerPiSP::match(DeviceEnumerator *enumerator)
cfe.add("rp1-cfe-fe-image0");
cfe.add("rp1-cfe-fe-stats");
cfe.add("rp1-cfe-fe-config");
MediaDevice *cfeDevice = acquireMediaDevice(enumerator, cfe);
std::shared_ptr<MediaDevice> cfeDevice = acquireMediaDevice(enumerator, cfe);
if (!cfeDevice) {
LOG(RPI, Debug) << "Unable to acquire a CFE instance";
@@ -900,7 +901,7 @@ bool PipelineHandlerPiSP::match(DeviceEnumerator *enumerator)
isp.add("pispbe-tdn_input");
isp.add("pispbe-stitch_output");
isp.add("pispbe-stitch_input");
MediaDevice *ispDevice = acquireMediaDevice(enumerator, isp);
std::shared_ptr<MediaDevice> ispDevice = acquireMediaDevice(enumerator, isp);
if (!ispDevice) {
LOG(RPI, Debug) << "Unable to acquire ISP instance";
@@ -1065,7 +1066,8 @@ int PipelineHandlerPiSP::prepareBuffers(Camera *camera)
}
int PipelineHandlerPiSP::platformRegister(std::unique_ptr<RPi::CameraData> &cameraData,
MediaDevice *cfe, MediaDevice *isp)
std::shared_ptr<MediaDevice> cfe,
std::shared_ptr<MediaDevice> isp)
{
PiSPCameraData *data = static_cast<PiSPCameraData *>(cameraData.get());
int ret;
src/libcamera/pipeline/rpi/vc4/vc4.cpp
+9 -4
View File
@@ -5,6 +5,8 @@
* Pipeline handler for VC4-based Raspberry Pi devices
*/
#include <memory>
#include <linux/bcm2835-isp.h>
#include <linux/v4l2-controls.h>
#include <linux/videodev2.h>
@@ -158,7 +160,8 @@ private:
int prepareBuffers(Camera *camera) override;
int platformRegister(std::unique_ptr<RPi::CameraData> &cameraData,
MediaDevice *unicam, MediaDevice *isp) override;
std::shared_ptr<MediaDevice> unicam,
std::shared_ptr<MediaDevice> isp) override;
};
bool PipelineHandlerVc4::match(DeviceEnumerator *enumerator)
@@ -173,7 +176,7 @@ bool PipelineHandlerVc4::match(DeviceEnumerator *enumerator)
*/
for (unsigned int i = 0; i < numUnicamDevices; i++) {
DeviceMatch unicam("unicam");
MediaDevice *unicamDevice = acquireMediaDevice(enumerator, unicam);
std::shared_ptr<MediaDevice> unicamDevice = acquireMediaDevice(enumerator, unicam);
if (!unicamDevice) {
LOG(RPI, Debug) << "Unable to acquire a Unicam instance";
@@ -181,7 +184,7 @@ bool PipelineHandlerVc4::match(DeviceEnumerator *enumerator)
}
DeviceMatch isp("bcm2835-isp");
MediaDevice *ispDevice = acquireMediaDevice(enumerator, isp);
std::shared_ptr<MediaDevice> ispDevice = acquireMediaDevice(enumerator, isp);
if (!ispDevice) {
LOG(RPI, Debug) << "Unable to acquire ISP instance";
@@ -303,7 +306,9 @@ int PipelineHandlerVc4::prepareBuffers(Camera *camera)
return 0;
}
int PipelineHandlerVc4::platformRegister(std::unique_ptr<RPi::CameraData> &cameraData, MediaDevice *unicam, MediaDevice *isp)
int PipelineHandlerVc4::platformRegister(std::unique_ptr<RPi::CameraData> &cameraData,
std::shared_ptr<MediaDevice> unicam,
std::shared_ptr<MediaDevice> isp)
{
Vc4CameraData *data = static_cast<Vc4CameraData *>(cameraData.get());
src/libcamera/pipeline/simple/simple.cpp
+7 -6
View File
@@ -415,7 +415,7 @@ public:
V4L2VideoDevice *video(const MediaEntity *entity);
V4L2Subdevice *subdev(const MediaEntity *entity);
MediaDevice *converter() { return converter_; }
MediaDevice *converter() { return converter_.get(); }
bool swIspEnabled() const { return swIspEnabled_; }
protected:
@@ -436,7 +436,8 @@ private:
return static_cast<SimpleCameraData *>(camera->_d());
}
bool matchDevice(MediaDevice *media, const SimplePipelineInfo &info,
bool matchDevice(std::shared_ptr<MediaDevice> media,
const SimplePipelineInfo &info,
DeviceEnumerator *enumerator);
std::vector<MediaEntity *> locateSensors(MediaDevice *media);
@@ -447,7 +448,7 @@ private:
std::map<const MediaEntity *, EntityData> entities_;
MediaDevice *converter_;
std::shared_ptr<MediaDevice> converter_;
bool swIspEnabled_;
};
@@ -1742,7 +1743,7 @@ int SimplePipelineHandler::resetRoutingTable(V4L2Subdevice *subdev)
return 0;
}
bool SimplePipelineHandler::matchDevice(MediaDevice *media,
bool SimplePipelineHandler::matchDevice(std::shared_ptr<MediaDevice> media,
const SimplePipelineInfo &info,
DeviceEnumerator *enumerator)
{
@@ -1773,7 +1774,7 @@ bool SimplePipelineHandler::matchDevice(MediaDevice *media,
}
/* Locate the sensors. */
std::vector<MediaEntity *> sensors = locateSensors(media);
std::vector<MediaEntity *> sensors = locateSensors(media.get());
if (sensors.empty()) {
LOG(SimplePipeline, Info) << "No sensor found for " << media->deviceNode();
return false;
@@ -1891,7 +1892,7 @@ bool SimplePipelineHandler::matchDevice(MediaDevice *media,
bool SimplePipelineHandler::match(DeviceEnumerator *enumerator)
{
MediaDevice *media;
std::shared_ptr<MediaDevice> media;
for (const SimplePipelineInfo &inf : supportedDevices) {
DeviceMatch dm(inf.driver);
src/libcamera/pipeline/uvcvideo/uvcvideo.cpp
+3 -3
View File
@@ -46,7 +46,7 @@ public:
{
}
int init(MediaDevice *media);
int init(std::shared_ptr<MediaDevice> media);
void addControl(uint32_t cid, const ControlInfo &v4l2info,
ControlInfoMap::Map *ctrls);
void imageBufferReady(FrameBuffer *buffer);
@@ -469,7 +469,7 @@ int PipelineHandlerUVC::queueRequestDevice(Camera *camera, Request *request)
bool PipelineHandlerUVC::match(DeviceEnumerator *enumerator)
{
MediaDevice *media;
std::shared_ptr<MediaDevice> media;
DeviceMatch dm("uvcvideo");
media = acquireMediaDevice(enumerator, dm);
@@ -511,7 +511,7 @@ void PipelineHandlerUVC::releaseDevice(Camera *camera)
data->video_->close();
}
int UVCCameraData::init(MediaDevice *media)
int UVCCameraData::init(std::shared_ptr<MediaDevice> media)
{
int ret;
src/libcamera/pipeline/vimc/vimc.cpp
+7 -7
View File
@@ -49,7 +49,7 @@ LOG_DEFINE_CATEGORY(VIMC)
class VimcCameraData : public Camera::Private
{
public:
VimcCameraData(PipelineHandler *pipe, MediaDevice *media)
VimcCameraData(PipelineHandler *pipe, std::shared_ptr<MediaDevice> media)
: Camera::Private(pipe), media_(media)
{
}
@@ -59,7 +59,7 @@ public:
void imageBufferReady(FrameBuffer *buffer);
void paramsComputed(unsigned int id, const Flags<ipa::vimc::TestFlag> flags);
MediaDevice *media_;
std::shared_ptr<MediaDevice> media_;
std::unique_ptr<CameraSensor> sensor_;
std::unique_ptr<V4L2Subdevice> debayer_;
std::unique_ptr<V4L2Subdevice> scaler_;
@@ -479,7 +479,7 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)
dm.add("RGB/YUV Input");
dm.add("Scaler");
MediaDevice *media = acquireMediaDevice(enumerator, dm);
std::shared_ptr<MediaDevice> media = acquireMediaDevice(enumerator, dm);
if (!media)
return false;
@@ -539,21 +539,21 @@ int VimcCameraData::init()
if (!sensor_)
return -ENODEV;
debayer_ = V4L2Subdevice::fromEntityName(media_, "Debayer B");
debayer_ = V4L2Subdevice::fromEntityName(media_.get(), "Debayer B");
if (debayer_->open())
return -ENODEV;
scaler_ = V4L2Subdevice::fromEntityName(media_, "Scaler");
scaler_ = V4L2Subdevice::fromEntityName(media_.get(), "Scaler");
if (scaler_->open())
return -ENODEV;
video_ = V4L2VideoDevice::fromEntityName(media_, "RGB/YUV Capture");
video_ = V4L2VideoDevice::fromEntityName(media_.get(), "RGB/YUV Capture");
if (video_->open())
return -ENODEV;
video_->bufferReady.connect(this, &VimcCameraData::imageBufferReady);
raw_ = V4L2VideoDevice::fromEntityName(media_, "Raw Capture 1");
raw_ = V4L2VideoDevice::fromEntityName(media_.get(), "Raw Capture 1");
if (raw_->open())
return -ENODEV;
src/libcamera/pipeline_handler.cpp
+8 -6
View File
@@ -129,10 +129,12 @@ PipelineHandler::~PipelineHandler()
*
* \context This function shall be called from the CameraManager thread.
*
* \return A pointer to the matching MediaDevice, or nullptr if no match is found
* \return A shared pointer to the matching MediaDevice, or nullptr if no match
* is found
*/
MediaDevice *PipelineHandler::acquireMediaDevice(DeviceEnumerator *enumerator,
const DeviceMatch &dm)
std::shared_ptr<MediaDevice>
PipelineHandler::acquireMediaDevice(DeviceEnumerator *enumerator,
const DeviceMatch &dm)
{
std::shared_ptr<MediaDevice> media = enumerator->search(dm);
if (!media)
@@ -143,7 +145,7 @@ MediaDevice *PipelineHandler::acquireMediaDevice(DeviceEnumerator *enumerator,
mediaDevices_.push_back(media);
return media.get();
return media;
}
/**
@@ -734,7 +736,7 @@ void PipelineHandler::registerCamera(std::shared_ptr<Camera> camera)
* handler gets notified and automatically disconnects all the cameras it has
* registered without requiring any manual intervention.
*/
void PipelineHandler::hotplugMediaDevice(MediaDevice *media)
void PipelineHandler::hotplugMediaDevice(std::shared_ptr<MediaDevice> media)
{
media->disconnected.connect(this, [this, media] { mediaDeviceDisconnected(media); });
}
@@ -742,7 +744,7 @@ void PipelineHandler::hotplugMediaDevice(MediaDevice *media)
/**
* \brief Slot for the MediaDevice disconnected signal
*/
void PipelineHandler::mediaDeviceDisconnected(MediaDevice *media)
void PipelineHandler::mediaDeviceDisconnected(std::shared_ptr<MediaDevice> media)
{
media->disconnected.disconnect(this);