2 files changed, 93 insertions, 84 deletions

diff --git a/Documentation/DocBook/media/Makefile b/Documentation/DocBook/media/Makefile
index a914eb094cd9..1e909c28299e 100644
--- a/Documentation/DocBook/media/Makefile
+++ b/Documentation/DocBook/media/Makefile
@@ -146,7 +146,7 @@ DVB_DOCUMENTED = \
         -e "s,\(define\s\+\)\(DTV_[A-Z0-9_]\+\)\(\s\+[0-9]\+\),\1\<link linkend=\"\2\">\2\<\/link\>\3,g" \
         -e "s,<link\s\+linkend=\".*\">\(DTV_IOCTL_MAX_MSGS\|dtv_cmds_h\|__.*_old\)<\/link>,\1,g" \
         -e ":a;s/\(linkend=\".*\)_\(.*\">\)/\1-\2/;ta" \
-        -e "s,\(audio-mixer\|audio-karaoke\|audio-status\|ca-slot-info\|ca-descr-info\|ca-caps\|ca-msg\|ca-descr\|ca-pid\|dmx-filter\|dmx-caps\)-t,\1,g" \
+        -e "s,\(audio-mixer\|audio-karaoke\|audio-status\|ca-slot-info\|ca-descr-info\|ca-caps\|ca-msg\|ca-descr\|ca-pid\|dmx-filter\|dmx-caps\|video-system\|video-highlight\|video-spu\|video-spu-palette\|video-navi-pack\)-t,\1,g" \
         -e "s,DTV-ISDBT-LAYER[A-C],DTV-ISDBT-LAYER,g" \
         -e "s,\(define\s\+\)\([A-Z0-9_]\+\)\(\s\+_IO\),\1\<link linkend=\"\2\">\2\<\/link\>\3,g" \
         -e "s,<link\s\+linkend=\".*\">\(__.*_OLD\)<\/link>,\1,g" \
diff --git a/Documentation/DocBook/media/dvb/video.xml b/Documentation/DocBook/media/dvb/video.xml
index 7bb287e67c8e..ef30f69edf22 100644
--- a/Documentation/DocBook/media/dvb/video.xml
+++ b/Documentation/DocBook/media/dvb/video.xml
@@ -18,15 +18,16 @@ supported on some MPEG decoders made for DVD playback.
 <section id="video_types">
 <title>Video Data Types</title>
 
-<section id="video_format_t">
+<section id="video-format-t">
 <title>video_format_t</title>
 <para>The <emphasis role="tt">video_format_t</emphasis> data type defined by
 </para>
 <programlisting>
- typedef enum {
-         VIDEO_FORMAT_4_3,
-         VIDEO_FORMAT_16_9
- } video_format_t;
+typedef enum {
+        VIDEO_FORMAT_4_3,     /&#x22C6; Select 4:3 format &#x22C6;/
+        VIDEO_FORMAT_16_9,    /&#x22C6; Select 16:9 format. &#x22C6;/
+        VIDEO_FORMAT_221_1    /&#x22C6; 2.21:1 &#x22C6;/
+} video_format_t;
 </programlisting>
 <para>is used in the VIDEO_SET_FORMAT function (??) to tell the driver which aspect ratio
 the output hardware (e.g. TV) has. It is also used in the data structures video_status
@@ -36,34 +37,36 @@ stream.
 </para>
 </section>
 
-<section id="video_display_format_t">
+<section id="video-display-format-t">
 <title>video_display_format_t</title>
 <para>In case the display format of the video stream and of the display hardware differ the
 application has to specify how to handle the cropping of the picture. This can be done using
 the VIDEO_SET_DISPLAY_FORMAT call (??) which accepts
 </para>
 <programlisting>
- typedef enum {
-         VIDEO_PAN_SCAN,
-         VIDEO_LETTER_BOX,
-         VIDEO_CENTER_CUT_OUT
- } video_display_format_t;
+typedef enum {
+        VIDEO_PAN_SCAN,       /&#x22C6; use pan and scan format &#x22C6;/
+        VIDEO_LETTER_BOX,     /&#x22C6; use letterbox format &#x22C6;/
+        VIDEO_CENTER_CUT_OUT  /&#x22C6; use center cut out format &#x22C6;/
+} video_displayformat_t;
 </programlisting>
 <para>as argument.
 </para>
 </section>
 
