Merge branch 'patches_for_v3.6' into v4l_for_linus

[linux-2.6-microblaze.git] / Documentation / DocBook / media / v4l / compat.xml

diff --git a/Documentation/DocBook/media/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml
index bce97c5..97b8951 100644 (file)
--- a/Documentation/DocBook/media/v4l/compat.xml
+++ b/Documentation/DocBook/media/v4l/compat.xml
@@ -2377,10 +2377,11 @@ that used it. It was originally scheduled for removal in 2.6.35.
          <para>V4L2_CTRL_FLAG_VOLATILE was added to signal volatile controls to userspace.</para>
         </listitem>
         <listitem>
-         <para>Add selection API for extended control over cropping and
-composing. Does not affect the compatibility of current drivers and
-applications.  See <link linkend="selection-api"> selection API </link> for
-details.</para>
+         <para>Add selection API for extended control over cropping
+         and composing. Does not affect the compatibility of current
+         drivers and applications. See <link
+         linkend="selection-api"> selection API </link> for
+         details.</para>
         </listitem>
       </orderedlist>
     </section>
@@ -2407,6 +2408,66 @@ details.</para>
          <para>Added <link linkend="jpeg-controls">JPEG compression control
          class</link>.</para>
         </listitem>
+        <listitem>
+         <para>Extended the DV Timings API:
+         &VIDIOC-ENUM-DV-TIMINGS;, &VIDIOC-QUERY-DV-TIMINGS; and
+         &VIDIOC-DV-TIMINGS-CAP;.</para>
+        </listitem>
+      </orderedlist>
+    </section>
+
+    <section>
+      <title>V4L2 in Linux 3.5</title>
+      <orderedlist>
+        <listitem>
+         <para>Added integer menus, the new type will be
+         V4L2_CTRL_TYPE_INTEGER_MENU.</para>
+        </listitem>
+        <listitem>
+         <para>Added selection API for V4L2 subdev interface:
+         &VIDIOC-SUBDEV-G-SELECTION; and
+         &VIDIOC-SUBDEV-S-SELECTION;.</para>
+        </listitem>
+        <listitem>
+         <para> Added <constant>V4L2_COLORFX_ANTIQUE</constant>,
+         <constant>V4L2_COLORFX_ART_FREEZE</constant>,
+         <constant>V4L2_COLORFX_AQUA</constant>,
+         <constant>V4L2_COLORFX_SILHOUETTE</constant>,
+         <constant>V4L2_COLORFX_SOLARIZATION</constant>,
+         <constant>V4L2_COLORFX_VIVID</constant> and
+         <constant>V4L2_COLORFX_ARBITRARY_CBCR</constant> menu items
+         to the <constant>V4L2_CID_COLORFX</constant> control.</para>
+        </listitem>
+        <listitem>
+         <para> Added <constant>V4L2_CID_COLORFX_CBCR</constant> control.</para>
+        </listitem>
+        <listitem>
+         <para> Added camera controls <constant>V4L2_CID_AUTO_EXPOSURE_BIAS</constant>,
+         <constant>V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE</constant>,
+         <constant>V4L2_CID_IMAGE_STABILIZATION</constant>,
+         <constant>V4L2_CID_ISO_SENSITIVITY</constant>,
+         <constant>V4L2_CID_ISO_SENSITIVITY_AUTO</constant>,
+         <constant>V4L2_CID_EXPOSURE_METERING</constant>,
+         <constant>V4L2_CID_SCENE_MODE</constant>,
+         <constant>V4L2_CID_3A_LOCK</constant>,
+         <constant>V4L2_CID_AUTO_FOCUS_START</constant>,
+         <constant>V4L2_CID_AUTO_FOCUS_STOP</constant>,
+         <constant>V4L2_CID_AUTO_FOCUS_STATUS</constant> and
+         <constant>V4L2_CID_AUTO_FOCUS_RANGE</constant>.
+         </para>
+        </listitem>
+      </orderedlist>
+    </section>
+
+    <section>
+      <title>V4L2 in Linux 3.5</title>
+      <orderedlist>
+       <listitem>
+         <para>Replaced <structfield>input</structfield> in
+         <structname>v4l2_buffer</structname> by
+         <structfield>reserved2</structfield> and removed
+         <constant>V4L2_BUF_FLAG_INPUT</constant>.</para>
+       </listitem>
       </orderedlist>
     </section>
 
@@ -2505,6 +2566,10 @@ and may change in the future.</para>
         </listitem>
         <listitem>
          <para>&VIDIOC-ENCODER-CMD; and &VIDIOC-TRY-ENCODER-CMD;
+ioctls.</para>
+        </listitem>
+        <listitem>
+         <para>&VIDIOC-DECODER-CMD; and &VIDIOC-TRY-DECODER-CMD;
 ioctls.</para>
         </listitem>
         <listitem>
@@ -2514,6 +2579,10 @@ ioctls.</para>
         <listitem>
          <para>&VIDIOC-DBG-G-CHIP-IDENT; ioctl.</para>
         </listitem>
+        <listitem>
+         <para>&VIDIOC-ENUM-DV-TIMINGS;, &VIDIOC-QUERY-DV-TIMINGS; and
+         &VIDIOC-DV-TIMINGS-CAP; ioctls.</para>
+        </listitem>
         <listitem>
          <para>Flash API. <xref linkend="flash-controls" /></para>
         </listitem>
@@ -2523,6 +2592,14 @@ ioctls.</para>
         <listitem>
          <para>Selection API. <xref linkend="selection-api" /></para>
         </listitem>
+        <listitem>
+         <para>Sub-device selection API: &VIDIOC-SUBDEV-G-SELECTION;
+         and &VIDIOC-SUBDEV-S-SELECTION; ioctls.</para>
+        </listitem>
+        <listitem>
+         <para><link linkend="v4l2-auto-focus-area"><constant>
+         V4L2_CID_AUTO_FOCUS_AREA</constant></link> control.</para>
+        </listitem>
       </itemizedlist>
     </section>
 
@@ -2538,6 +2615,17 @@ interfaces and should not be implemented in new drivers.</para>
 <constant>VIDIOC_S_MPEGCOMP</constant> ioctls. Use Extended Controls,
 <xref linkend="extended-controls" />.</para>
         </listitem>
+        <listitem>
+         <para>&VIDIOC-G-DV-PRESET;, &VIDIOC-S-DV-PRESET;, &VIDIOC-ENUM-DV-PRESETS; and
+         &VIDIOC-QUERY-DV-PRESET; ioctls. Use the DV Timings API (<xref linkend="dv-timings" />).</para>
+        </listitem>
+        <listitem>
+         <para><constant>VIDIOC_SUBDEV_G_CROP</constant> and
+         <constant>VIDIOC_SUBDEV_S_CROP</constant> ioctls. Use
+         <constant>VIDIOC_SUBDEV_G_SELECTION</constant> and
+         <constant>VIDIOC_SUBDEV_S_SELECTION</constant>, <xref
+         linkend="vidioc-subdev-g-selection" />.</para>
+        </listitem>
       </itemizedlist>
     </section>
   </section>