aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/DocBook
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-04-06 09:32:19 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-19 11:57:08 -0400
commite426e8663f028272b99f91e57bbbab6fda603bf1 (patch)
treee178b843a89bf7f39cbe2c31eb44a6d189fa446b /Documentation/DocBook
parentfa0290eaee03c3205cb6d344db25580fb3e5e53e (diff)
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: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'Documentation/DocBook')
-rw-r--r--Documentation/DocBook/v4l/compat.xml115
1 files changed, 58 insertions, 57 deletions
diff --git a/Documentation/DocBook/v4l/compat.xml b/Documentation/DocBook/v4l/compat.xml
index 854235b5208e..b42b935913cd 100644
--- a/Documentation/DocBook/v4l/compat.xml
+++ b/Documentation/DocBook/v4l/compat.xml
@@ -2343,15 +2343,15 @@ more information.</para>
2343 </para> 2343 </para>
2344 </listitem> 2344 </listitem>
2345 </orderedlist> 2345 </orderedlist>
2346 </section> 2346 </section>
2347 2347
2348 <section id="other"> 2348 <section id="other">
2349 <title>Relation of V4L2 to other Linux multimedia APIs</title> 2349 <title>Relation of V4L2 to other Linux multimedia APIs</title>
2350 2350
2351 <section id="xvideo"> 2351 <section id="xvideo">
2352 <title>X Video Extension</title> 2352 <title>X Video Extension</title>
2353 2353
2354 <para>The X Video Extension (abbreviated XVideo or just Xv) is 2354 <para>The X Video Extension (abbreviated XVideo or just Xv) is
2355an extension of the X Window system, implemented for example by the 2355an extension of the X Window system, implemented for example by the
2356XFree86 project. Its scope is similar to V4L2, an API to video capture 2356XFree86 project. Its scope is similar to V4L2, an API to video capture
2357and output devices for X clients. Xv allows applications to display 2357and output devices for X clients. Xv allows applications to display
@@ -2362,7 +2362,7 @@ capture or output still images in XPixmaps<footnote>
2362extension available across many operating systems and 2362extension available across many operating systems and
2363architectures.</para> 2363architectures.</para>
2364 2364
2365 <para>Because the driver is embedded into the X server Xv has a 2365 <para>Because the driver is embedded into the X server Xv has a
2366number of advantages over the V4L2 <link linkend="overlay">video 2366number of advantages over the V4L2 <link linkend="overlay">video
2367overlay interface</link>. The driver can easily determine the overlay 2367overlay interface</link>. The driver can easily determine the overlay
2368target, &ie; visible graphics memory or off-screen buffers for a 2368target, &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
2371video capture hardware, always in sync with drawing operations or 2371video capture hardware, always in sync with drawing operations or
2372windows moving or changing their stacking order.</para> 2372windows moving or changing their stacking order.</para>
2373 2373
2374 <para>To combine the advantages of Xv and V4L a special Xv 2374 <para>To combine the advantages of Xv and V4L a special Xv
2375driver exists in XFree86 and XOrg, just programming any overlay capable 2375driver exists in XFree86 and XOrg, just programming any overlay capable
2376Video4Linux device it finds. To enable it 2376Video4Linux device it finds. To enable it
2377<filename>/etc/X11/XF86Config</filename> must contain these lines:</para> 2377<filename>/etc/X11/XF86Config</filename> must contain these lines:</para>
2378 <para><screen> 2378 <para><screen>
2379Section "Module" 2379Section "Module"
2380 Load "v4l" 2380 Load "v4l"
2381EndSection</screen></para> 2381EndSection</screen></para>
2382 2382
2383 <para>As of XFree86 4.2 this driver still supports only V4L 2383 <para>As of XFree86 4.2 this driver still supports only V4L
2384ioctls, however it should work just fine with all V4L2 devices through 2384ioctls, however it should work just fine with all V4L2 devices through
2385the V4L2 backward-compatibility layer. Since V4L2 permits multiple 2385the V4L2 backward-compatibility layer. Since V4L2 permits multiple
2386opens it is possible (if supported by the V4L2 driver) to capture 2386opens 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
2388simultaneous capturing and overlay are discussed in <xref 2388simultaneous capturing and overlay are discussed in <xref
2389 linkend="overlay" /> apply.</para> 2389 linkend="overlay" /> apply.</para>
2390 2390
2391 <para>Only marginally related to V4L2, XFree86 extended Xv to 2391 <para>Only marginally related to V4L2, XFree86 extended Xv to
2392support hardware YUV to RGB conversion and scaling for faster video 2392support hardware YUV to RGB conversion and scaling for faster video
2393playback, and added an interface to MPEG-2 decoding hardware. This API 2393playback, and added an interface to MPEG-2 decoding hardware. This API
2394is useful to display images captured with V4L2 devices.</para> 2394is useful to display images captured with V4L2 devices.</para>
2395 </section> 2395 </section>
2396 2396
2397 <section> 2397 <section>
2398 <title>Digital Video</title> 2398 <title>Digital Video</title>
2399 2399
2400 <para>V4L2 does not support digital terrestrial, cable or 2400 <para>V4L2 does not support digital terrestrial, cable or
2401satellite broadcast. A separate project aiming at digital receivers 2401satellite broadcast. A separate project aiming at digital receivers
2402exists. You can find its homepage at <ulink 2402exists. You can find its homepage at <ulink
2403url="http://linuxtv.org">http://linuxtv.org</ulink>. The Linux DVB API 2403url="http://linuxtv.org">http://linuxtv.org</ulink>. The Linux DVB API
2404has no connection to the V4L2 API except that drivers for hybrid 2404has no connection to the V4L2 API except that drivers for hybrid
2405hardware may support both.</para> 2405hardware may support both.</para>
2406 </section> 2406 </section>
2407 2407
2408 <section> 2408 <section>
2409 <title>Audio Interfaces</title> 2409 <title>Audio Interfaces</title>
2410 2410
2411 <para>[to do - OSS/ALSA]</para> 2411 <para>[to do - OSS/ALSA]</para>
2412 </section>
2412 </section> 2413 </section>
2413 </section>
2414 2414
2415 <section id="experimental"> 2415 <section id="experimental">
2416 <title>Experimental API Elements</title> 2416 <title>Experimental API Elements</title>
2417 2417
2418 <para>The following V4L2 API elements are currently experimental 2418 <para>The following V4L2 API elements are currently experimental
2419and may change in the future.</para> 2419and may change in the future.</para>
2420 2420
2421 <itemizedlist> 2421 <itemizedlist>
2422 <listitem> 2422 <listitem>
2423 <para>Video Output Overlay (OSD) Interface, <xref 2423 <para>Video Output Overlay (OSD) Interface, <xref
2424 linkend="osd" />.</para> 2424 linkend="osd" />.</para>
2425 </listitem> 2425 </listitem>
2426 <listitem> 2426 <listitem>
2427 <para><constant>V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY</constant>, 2427 <para><constant>V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY</constant>,
2428 &v4l2-buf-type;, <xref linkend="v4l2-buf-type" />.</para> 2428 &v4l2-buf-type;, <xref linkend="v4l2-buf-type" />.</para>
2429 </listitem> 2429 </listitem>
2430 <listitem> 2430 <listitem>
2431 <para><constant>V4L2_CAP_VIDEO_OUTPUT_OVERLAY</constant>, 2431 <para><constant>V4L2_CAP_VIDEO_OUTPUT_OVERLAY</constant>,
2432&VIDIOC-QUERYCAP; ioctl, <xref linkend="device-capabilities" />.</para> 2432&VIDIOC-QUERYCAP; ioctl, <xref linkend="device-capabilities" />.</para>
2433 </listitem> 2433 </listitem>
2434 <listitem> 2434 <listitem>
2435 <para>&VIDIOC-ENUM-FRAMESIZES; and 2435 <para>&VIDIOC-ENUM-FRAMESIZES; and
2436&VIDIOC-ENUM-FRAMEINTERVALS; ioctls.</para> 2436&VIDIOC-ENUM-FRAMEINTERVALS; ioctls.</para>
2437 </listitem> 2437 </listitem>
2438 <listitem> 2438 <listitem>
2439 <para>&VIDIOC-G-ENC-INDEX; ioctl.</para> 2439 <para>&VIDIOC-G-ENC-INDEX; ioctl.</para>
2440 </listitem> 2440 </listitem>
2441 <listitem> 2441 <listitem>
2442 <para>&VIDIOC-ENCODER-CMD; and &VIDIOC-TRY-ENCODER-CMD; 2442 <para>&VIDIOC-ENCODER-CMD; and &VIDIOC-TRY-ENCODER-CMD;
2443ioctls.</para> 2443ioctls.</para>
2444 </listitem> 2444 </listitem>
2445 <listitem> 2445 <listitem>
2446 <para>&VIDIOC-DBG-G-REGISTER; and &VIDIOC-DBG-S-REGISTER; 2446 <para>&VIDIOC-DBG-G-REGISTER; and &VIDIOC-DBG-S-REGISTER;
2447ioctls.</para> 2447ioctls.</para>
2448 </listitem> 2448 </listitem>
2449 <listitem> 2449 <listitem>
2450 <para>&VIDIOC-DBG-G-CHIP-IDENT; ioctl.</para> 2450 <para>&VIDIOC-DBG-G-CHIP-IDENT; ioctl.</para>
2451 </listitem> 2451 </listitem>
2452 </itemizedlist> 2452 </itemizedlist>
2453 </section> 2453 </section>
2454 2454
2455 <section id="obsolete"> 2455 <section id="obsolete">
2456 <title>Obsolete API Elements</title> 2456 <title>Obsolete API Elements</title>
2457 2457
2458 <para>The following V4L2 API elements were superseded by new 2458 <para>The following V4L2 API elements were superseded by new
2459interfaces and should not be implemented in new drivers.</para> 2459interfaces and should not be implemented in new drivers.</para>
2460 2460
2461 <itemizedlist> 2461 <itemizedlist>
2462 <listitem> 2462 <listitem>
2463 <para><constant>VIDIOC_G_MPEGCOMP</constant> and 2463 <para><constant>VIDIOC_G_MPEGCOMP</constant> and
2464<constant>VIDIOC_S_MPEGCOMP</constant> ioctls. Use Extended Controls, 2464<constant>VIDIOC_S_MPEGCOMP</constant> ioctls. Use Extended Controls,
2465<xref linkend="extended-controls" />.</para> 2465<xref linkend="extended-controls" />.</para>
2466 </listitem> 2466 </listitem>
2467 </itemizedlist> 2467 </itemizedlist>
2468 </section>
2468 </section> 2469 </section>
2469 2470
2470 <!-- 2471 <!--