diff options
author | Sakari Ailus <sakari.ailus@iki.fi> | 2012-09-02 02:45:45 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-09-26 08:22:48 -0400 |
commit | 8fd207a1f7b65bee0a9b7948cb310d96fb11cc9e (patch) | |
tree | c4dbc6f4d5267416fd6735e1500125bd79d10d47 /Documentation | |
parent | 86bf66e86efedc383dbd7357be88c5c02c763108 (diff) |
[media] v4l: Remove experimental tag from certain API elements
Remove experimantal tag from the following API elements:
V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY buffer type.
V4L2_CAP_VIDEO_OUTPUT_OVERLAY capability flag.
VIDIOC_ENUM_FRAMESIZES IOCTL.
VIDIOC_ENUM_FRAMEINTERVALS IOCTL.
VIDIOC_G_ENC_INDEX IOCTL.
VIDIOC_ENCODER_CMD and VIDIOC_TRY_ENCODER_CMD IOCTLs.
VIDIOC_DECODER_CMD and VIDIOC_TRY_DECODER_CMD IOCTLs.
Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'Documentation')
7 files changed, 1 insertions, 60 deletions
diff --git a/Documentation/DocBook/media/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml index 98e8d088b3a5..578135ec6b1f 100644 --- a/Documentation/DocBook/media/v4l/compat.xml +++ b/Documentation/DocBook/media/v4l/compat.xml | |||
@@ -2555,29 +2555,6 @@ and may change in the future.</para> | |||
2555 | <para>Video Output Overlay (OSD) Interface, <xref | 2555 | <para>Video Output Overlay (OSD) Interface, <xref |
2556 | linkend="osd" />.</para> | 2556 | linkend="osd" />.</para> |
2557 | </listitem> | 2557 | </listitem> |
2558 | <listitem> | ||
2559 | <para><constant>V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY</constant>, | ||
2560 | &v4l2-buf-type;, <xref linkend="v4l2-buf-type" />.</para> | ||
2561 | </listitem> | ||
2562 | <listitem> | ||
2563 | <para><constant>V4L2_CAP_VIDEO_OUTPUT_OVERLAY</constant>, | ||
2564 | &VIDIOC-QUERYCAP; ioctl, <xref linkend="device-capabilities" />.</para> | ||
2565 | </listitem> | ||
2566 | <listitem> | ||
2567 | <para>&VIDIOC-ENUM-FRAMESIZES; and | ||
2568 | &VIDIOC-ENUM-FRAMEINTERVALS; ioctls.</para> | ||
2569 | </listitem> | ||
2570 | <listitem> | ||
2571 | <para>&VIDIOC-G-ENC-INDEX; ioctl.</para> | ||
2572 | </listitem> | ||
2573 | <listitem> | ||
2574 | <para>&VIDIOC-ENCODER-CMD; and &VIDIOC-TRY-ENCODER-CMD; | ||
2575 | ioctls.</para> | ||
2576 | </listitem> | ||
2577 | <listitem> | ||
2578 | <para>&VIDIOC-DECODER-CMD; and &VIDIOC-TRY-DECODER-CMD; | ||
2579 | ioctls.</para> | ||
2580 | </listitem> | ||
2581 | <listitem> | 2558 | <listitem> |
2582 | <para>&VIDIOC-DBG-G-REGISTER; and &VIDIOC-DBG-S-REGISTER; | 2559 | <para>&VIDIOC-DBG-G-REGISTER; and &VIDIOC-DBG-S-REGISTER; |
2583 | ioctls.</para> | 2560 | ioctls.</para> |
diff --git a/Documentation/DocBook/media/v4l/dev-osd.xml b/Documentation/DocBook/media/v4l/dev-osd.xml index 479d9433869a..dd91d6134e8c 100644 --- a/Documentation/DocBook/media/v4l/dev-osd.xml +++ b/Documentation/DocBook/media/v4l/dev-osd.xml | |||
@@ -1,13 +1,6 @@ | |||
1 | <title>Video Output Overlay Interface</title> | 1 | <title>Video Output Overlay Interface</title> |
2 | <subtitle>Also known as On-Screen Display (OSD)</subtitle> | 2 | <subtitle>Also known as On-Screen Display (OSD)</subtitle> |
3 | 3 | ||
4 | <note> | ||
5 | <title>Experimental</title> | ||
6 | |||
7 | <para>This is an <link linkend="experimental">experimental</link> | ||
8 | interface and may change in the future.</para> | ||
9 | </note> | ||
10 | |||
11 | <para>Some video output devices can overlay a framebuffer image onto | 4 | <para>Some video output devices can overlay a framebuffer image onto |
12 | the outgoing video signal. Applications can set up such an overlay | 5 | the outgoing video signal. Applications can set up such an overlay |
13 | using this interface, which borrows structures and ioctls of the <link | 6 | using this interface, which borrows structures and ioctls of the <link |
diff --git a/Documentation/DocBook/media/v4l/io.xml b/Documentation/DocBook/media/v4l/io.xml index 1885cc0755cb..2512649b8e50 100644 --- a/Documentation/DocBook/media/v4l/io.xml +++ b/Documentation/DocBook/media/v4l/io.xml | |||
@@ -827,8 +827,7 @@ should set this to 0.</entry> | |||
827 | <entry><constant>V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY</constant></entry> | 827 | <entry><constant>V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY</constant></entry> |
828 | <entry>8</entry> | 828 | <entry>8</entry> |
829 | <entry>Buffer for video output overlay (OSD), see <xref | 829 | <entry>Buffer for video output overlay (OSD), see <xref |
830 | linkend="osd" />. Status: <link | 830 | linkend="osd" />.</entry> |
831 | linkend="experimental">Experimental</link>.</entry> | ||
832 | </row> | 831 | </row> |
833 | <row> | 832 | <row> |
834 | <entry><constant>V4L2_BUF_TYPE_PRIVATE</constant></entry> | 833 | <entry><constant>V4L2_BUF_TYPE_PRIVATE</constant></entry> |
diff --git a/Documentation/DocBook/media/v4l/vidioc-decoder-cmd.xml b/Documentation/DocBook/media/v4l/vidioc-decoder-cmd.xml index 74b87f6e480a..9215627b04c7 100644 --- a/Documentation/DocBook/media/v4l/vidioc-decoder-cmd.xml +++ b/Documentation/DocBook/media/v4l/vidioc-decoder-cmd.xml | |||
@@ -49,13 +49,6 @@ | |||
49 | <refsect1> | 49 | <refsect1> |
50 | <title>Description</title> | 50 | <title>Description</title> |
51 | 51 | ||
52 | <note> | ||
53 | <title>Experimental</title> | ||
54 | |||
55 | <para>This is an <link linkend="experimental">experimental</link> | ||
56 | interface and may change in the future.</para> | ||
57 | </note> | ||
58 | |||
59 | <para>These ioctls control an audio/video (usually MPEG-) decoder. | 52 | <para>These ioctls control an audio/video (usually MPEG-) decoder. |
60 | <constant>VIDIOC_DECODER_CMD</constant> sends a command to the | 53 | <constant>VIDIOC_DECODER_CMD</constant> sends a command to the |
61 | decoder, <constant>VIDIOC_TRY_DECODER_CMD</constant> can be used to | 54 | decoder, <constant>VIDIOC_TRY_DECODER_CMD</constant> can be used to |
diff --git a/Documentation/DocBook/media/v4l/vidioc-encoder-cmd.xml b/Documentation/DocBook/media/v4l/vidioc-encoder-cmd.xml index f431b3ba79bd..0619ca5d2d36 100644 --- a/Documentation/DocBook/media/v4l/vidioc-encoder-cmd.xml +++ b/Documentation/DocBook/media/v4l/vidioc-encoder-cmd.xml | |||
@@ -49,13 +49,6 @@ | |||
49 | <refsect1> | 49 | <refsect1> |
50 | <title>Description</title> | 50 | <title>Description</title> |
51 | 51 | ||
52 | <note> | ||
53 | <title>Experimental</title> | ||
54 | |||
55 | <para>This is an <link linkend="experimental">experimental</link> | ||
56 | interface and may change in the future.</para> | ||
57 | </note> | ||
58 | |||
59 | <para>These ioctls control an audio/video (usually MPEG-) encoder. | 52 | <para>These ioctls control an audio/video (usually MPEG-) encoder. |
60 | <constant>VIDIOC_ENCODER_CMD</constant> sends a command to the | 53 | <constant>VIDIOC_ENCODER_CMD</constant> sends a command to the |
61 | encoder, <constant>VIDIOC_TRY_ENCODER_CMD</constant> can be used to | 54 | encoder, <constant>VIDIOC_TRY_ENCODER_CMD</constant> can be used to |
diff --git a/Documentation/DocBook/media/v4l/vidioc-enum-framesizes.xml b/Documentation/DocBook/media/v4l/vidioc-enum-framesizes.xml index f77a13f486d7..a78454b5abcd 100644 --- a/Documentation/DocBook/media/v4l/vidioc-enum-framesizes.xml +++ b/Documentation/DocBook/media/v4l/vidioc-enum-framesizes.xml | |||
@@ -50,13 +50,6 @@ and pixel format and receives a frame width and height.</para> | |||
50 | <refsect1> | 50 | <refsect1> |
51 | <title>Description</title> | 51 | <title>Description</title> |
52 | 52 | ||
53 | <note> | ||
54 | <title>Experimental</title> | ||
55 | |||
56 | <para>This is an <link linkend="experimental">experimental</link> | ||
57 | interface and may change in the future.</para> | ||
58 | </note> | ||
59 | |||
60 | <para>This ioctl allows applications to enumerate all frame sizes | 53 | <para>This ioctl allows applications to enumerate all frame sizes |
61 | (&ie; width and height in pixels) that the device supports for the | 54 | (&ie; width and height in pixels) that the device supports for the |
62 | given pixel format.</para> | 55 | given pixel format.</para> |
diff --git a/Documentation/DocBook/media/v4l/vidioc-g-enc-index.xml b/Documentation/DocBook/media/v4l/vidioc-g-enc-index.xml index 2aef02c9044e..be25029a16f1 100644 --- a/Documentation/DocBook/media/v4l/vidioc-g-enc-index.xml +++ b/Documentation/DocBook/media/v4l/vidioc-g-enc-index.xml | |||
@@ -48,13 +48,6 @@ | |||
48 | <refsect1> | 48 | <refsect1> |
49 | <title>Description</title> | 49 | <title>Description</title> |
50 | 50 | ||
51 | <note> | ||
52 | <title>Experimental</title> | ||
53 | |||
54 | <para>This is an <link linkend="experimental">experimental</link> | ||
55 | interface and may change in the future.</para> | ||
56 | </note> | ||
57 | |||
58 | <para>The <constant>VIDIOC_G_ENC_INDEX</constant> ioctl provides | 51 | <para>The <constant>VIDIOC_G_ENC_INDEX</constant> ioctl provides |
59 | meta data about a compressed video stream the same or another | 52 | meta data about a compressed video stream the same or another |
60 | application currently reads from the driver, which is useful for | 53 | application currently reads from the driver, which is useful for |