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/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);