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

libcamera: pipeline: simple: Rename Entity::link to sourceLink

Browse Source 
The Entity::link member has an ambiguous name. Rename it to sourceLink
to clarify that it stores the link on the source pad.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Laurent Pinchart
2021-08-30 02:21:30 +03:00
parent 94a1afd0fc
commit 22b61a4f30
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/libcamera/pipeline/simple/simple.cpp
View File

@@ -202,10 +202,10 @@ public:
*/
const MediaPad *source;
/*
* The link to the downstream entity, null for the video node at
* the end of the pipeline.
* The link on the source pad, to the downstream entity, null
* for the video node at the end of the pipeline.
*/
MediaLink *link;
MediaLink *sourceLink;
};
struct Configuration {
@@ -537,13 +537,13 @@ int SimpleCameraData::setupLinks()
* want to enable) before enabling the pipeline link.
*/
for (SimpleCameraData::Entity &e : entities_) {
if (!e.link)
if (!e.sourceLink)
break;
MediaEntity *remote = e.link->sink()->entity();
MediaEntity *remote = e.sourceLink->sink()->entity();
for (MediaPad *pad : remote->pads()) {
for (MediaLink *link : pad->links()) {
if (link == e.link)
if (link == e.sourceLink)
continue;
if ((link->flags() & MEDIA_LNK_FL_ENABLED) &&
@@ -555,8 +555,8 @@ int SimpleCameraData::setupLinks()
}
}
if (!(e.link->flags() & MEDIA_LNK_FL_ENABLED)) {
ret = e.link->setEnabled(true);
if (!(e.sourceLink->flags() & MEDIA_LNK_FL_ENABLED)) {
ret = e.sourceLink->setEnabled(true);
if (ret < 0)
return ret;
}
@@ -580,10 +580,10 @@ int SimpleCameraData::setupFormats(V4L2SubdeviceFormat *format,
return ret;
for (const Entity &e : entities_) {
if (!e.link)
if (!e.sourceLink)
break;
MediaLink *link = e.link;
MediaLink *link = e.sourceLink;
MediaPad *source = link->source();
MediaPad *sink = link->sink();