-<section id="video_stream_source">
+<section id="video-stream-source-t">
 <title>video stream source</title>
 <para>The video stream source is set through the VIDEO_SELECT_SOURCE call and can take
 the following values, depending on whether we are replaying from an internal (demuxer) or
 external (user write) source.
 </para>
 <programlisting>
- typedef enum {
-         VIDEO_SOURCE_DEMUX,
-         VIDEO_SOURCE_MEMORY
- } video_stream_source_t;
+typedef enum {
+        VIDEO_SOURCE_DEMUX, /&#x22C6; Select the demux as the main source &#x22C6;/
+        VIDEO_SOURCE_MEMORY /&#x22C6; If this source is selected, the stream
+                               comes from the user through the write
+                               system call &#x22C6;/
+} video_stream_source_t;
 </programlisting>
 <para>VIDEO_SOURCE_DEMUX selects the demultiplexer (fed either by the frontend or the
 DVR device) as the source of the video stream. If VIDEO_SOURCE_MEMORY
@@ -72,49 +75,55 @@ call.
 </para>
 </section>
 
-<section id="video_play_state">
+<section id="video-play-state-t">
 <title>video play state</title>
 <para>The following values can be returned by the VIDEO_GET_STATUS call representing the
 state of video playback.
 </para>
 <programlisting>
- typedef enum {
-         VIDEO_STOPPED,
-         VIDEO_PLAYING,
-         VIDEO_FREEZED
- } video_play_state_t;
+typedef enum {
+        VIDEO_STOPPED, /&#x22C6; Video is stopped &#x22C6;/
+        VIDEO_PLAYING, /&#x22C6; Video is currently playing &#x22C6;/
+        VIDEO_FREEZED  /&#x22C6; Video is freezed &#x22C6;/
+} video_play_state_t;
 </programlisting>
 </section>
 
-<section id="video_event">
+<section id="video-event">
 <title>struct video_event</title>
 <para>The following is the structure of a video event as it is returned by the VIDEO_GET_EVENT
 call.
 </para>
 <programlisting>
- struct video_event {
-         int32_t type;
-         time_t timestamp;
-         union {
-                 video_format_t video_format;
-         } u;
- };
+struct video_event {
+        __s32 type;
+#define VIDEO_EVENT_SIZE_CHANGED        1
+#define VIDEO_EVENT_FRAME_RATE_CHANGED  2
+#define VIDEO_EVENT_DECODER_STOPPED     3
+#define VIDEO_EVENT_VSYNC               4
+        __kernel_time_t timestamp;
+        union {
+                video_size_t size;
+                unsigned int frame_rate;        /&#x22C6; in frames per 1000sec &#x22C6;/
+                unsigned char vsync_field;      /&#x22C6; unknown/odd/even/progressive &#x22C6;/
+        } u;
+};
 </programlisting>
 </section>
 
-<section id="video_status">
+<section id="video-status">
 <title>struct video_status</title>
 <para>The VIDEO_GET_STATUS call returns the following structure informing about various
 states of the playback operation.
 </para>
 <programlisting>
- struct video_status {
-         boolean video_blank;
-         video_play_state_t play_state;
-         video_stream_source_t stream_source;
-         video_format_t video_format;
-         video_displayformat_t display_format;
- };
+struct video_status {
+        int                   video_blank;   /&#x22C6; blank video on freeze? &#x22C6;/
+        video_play_state_t    play_state;    /&#x22C6; current state of playback &#x22C6;/
+        video_stream_source_t stream_source; /&#x22C6; current source (demux/memory) &#x22C6;/
+        video_format_t        video_format;  /&#x22C6; current aspect ratio of stream &#x22C6;/
+        video_displayformat_t display_format;/&#x22C6; selected cropping mode &#x22C6;/
+};
 </programlisting>