提交 e426e866 编写于 作者: H Hans Verkuil 提交者: Mauro Carvalho Chehab

V4L/DVB: DocBook/v4l/compat.xml: add missing </section>

The indentation of the sections had gone wrong, causing a mistake with
section nesting. Fixed.
Signed-off-by: NHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
上级 fa0290ea
...@@ -2343,15 +2343,15 @@ more information.</para> ...@@ -2343,15 +2343,15 @@ more information.</para>
</para> </para>
</listitem> </listitem>
</orderedlist> </orderedlist>
</section> </section>
<section id="other"> <section id="other">
<title>Relation of V4L2 to other Linux multimedia APIs</title> <title>Relation of V4L2 to other Linux multimedia APIs</title>
<section id="xvideo"> <section id="xvideo">
<title>X Video Extension</title> <title>X Video Extension</title>
<para>The X Video Extension (abbreviated XVideo or just Xv) is <para>The X Video Extension (abbreviated XVideo or just Xv) is
an extension of the X Window system, implemented for example by the an extension of the X Window system, implemented for example by the
XFree86 project. Its scope is similar to V4L2, an API to video capture XFree86 project. Its scope is similar to V4L2, an API to video capture
and output devices for X clients. Xv allows applications to display and output devices for X clients. Xv allows applications to display
...@@ -2362,7 +2362,7 @@ capture or output still images in XPixmaps<footnote> ...@@ -2362,7 +2362,7 @@ capture or output still images in XPixmaps<footnote>
extension available across many operating systems and extension available across many operating systems and
architectures.</para> architectures.</para>
<para>Because the driver is embedded into the X server Xv has a <para>Because the driver is embedded into the X server Xv has a
number of advantages over the V4L2 <link linkend="overlay">video number of advantages over the V4L2 <link linkend="overlay">video
overlay interface</link>. The driver can easily determine the overlay overlay interface</link>. The driver can easily determine the overlay
target, &ie; visible graphics memory or off-screen buffers for a target, &ie; visible graphics memory or off-screen buffers for a
...@@ -2371,16 +2371,16 @@ overlay, scaling or color-keying, or the clipping functions of the ...@@ -2371,16 +2371,16 @@ overlay, scaling or color-keying, or the clipping functions of the
video capture hardware, always in sync with drawing operations or video capture hardware, always in sync with drawing operations or
windows moving or changing their stacking order.</para> windows moving or changing their stacking order.</para>
<para>To combine the advantages of Xv and V4L a special Xv <para>To combine the advantages of Xv and V4L a special Xv
driver exists in XFree86 and XOrg, just programming any overlay capable driver exists in XFree86 and XOrg, just programming any overlay capable
Video4Linux device it finds. To enable it Video4Linux device it finds. To enable it
<filename>/etc/X11/XF86Config</filename> must contain these lines:</para> <filename>/etc/X11/XF86Config</filename> must contain these lines:</para>
<para><screen> <para><screen>
Section "Module" Section "Module"
Load "v4l" Load "v4l"
EndSection</screen></para> EndSection</screen></para>
<para>As of XFree86 4.2 this driver still supports only V4L <para>As of XFree86 4.2 this driver still supports only V4L
ioctls, however it should work just fine with all V4L2 devices through ioctls, however it should work just fine with all V4L2 devices through
the V4L2 backward-compatibility layer. Since V4L2 permits multiple the V4L2 backward-compatibility layer. Since V4L2 permits multiple
opens it is possible (if supported by the V4L2 driver) to capture opens it is possible (if supported by the V4L2 driver) to capture
...@@ -2388,83 +2388,84 @@ video while an X client requested video overlay. Restrictions of ...@@ -2388,83 +2388,84 @@ video while an X client requested video overlay. Restrictions of
simultaneous capturing and overlay are discussed in <xref simultaneous capturing and overlay are discussed in <xref
linkend="overlay" /> apply.</para> linkend="overlay" /> apply.</para>
<para>Only marginally related to V4L2, XFree86 extended Xv to <para>Only marginally related to V4L2, XFree86 extended Xv to
support hardware YUV to RGB conversion and scaling for faster video support hardware YUV to RGB conversion and scaling for faster video
playback, and added an interface to MPEG-2 decoding hardware. This API playback, and added an interface to MPEG-2 decoding hardware. This API
is useful to display images captured with V4L2 devices.</para> is useful to display images captured with V4L2 devices.</para>
</section> </section>
<section> <section>
<title>Digital Video</title> <title>Digital Video</title>
<para>V4L2 does not support digital terrestrial, cable or <para>V4L2 does not support digital terrestrial, cable or
satellite broadcast. A separate project aiming at digital receivers satellite broadcast. A separate project aiming at digital receivers
exists. You can find its homepage at <ulink exists. You can find its homepage at <ulink
url="http://linuxtv.org">http://linuxtv.org</ulink>. The Linux DVB API url="http://linuxtv.org">http://linuxtv.org</ulink>. The Linux DVB API
has no connection to the V4L2 API except that drivers for hybrid has no connection to the V4L2 API except that drivers for hybrid
hardware may support both.</para> hardware may support both.</para>
</section> </section>
<section> <section>
<title>Audio Interfaces</title> <title>Audio Interfaces</title>
<para>[to do - OSS/ALSA]</para> <para>[to do - OSS/ALSA]</para>
</section>
</section> </section>
</section>
<section id="experimental"> <section id="experimental">
<title>Experimental API Elements</title> <title>Experimental API Elements</title>
<para>The following V4L2 API elements are currently experimental <para>The following V4L2 API elements are currently experimental
and may change in the future.</para> and may change in the future.</para>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para>Video Output Overlay (OSD) Interface, <xref <para>Video Output Overlay (OSD) Interface, <xref
linkend="osd" />.</para> linkend="osd" />.</para>
</listitem> </listitem>
<listitem> <listitem>
<para><constant>V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY</constant>, <para><constant>V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY</constant>,
&v4l2-buf-type;, <xref linkend="v4l2-buf-type" />.</para> &v4l2-buf-type;, <xref linkend="v4l2-buf-type" />.</para>
</listitem> </listitem>
<listitem> <listitem>
<para><constant>V4L2_CAP_VIDEO_OUTPUT_OVERLAY</constant>, <para><constant>V4L2_CAP_VIDEO_OUTPUT_OVERLAY</constant>,
&VIDIOC-QUERYCAP; ioctl, <xref linkend="device-capabilities" />.</para> &VIDIOC-QUERYCAP; ioctl, <xref linkend="device-capabilities" />.</para>
</listitem> </listitem>
<listitem> <listitem>
<para>&VIDIOC-ENUM-FRAMESIZES; and <para>&VIDIOC-ENUM-FRAMESIZES; and
&VIDIOC-ENUM-FRAMEINTERVALS; ioctls.</para> &VIDIOC-ENUM-FRAMEINTERVALS; ioctls.</para>
</listitem> </listitem>
<listitem> <listitem>
<para>&VIDIOC-G-ENC-INDEX; ioctl.</para> <para>&VIDIOC-G-ENC-INDEX; ioctl.</para>
</listitem> </listitem>
<listitem> <listitem>
<para>&VIDIOC-ENCODER-CMD; and &VIDIOC-TRY-ENCODER-CMD; <para>&VIDIOC-ENCODER-CMD; and &VIDIOC-TRY-ENCODER-CMD;
ioctls.</para> ioctls.</para>
</listitem> </listitem>
<listitem> <listitem>
<para>&VIDIOC-DBG-G-REGISTER; and &VIDIOC-DBG-S-REGISTER; <para>&VIDIOC-DBG-G-REGISTER; and &VIDIOC-DBG-S-REGISTER;
ioctls.</para> ioctls.</para>
</listitem> </listitem>
<listitem> <listitem>
<para>&VIDIOC-DBG-G-CHIP-IDENT; ioctl.</para> <para>&VIDIOC-DBG-G-CHIP-IDENT; ioctl.</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
</section> </section>
<section id="obsolete"> <section id="obsolete">
<title>Obsolete API Elements</title> <title>Obsolete API Elements</title>
<para>The following V4L2 API elements were superseded by new <para>The following V4L2 API elements were superseded by new
interfaces and should not be implemented in new drivers.</para> interfaces and should not be implemented in new drivers.</para>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para><constant>VIDIOC_G_MPEGCOMP</constant> and <para><constant>VIDIOC_G_MPEGCOMP</constant> and
<constant>VIDIOC_S_MPEGCOMP</constant> ioctls. Use Extended Controls, <constant>VIDIOC_S_MPEGCOMP</constant> ioctls. Use Extended Controls,
<xref linkend="extended-controls" />.</para> <xref linkend="extended-controls" />.</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
</section>
</section> </section>
<!-- <!--
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册