NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: pipeline: simple: Store video node entity in camera data

Browse source 
Store the entity corresponding to the video node at the end of the
pipeline in the SimpleCameraData::entities_ list. This requires special
handling of the video node in the loops that iterate over all entities,
but will be useful to implement mutually exclusive access to entities
for concurrent camera usage.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: Martin Kepplinger <martin.kepplinger@puri.sm>
This commit is contained in:
Laurent Pinchart 2021-07-03 18:33:55 +03:00
parent 0e8d6903b2
commit 41a8f8a9cc
1 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/libcamera/pipeline/simple/simple.cpp
View file

@ -196,8 +196,13 @@ public:
}; };
std::vector<Stream> streams_; std::vector<Stream> streams_;
std::unique_ptr<CameraSensor> sensor_;
/*
* All entities in the pipeline, from the camera sensor to the video
* node.
*/
std::list<Entity> entities_; std::list<Entity> entities_;
std::unique_ptr<CameraSensor> sensor_;
V4L2VideoDevice *video_; V4L2VideoDevice *video_;
std::vector<Configuration> configs_; std::vector<Configuration> configs_;
@ -310,12 +315,11 @@ SimpleCameraData::SimpleCameraData(SimplePipelineHandler *pipe,
std::unordered_map<MediaEntity *, Entity> parents; std::unordered_map<MediaEntity *, Entity> parents;
MediaEntity *entity = nullptr; MediaEntity *entity = nullptr;
MediaEntity *video = nullptr; MediaEntity *video = nullptr;
MediaPad *sinkPad;
queue.push({ sensor, nullptr }); queue.push({ sensor, nullptr });
while (!queue.empty()) { while (!queue.empty()) {
MediaPad *sinkPad;
std::tie(entity, sinkPad) = queue.front(); std::tie(entity, sinkPad) = queue.front();
queue.pop(); queue.pop();
@ -348,8 +352,11 @@ SimpleCameraData::SimpleCameraData(SimplePipelineHandler *pipe,
/* /*
* With the parents, we can follow back our way from the capture device * With the parents, we can follow back our way from the capture device
* to the sensor. * to the sensor. Store all the entities in the pipeline, from the
* camera sensor to the video node, in entities_.
*/ */
entities_.push_front({ entity, sinkPad, nullptr, nullptr });
for (auto it = parents.find(entity); it != parents.end(); for (auto it = parents.find(entity); it != parents.end();
it = parents.find(entity)) { it = parents.find(entity)) {
const Entity &e = it->second; const Entity &e = it->second;
@ -490,6 +497,9 @@ int SimpleCameraData::setupLinks()
* want to enable) before enabling the pipeline link. * want to enable) before enabling the pipeline link.
*/ */
for (SimpleCameraData::Entity &e : entities_) { for (SimpleCameraData::Entity &e : entities_) {
if (!e.link)
break;
MediaEntity *remote = e.link->sink()->entity(); MediaEntity *remote = e.link->sink()->entity();
for (MediaPad *pad : remote->pads()) { for (MediaPad *pad : remote->pads()) {
for (MediaLink *link : pad->links()) { for (MediaLink *link : pad->links()) {
@ -530,6 +540,9 @@ int SimpleCameraData::setupFormats(V4L2SubdeviceFormat *format,
return ret; return ret;
for (const Entity &e : entities_) { for (const Entity &e : entities_) {
if (!e.link)
break;
MediaLink *link = e.link; MediaLink *link = e.link;
MediaPad *source = link->source(); MediaPad *source = link->source();
MediaPad *sink = link->sink(); MediaPad *sink = link->sink();
@ -1055,8 +1068,14 @@ bool SimplePipelineHandler::match(DeviceEnumerator *enumerator)
if (entities.empty()) if (entities.empty())
return false; return false;
/* Create and open V4L2Subdev instances for all the entities. */ /*
* Create and open V4L2Subdevice instances for all entities
* corresponding to a V4L2 subdevice.
*/
for (MediaEntity *entity : entities) { for (MediaEntity *entity : entities) {
if (entity->type() != MediaEntity::Type::V4L2Subdevice)
continue;
auto elem = subdevs_.emplace(std::piecewise_construct, auto elem = subdevs_.emplace(std::piecewise_construct,
std::forward_as_tuple(entity), std::forward_as_tuple(entity),
std::forward_as_tuple(entity)); std::forward_as_tuple(entity));