diff mbox

[v2.1,1/4] media: Add pad flag MEDIA_PAD_FL_MUST_CONNECT

Message ID 1381661924-26365-1-git-send-email-sakari.ailus@iki.fi (mailing list archive)
State New, archived
Headers show

Commit Message

Sakari Ailus Oct. 13, 2013, 10:58 a.m. UTC 
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>
---
 Documentation/DocBook/media/v4l/media-ioc-enum-links.xml |   10 ++++++++++
 include/uapi/linux/media.h                               |    1 +
 2 files changed, 11 insertions(+)

Comments

Sakari Ailus Oct. 13, 2013, 11:03 a.m. UTC | #1 
On Sun, Oct 13, 2013 at 01:58:43PM +0300, Sakari Ailus wrote:
> Pads that set this flag must be connected by an active link for the entity
> to stream.

Oh --- btw. what has changed since v2:

- Rmoved the last sentence of MEDIA_PAD_FL_MUST_CONNECT documentation. The
  sentence was about the flag having no effect on pads w/o links.

- Change Sylwester's e-mail address
Laurent Pinchart Oct. 15, 2013, 3:22 p.m. UTC | #2 
Hi Sakari,

On Sunday 13 October 2013 14:03:13 Sakari Ailus wrote:
> On Sun, Oct 13, 2013 at 01:58:43PM +0300, Sakari Ailus wrote:
> > Pads that set this flag must be connected by an active link for the entity
> > to stream.
> 
> Oh --- btw. what has changed since v2:
> 
> - Rmoved the last sentence of MEDIA_PAD_FL_MUST_CONNECT documentation. The
>   sentence was about the flag having no effect on pads w/o links.

That change is part of 2/4. I believe that's a mistake.

> - Change Sylwester's e-mail address
Sakari Ailus Oct. 15, 2013, 9:41 p.m. UTC | #3 
On Tue, Oct 15, 2013 at 05:22:50PM +0200, Laurent Pinchart wrote:
> Hi Sakari,
> 
> On Sunday 13 October 2013 14:03:13 Sakari Ailus wrote:
> > On Sun, Oct 13, 2013 at 01:58:43PM +0300, Sakari Ailus wrote:
> > > Pads that set this flag must be connected by an active link for the entity
> > > to stream.
> > 
> > Oh --- btw. what has changed since v2:
> > 
> > - Rmoved the last sentence of MEDIA_PAD_FL_MUST_CONNECT documentation. The
> >   sentence was about the flag having no effect on pads w/o links.
> 
> That change is part of 2/4. I believe that's a mistake.

Indeed. I'll resend in a moment.
diff mbox

Patch

diff --git a/Documentation/DocBook/media/v4l/media-ioc-enum-links.xml b/Documentation/DocBook/media/v4l/media-ioc-enum-links.xml
index 355df43..e357dc9 100644
--- a/Documentation/DocBook/media/v4l/media-ioc-enum-links.xml
+++ b/Documentation/DocBook/media/v4l/media-ioc-enum-links.xml
@@ -134,6 +134,16 @@ 
 	    <entry>Output pad, relative to the entity. Output pads source data
 	    and are origins of links.</entry>
 	  </row>
+	  <row>
+	    <entry><constant>MEDIA_PAD_FL_MUST_CONNECT</constant></entry>
+	    <entry>If this flag is set and the pad is linked to any other
+	    pad, then at least one of those links must be enabled for the
+	    entity to be able to stream. There could be temporary reasons
+	    (e.g. device configuration dependent) for the pad to need
+	    enabled links even when this flag isn't set; the absence of the
+	    flag doesn't imply there is none. The flag has no effect on pads
+	    without connected links.</entry>
+	  </row>
 	</tbody>
       </tgroup>
     </table>
diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h
index ed49574..d847c76 100644
--- a/include/uapi/linux/media.h
+++ b/include/uapi/linux/media.h
@@ -98,6 +98,7 @@  struct media_entity_desc {
 
 #define MEDIA_PAD_FL_SINK		(1 << 0)
 #define MEDIA_PAD_FL_SOURCE		(1 << 1)
+#define MEDIA_PAD_FL_MUST_CONNECT	(1 << 2)
 
 struct media_pad_desc {
 	__u32 entity;		/* entity ID */