From: Hans Verkuil <hans.verk...@cisco.com>
Signed-off-by: Hans Verkuil <hans.verk...@cisco.com>
---
Documentation/DocBook/media/v4l/controls.xml | 58 ++++++++++++++++++++++++++
1 files changed, 58 insertions(+), 0 deletions(-)
diff --git a/Documentation/DocBook/media/v4l/controls.xml
b/Documentation/DocBook/media/v4l/controls.xml
index 3bc5ee8..411fba2 100644
--- a/Documentation/DocBook/media/v4l/controls.xml
+++ b/Documentation/DocBook/media/v4l/controls.xml
@@ -797,6 +797,13 @@ in the kernel sources in the file
<filename>Documentation/video4linux/cx2341x/RE
</entrytbl>
</row>
<row><entry></entry></row>
+ <row id="v4l2-mpeg-stream-dec-pts">
+ <entry
spanname="id"><constant>V4L2_CID_MPEG_STREAM_DEC_PTS</constant> </entry>
+ <entry>integer64</entry>
+ </row><row><entry spanname="descr">This read-only control returns
the
+Program Time Stamp of the frame that is currently displayed (decoded).</entry>
+ </row>
+ <row><entry></entry></row>
<row id="v4l2-mpeg-audio-sampling-freq">
<entry
spanname="id"><constant>V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ</constant> </entry>
<entry>enum v4l2_mpeg_audio_sampling_freq</entry>
@@ -1273,6 +1280,49 @@ produce a slight hiss, but in the encoder itself,
guaranteeing a fixed
and reproducible audio bitstream. 0 = unmuted, 1 = muted.</entry>
</row>
<row><entry></entry></row>
+ <row id="v4l2-mpeg-audio-dec-playback">
+ <entry
spanname="id"><constant>V4L2_CID_MPEG_AUDIO_DEC_PLAYBACK</constant> </entry>
+ <entry>enum v4l2_mpeg_audio_dec_playback</entry>
+ </row><row><entry spanname="descr">Determines how monolingual
audio should be played back.
+Possible values are:</entry>
+ </row>
+ <row>
+ <entrytbl spanname="descr" cols="2">
+ <tbody valign="top">
+ <row>
+
<entry><constant>V4L2_MPEG_AUDIO_DEC_PLAYBACK_AUTO</constant> </entry>
+ <entry>Automatically determines the best playback
mode.</entry>
+ </row>
+ <row>
+
<entry><constant>V4L2_MPEG_AUDIO_DEC_PLAYBACK_STEREO</constant> </entry>
+ <entry>Stereo playback.</entry>
+ </row>
+ <row>
+
<entry><constant>V4L2_MPEG_AUDIO_DEC_PLAYBACK_LEFT</constant> </entry>
+ <entry>Left channel playback.</entry>
+ </row>
+ <row>
+
<entry><constant>V4L2_MPEG_AUDIO_DEC_PLAYBACK_RIGHT</constant> </entry>
+ <entry>Right channel playback.</entry>
+ </row>
+ <row>
+
<entry><constant>V4L2_MPEG_AUDIO_DEC_PLAYBACK_MONO</constant> </entry>
+ <entry>Mono playback.</entry>
+ </row>
+ <row>
+
<entry><constant>V4L2_MPEG_AUDIO_DEC_PLAYBACK_SWAPPED_STEREO</constant> </entry>
+ <entry>Stereo playback with swapped left and right
channels.</entry>
+ </row>
+ </tbody>
+ </entrytbl>
+ </row>
+ <row><entry></entry></row>
+ <row id="v4l2-mpeg-audio-dec-multilingual-playback">
+ <entry
spanname="id"><constant>V4L2_CID_MPEG_AUDIO_DEC_MULTILINGUAL_PLAYBACK</constant> </entry>
+ <entry>enum v4l2_mpeg_audio_dec_playback</entry>
+ </row><row><entry spanname="descr">Determines how multilingual
audio should be played back.</entry>
+ </row>
+ <row><entry></entry></row>
<row id="v4l2-mpeg-video-encoding">
<entry
spanname="id"><constant>V4L2_CID_MPEG_VIDEO_ENCODING</constant> </entry>
<entry>enum v4l2_mpeg_video_encoding</entry>
@@ -1434,6 +1484,14 @@ of the video. The supplied 32-bit integer is interpreted
as follows (bit
</tbody>
</entrytbl>
</row>
+ <row><entry></entry></row>
+ <row id="v4l2-mpeg-video-dec-frame">
+ <entry
spanname="id"><constant>V4L2_CID_MPEG_VIDEO_DEC_FRAME</constant> </entry>
+ <entry>integer64</entry>
+ </row><row><entry spanname="descr">This read-only control returns
the
+frame counter of the frame that is currently displayed (decoded). This value
is reset to 0 whenever
+the decoder is started.</entry>
+ </row>
<row><entry></entry></row>
--
1.7.7.3
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
