Commit 9495356f authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

[media] DocBook: deprecate V4L2_BUF_TYPE_PRIVATE

As per decision taken during the 2012 Media Workshop.
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent ff82b211
...@@ -1476,7 +1476,7 @@ follows.<informaltable> ...@@ -1476,7 +1476,7 @@ follows.<informaltable>
</row> </row>
<row> <row>
<entry><constant>V4L2_BUF_TYPE_PRIVATE_BASE</constant></entry> <entry><constant>V4L2_BUF_TYPE_PRIVATE_BASE</constant></entry>
<entry><constant>V4L2_BUF_TYPE_PRIVATE</constant></entry> <entry><constant>V4L2_BUF_TYPE_PRIVATE</constant> (but this is deprecated)</entry>
</row> </row>
</tbody> </tbody>
</tgroup> </tgroup>
......
...@@ -685,18 +685,14 @@ memory, set by the application. See <xref linkend="userp" /> for details. ...@@ -685,18 +685,14 @@ memory, set by the application. See <xref linkend="userp" /> for details.
<entry>__u32</entry> <entry>__u32</entry>
<entry><structfield>reserved2</structfield></entry> <entry><structfield>reserved2</structfield></entry>
<entry></entry> <entry></entry>
<entry>A place holder for future extensions and custom <entry>A place holder for future extensions. Applications
(driver defined) buffer types
<constant>V4L2_BUF_TYPE_PRIVATE</constant> and higher. Applications
should set this to 0.</entry> should set this to 0.</entry>
</row> </row>
<row> <row>
<entry>__u32</entry> <entry>__u32</entry>
<entry><structfield>reserved</structfield></entry> <entry><structfield>reserved</structfield></entry>
<entry></entry> <entry></entry>
<entry>A place holder for future extensions and custom <entry>A place holder for future extensions. Applications
(driver defined) buffer types
<constant>V4L2_BUF_TYPE_PRIVATE</constant> and higher. Applications
should set this to 0.</entry> should set this to 0.</entry>
</row> </row>
</tbody> </tbody>
...@@ -829,12 +825,6 @@ should set this to 0.</entry> ...@@ -829,12 +825,6 @@ should set this to 0.</entry>
<entry>Buffer for video output overlay (OSD), see <xref <entry>Buffer for video output overlay (OSD), see <xref
linkend="osd" />.</entry> linkend="osd" />.</entry>
</row> </row>
<row>
<entry><constant>V4L2_BUF_TYPE_PRIVATE</constant></entry>
<entry>0x80</entry>
<entry>This and higher values are reserved for custom
(driver defined) buffer types.</entry>
</row>
</tbody> </tbody>
</tgroup> </tgroup>
</table> </table>
......
...@@ -70,10 +70,8 @@ output.</para> ...@@ -70,10 +70,8 @@ output.</para>
<entry>Type of the data stream, set by the application. <entry>Type of the data stream, set by the application.
Only these types are valid here: Only these types are valid here:
<constant>V4L2_BUF_TYPE_VIDEO_CAPTURE</constant>, <constant>V4L2_BUF_TYPE_VIDEO_CAPTURE</constant>,
<constant>V4L2_BUF_TYPE_VIDEO_OUTPUT</constant>, <constant>V4L2_BUF_TYPE_VIDEO_OUTPUT</constant> and
<constant>V4L2_BUF_TYPE_VIDEO_OVERLAY</constant>, and custom (driver <constant>V4L2_BUF_TYPE_VIDEO_OVERLAY</constant>. See <xref linkend="v4l2-buf-type" />.</entry>
defined) types with code <constant>V4L2_BUF_TYPE_PRIVATE</constant>
and higher. See <xref linkend="v4l2-buf-type" />.</entry>
</row> </row>
<row> <row>
<entry>struct <link linkend="v4l2-rect-crop">v4l2_rect</link></entry> <entry>struct <link linkend="v4l2-rect-crop">v4l2_rect</link></entry>
......
...@@ -81,10 +81,8 @@ Only these types are valid here: ...@@ -81,10 +81,8 @@ Only these types are valid here:
<constant>V4L2_BUF_TYPE_VIDEO_CAPTURE</constant>, <constant>V4L2_BUF_TYPE_VIDEO_CAPTURE</constant>,
<constant>V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE</constant>, <constant>V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE</constant>,
<constant>V4L2_BUF_TYPE_VIDEO_OUTPUT</constant>, <constant>V4L2_BUF_TYPE_VIDEO_OUTPUT</constant>,
<constant>V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE</constant>, <constant>V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE</constant> and
<constant>V4L2_BUF_TYPE_VIDEO_OVERLAY</constant>, and custom (driver <constant>V4L2_BUF_TYPE_VIDEO_OVERLAY</constant>. See <xref linkend="v4l2-buf-type" />.</entry>
defined) types with code <constant>V4L2_BUF_TYPE_PRIVATE</constant>
and higher. See <xref linkend="v4l2-buf-type" />.</entry>
</row> </row>
<row> <row>
<entry>__u32</entry> <entry>__u32</entry>
......
...@@ -104,10 +104,8 @@ changed and <constant>VIDIOC_S_CROP</constant> returns the ...@@ -104,10 +104,8 @@ changed and <constant>VIDIOC_S_CROP</constant> returns the
<entry><structfield>type</structfield></entry> <entry><structfield>type</structfield></entry>
<entry>Type of the data stream, set by the application. <entry>Type of the data stream, set by the application.
Only these types are valid here: <constant>V4L2_BUF_TYPE_VIDEO_CAPTURE</constant>, Only these types are valid here: <constant>V4L2_BUF_TYPE_VIDEO_CAPTURE</constant>,
<constant>V4L2_BUF_TYPE_VIDEO_OUTPUT</constant>, <constant>V4L2_BUF_TYPE_VIDEO_OUTPUT</constant> and
<constant>V4L2_BUF_TYPE_VIDEO_OVERLAY</constant>, and custom (driver <constant>V4L2_BUF_TYPE_VIDEO_OVERLAY</constant>. See <xref linkend="v4l2-buf-type" />.</entry>
defined) types with code <constant>V4L2_BUF_TYPE_PRIVATE</constant>
and higher. See <xref linkend="v4l2-buf-type" />.</entry>
</row> </row>
<row> <row>
<entry>&v4l2-rect;</entry> <entry>&v4l2-rect;</entry>
......
...@@ -174,9 +174,7 @@ capture and output devices.</entry> ...@@ -174,9 +174,7 @@ capture and output devices.</entry>
<entry></entry> <entry></entry>
<entry>__u8</entry> <entry>__u8</entry>
<entry><structfield>raw_data</structfield>[200]</entry> <entry><structfield>raw_data</structfield>[200]</entry>
<entry>Place holder for future extensions and custom <entry>Place holder for future extensions.</entry>
(driver defined) formats with <structfield>type</structfield>
<constant>V4L2_BUF_TYPE_PRIVATE</constant> and higher.</entry>
</row> </row>
</tbody> </tbody>
</tgroup> </tgroup>
......
...@@ -108,9 +108,7 @@ devices.</para> ...@@ -108,9 +108,7 @@ devices.</para>
<entry></entry> <entry></entry>
<entry>__u8</entry> <entry>__u8</entry>
<entry><structfield>raw_data</structfield>[200]</entry> <entry><structfield>raw_data</structfield>[200]</entry>
<entry>A place holder for future extensions and custom <entry>A place holder for future extensions.</entry>
(driver defined) buffer types <constant>V4L2_BUF_TYPE_PRIVATE</constant> and
higher.</entry>
</row> </row>
</tbody> </tbody>
</tgroup> </tgroup>
......
...@@ -109,9 +109,8 @@ as the &v4l2-format; <structfield>type</structfield> field. See <xref ...@@ -109,9 +109,8 @@ as the &v4l2-format; <structfield>type</structfield> field. See <xref
<row> <row>
<entry>__u32</entry> <entry>__u32</entry>
<entry><structfield>reserved</structfield>[2]</entry> <entry><structfield>reserved</structfield>[2]</entry>
<entry>A place holder for future extensions and custom <entry>A place holder for future extensions. This array should
(driver defined) buffer types <constant>V4L2_BUF_TYPE_PRIVATE</constant> and be zeroed by applications.</entry>
higher. This array should be zeroed by applications.</entry>
</row> </row>
</tbody> </tbody>
</tgroup> </tgroup>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment