summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-08-30 02:21:30 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-12-29 21:35:16 +0200
commit22b61a4f3054089090f62cb8acaa6b96aae79903 (patch)
tree0989f81bcfdf088535aa18c7ab9b60df7e535c65
parent94a1afd0fc27216d6eca9506d8794c7a907f8121 (diff)
libcamera: pipeline: simple: Rename Entity::link to sourceLink
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>
-rw-r--r--src/libcamera/pipeline/simple/simple.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp
index 8aa36306..ece821bf 100644
--- a/src/libcamera/pipeline/simple/simple.cpp
+++ b/src/libcamera/pipeline/simple/simple.cpp
@@ -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();