diff options
author | Sakari Ailus <sakari.ailus@iki.fi> | 2013-10-13 06:58:43 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-12-04 11:59:20 -0500 |
commit | d0700c5175b0684c9935ca57deae733c2758667c (patch) | |
tree | 50e71c8af152a6aae9835ef4f557623dc3184e4d | |
parent | 16422f552d4e70fa0953917e05f72033d629bdb8 (diff) |
[media] media: Add pad flag MEDIA_PAD_FL_MUST_CONNECT
Pads that set this flag must be connected by an active link for the entity
to stream.
Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | Documentation/DocBook/media/v4l/media-ioc-enum-links.xml | 9 | ||||
-rw-r--r-- | include/uapi/linux/media.h | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/DocBook/media/v4l/media-ioc-enum-links.xml b/Documentation/DocBook/media/v4l/media-ioc-enum-links.xml index 355df43badc5..cf8548556c7d 100644 --- a/Documentation/DocBook/media/v4l/media-ioc-enum-links.xml +++ b/Documentation/DocBook/media/v4l/media-ioc-enum-links.xml | |||
@@ -134,6 +134,15 @@ | |||
134 | <entry>Output pad, relative to the entity. Output pads source data | 134 | <entry>Output pad, relative to the entity. Output pads source data |
135 | and are origins of links.</entry> | 135 | and are origins of links.</entry> |
136 | </row> | 136 | </row> |
137 | <row> | ||
138 | <entry><constant>MEDIA_PAD_FL_MUST_CONNECT</constant></entry> | ||
139 | <entry>If this flag is set and the pad is linked to any other | ||
140 | pad, then at least one of those links must be enabled for the | ||
141 | entity to be able to stream. There could be temporary reasons | ||
142 | (e.g. device configuration dependent) for the pad to need | ||
143 | enabled links even when this flag isn't set; the absence of the | ||
144 | flag doesn't imply there is none.</entry> | ||
145 | </row> | ||
137 | </tbody> | 146 | </tbody> |
138 | </tgroup> | 147 | </tgroup> |
139 | </table> | 148 | </table> |
diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h index ed49574ad757..d847c760e8f0 100644 --- a/include/uapi/linux/media.h +++ b/include/uapi/linux/media.h | |||
@@ -98,6 +98,7 @@ struct media_entity_desc { | |||
98 | 98 | ||
99 | #define MEDIA_PAD_FL_SINK (1 << 0) | 99 | #define MEDIA_PAD_FL_SINK (1 << 0) |
100 | #define MEDIA_PAD_FL_SOURCE (1 << 1) | 100 | #define MEDIA_PAD_FL_SOURCE (1 << 1) |
101 | #define MEDIA_PAD_FL_MUST_CONNECT (1 << 2) | ||
101 | 102 | ||
102 | struct media_pad_desc { | 103 | struct media_pad_desc { |
103 | __u32 entity; /* entity ID */ | 104 | __u32 entity; /* entity ID */ |