The patch number 14731 was added via Douglas Schilling Landgraf
<[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <[email protected]>
------
From: Hans Verkuil <[email protected]>
v4l spec: document new events
Priority: normal
Signed-off-by: Hans Verkuil <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Douglas Schilling Landgraf <[email protected]>
---
linux/Documentation/DocBook/media-entities.tmpl | 2
linux/Documentation/DocBook/v4l/vidioc-dqevent.xml | 9 ++-
linux/Documentation/DocBook/v4l/vidioc-subscribe-event.xml | 29 ++++++++++
3 files changed, 39 insertions(+), 1 deletion(-)
diff -r 8c4848794ab1 -r 13ff6cfe9af9
linux/Documentation/DocBook/media-entities.tmpl
--- a/linux/Documentation/DocBook/media-entities.tmpl Tue May 11 02:54:55
2010 -0300
+++ b/linux/Documentation/DocBook/media-entities.tmpl Tue May 11 02:55:54
2010 -0300
@@ -85,6 +85,7 @@
<!ENTITY VIDIOC-TRY-ENCODER-CMD "<link
linkend='vidioc-encoder-cmd'><constant>VIDIOC_TRY_ENCODER_CMD</constant></link>">
<!ENTITY VIDIOC-TRY-EXT-CTRLS "<link
linkend='vidioc-g-ext-ctrls'><constant>VIDIOC_TRY_EXT_CTRLS</constant></link>">
<!ENTITY VIDIOC-TRY-FMT "<link
linkend='vidioc-g-fmt'><constant>VIDIOC_TRY_FMT</constant></link>">
+<!ENTITY VIDIOC-UNSUBSCRIBE-EVENT "<link
linkend='vidioc-subscribe-event'><constant>VIDIOC_UNSUBSCRIBE_EVENT</constant></link>">
<!-- Types -->
<!ENTITY v4l2-std-id "<link linkend='v4l2-std-id'>v4l2_std_id</link>">
@@ -145,6 +146,7 @@
<!ENTITY v4l2-encoder-cmd "struct <link
linkend='v4l2-encoder-cmd'>v4l2_encoder_cmd</link>">
<!ENTITY v4l2-event "struct <link linkend='v4l2-event'>v4l2_event</link>">
<!ENTITY v4l2-event-subscription "struct <link
linkend='v4l2-event-subscription'>v4l2_event_subscription</link>">
+<!ENTITY v4l2-event-vsync "struct <link
linkend='v4l2-event-vsync'>v4l2_event_vsync</link>">
<!ENTITY v4l2-ext-control "struct <link
linkend='v4l2-ext-control'>v4l2_ext_control</link>">
<!ENTITY v4l2-ext-controls "struct <link
linkend='v4l2-ext-controls'>v4l2_ext_controls</link>">
<!ENTITY v4l2-fmtdesc "struct <link
linkend='v4l2-fmtdesc'>v4l2_fmtdesc</link>">
diff -r 8c4848794ab1 -r 13ff6cfe9af9
linux/Documentation/DocBook/v4l/vidioc-dqevent.xml
--- a/linux/Documentation/DocBook/v4l/vidioc-dqevent.xml Tue May 11
02:54:55 2010 -0300
+++ b/linux/Documentation/DocBook/v4l/vidioc-dqevent.xml Tue May 11
02:55:54 2010 -0300
@@ -74,6 +74,13 @@
</row>
<row>
<entry></entry>
+ <entry>&v4l2-event-vsync;</entry>
+ <entry><structfield>vsync</structfield></entry>
+ <entry>Event data for event V4L2_EVENT_VSYNC.
+ </entry>
+ </row>
+ <row>
+ <entry></entry>
<entry>__u8</entry>
<entry><structfield>data</structfield>[64]</entry>
<entry>Event data. Defined by the event type. The union
@@ -97,7 +104,7 @@
</entry>
</row>
<row>
- <entry>struct timeval</entry>
+ <entry>struct timespec</entry>
<entry><structfield>timestamp</structfield></entry>
<entry></entry>
<entry>Event timestamp.</entry>
diff -r 8c4848794ab1 -r 13ff6cfe9af9
linux/Documentation/DocBook/v4l/vidioc-subscribe-event.xml
--- a/linux/Documentation/DocBook/v4l/vidioc-subscribe-event.xml Tue May
11 02:54:55 2010 -0300
+++ b/linux/Documentation/DocBook/v4l/vidioc-subscribe-event.xml Tue May
11 02:55:54 2010 -0300
@@ -85,6 +85,21 @@
</entry>
</row>
<row>
+ <entry><constant>V4L2_EVENT_VSYNC</constant></entry>
+ <entry>1</entry>
+ <entry>This event is triggered on the vertical sync.
+ This event has &v4l2-event-vsync; associated with it.
+ </entry>
+ </row>
+ <row>
+ <entry><constant>V4L2_EVENT_EOS</constant></entry>
+ <entry>2</entry>
+ <entry>This event is triggered when the end of a stream is reached.
+ This is typically used with MPEG decoders to report to the
application
+ when the last of the MPEG stream has been decoded.
+ </entry>
+ </row>
+ <row>
<entry><constant>V4L2_EVENT_PRIVATE_START</constant></entry>
<entry>0x08000000</entry>
<entry>Base event number for driver-private events.</entry>
@@ -93,6 +108,20 @@
</tgroup>
</table>
+ <table frame="none" pgwide="1" id="v4l2-event-vsync">
+ <title>struct <structname>v4l2_event_vsync</structname></title>
+ <tgroup cols="3">
+ &cs-str;
+ <tbody valign="top">
+ <row>
+ <entry>__u8</entry>
+ <entry><structfield>field</structfield></entry>
+ <entry>The upcoming field. See &v4l2-field;.</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
</refsect1>
</refentry>
<!--
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/13ff6cfe9af9b44cc4549ad6153696db8f4ade91
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
