diff options
Diffstat (limited to 'Documentation/DocBook')
4 files changed, 18 insertions, 2 deletions
diff --git a/Documentation/DocBook/media/v4l/common.xml b/Documentation/DocBook/media/v4l/common.xml index 81b7cf384a39..4101aeb56540 100644 --- a/Documentation/DocBook/media/v4l/common.xml +++ b/Documentation/DocBook/media/v4l/common.xml | |||
@@ -744,11 +744,13 @@ header can be used to get the timings of the formats in the <xref linkend="cea86 | |||
744 | </para> | 744 | </para> |
745 | </listitem> | 745 | </listitem> |
746 | <listitem> | 746 | <listitem> |
747 | <para>DV Presets: Digital Video (DV) presets. These are IDs representing a | 747 | <para>DV Presets: Digital Video (DV) presets (<emphasis role="bold">deprecated</emphasis>). |
748 | These are IDs representing a | ||
748 | video timing at the input/output. Presets are pre-defined timings implemented | 749 | video timing at the input/output. Presets are pre-defined timings implemented |
749 | by the hardware according to video standards. A __u32 data type is used to represent | 750 | by the hardware according to video standards. A __u32 data type is used to represent |
750 | a preset unlike the bit mask that is used in &v4l2-std-id; allowing future extensions | 751 | a preset unlike the bit mask that is used in &v4l2-std-id; allowing future extensions |
751 | to support as many different presets as needed.</para> | 752 | to support as many different presets as needed. This API is deprecated in favor of the DV Timings |
753 | API.</para> | ||
752 | </listitem> | 754 | </listitem> |
753 | </itemizedlist> | 755 | </itemizedlist> |
754 | <para>To enumerate and query the attributes of the DV timings supported by a device, | 756 | <para>To enumerate and query the attributes of the DV timings supported by a device, |
diff --git a/Documentation/DocBook/media/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml index cd19d21085db..ea42ef824948 100644 --- a/Documentation/DocBook/media/v4l/compat.xml +++ b/Documentation/DocBook/media/v4l/compat.xml | |||
@@ -2603,6 +2603,10 @@ interfaces and should not be implemented in new drivers.</para> | |||
2603 | <xref linkend="extended-controls" />.</para> | 2603 | <xref linkend="extended-controls" />.</para> |
2604 | </listitem> | 2604 | </listitem> |
2605 | <listitem> | 2605 | <listitem> |
2606 | <para>&VIDIOC-G-DV-PRESET;, &VIDIOC-S-DV-PRESET;, &VIDIOC-ENUM-DV-PRESETS; and | ||
2607 | &VIDIOC-QUERY-DV-PRESET; ioctls. Use the DV Timings API (<xref linkend="dv-timings" />).</para> | ||
2608 | </listitem> | ||
2609 | <listitem> | ||
2606 | <para><constant>VIDIOC_SUBDEV_G_CROP</constant> and | 2610 | <para><constant>VIDIOC_SUBDEV_G_CROP</constant> and |
2607 | <constant>VIDIOC_SUBDEV_S_CROP</constant> ioctls. Use | 2611 | <constant>VIDIOC_SUBDEV_S_CROP</constant> ioctls. Use |
2608 | <constant>VIDIOC_SUBDEV_G_SELECTION</constant> and | 2612 | <constant>VIDIOC_SUBDEV_G_SELECTION</constant> and |
diff --git a/Documentation/DocBook/media/v4l/vidioc-g-dv-preset.xml b/Documentation/DocBook/media/v4l/vidioc-g-dv-preset.xml index 7940c1149393..61be9fa3803a 100644 --- a/Documentation/DocBook/media/v4l/vidioc-g-dv-preset.xml +++ b/Documentation/DocBook/media/v4l/vidioc-g-dv-preset.xml | |||
@@ -48,6 +48,12 @@ | |||
48 | 48 | ||
49 | <refsect1> | 49 | <refsect1> |
50 | <title>Description</title> | 50 | <title>Description</title> |
51 | |||
52 | <para>These ioctls are <emphasis role="bold">deprecated</emphasis>. | ||
53 | New drivers and applications should use &VIDIOC-G-DV-TIMINGS; and &VIDIOC-S-DV-TIMINGS; | ||
54 | instead. | ||
55 | </para> | ||
56 | |||
51 | <para>To query and select the current DV preset, applications | 57 | <para>To query and select the current DV preset, applications |
52 | use the <constant>VIDIOC_G_DV_PRESET</constant> and <constant>VIDIOC_S_DV_PRESET</constant> | 58 | use the <constant>VIDIOC_G_DV_PRESET</constant> and <constant>VIDIOC_S_DV_PRESET</constant> |
53 | ioctls which take a pointer to a &v4l2-dv-preset; type as argument. | 59 | ioctls which take a pointer to a &v4l2-dv-preset; type as argument. |
diff --git a/Documentation/DocBook/media/v4l/vidioc-query-dv-preset.xml b/Documentation/DocBook/media/v4l/vidioc-query-dv-preset.xml index 23b17f604211..1bc8aeb3ff1f 100644 --- a/Documentation/DocBook/media/v4l/vidioc-query-dv-preset.xml +++ b/Documentation/DocBook/media/v4l/vidioc-query-dv-preset.xml | |||
@@ -49,6 +49,10 @@ input</refpurpose> | |||
49 | <refsect1> | 49 | <refsect1> |
50 | <title>Description</title> | 50 | <title>Description</title> |
51 | 51 | ||
52 | <para>This ioctl is <emphasis role="bold">deprecated</emphasis>. | ||
53 | New drivers and applications should use &VIDIOC-QUERY-DV-TIMINGS; instead. | ||
54 | </para> | ||
55 | |||
52 | <para>The hardware may be able to detect the current DV preset | 56 | <para>The hardware may be able to detect the current DV preset |
53 | automatically, similar to sensing the video standard. To do so, applications | 57 | automatically, similar to sensing the video standard. To do so, applications |
54 | call <constant> VIDIOC_QUERY_DV_PRESET</constant> with a pointer to a | 58 | call <constant> VIDIOC_QUERY_DV_PRESET</constant> with a pointer to a |