V4L/DVB: v4l: Add V4L2_CID_IRIS_ABSOLUTE and V4L2_CID_IRIS_RELATIVE controls

[safe/jmp/linux-2.6] / Documentation / DocBook / v4l / controls.xml

diff --git a/Documentation/DocBook/v4l/controls.xml b/Documentation/DocBook/v4l/controls.xml
index f492acc..7e0c687 100644 (file)
--- a/Documentation/DocBook/v4l/controls.xml
+++ b/Documentation/DocBook/v4l/controls.xml
@@ -267,6 +267,12 @@ minimum value disables backlight compensation.</entry>
            <entry>Chroma automatic gain control.</entry>
          </row>
          <row>
+           <entry><constant>V4L2_CID_CHROMA_GAIN</constant></entry>
+           <entry>integer</entry>
+           <entry>Adjusts the Chroma gain control (for use when chroma AGC
+           is disabled).</entry>
+         </row>
+         <row>
            <entry><constant>V4L2_CID_COLOR_KILLER</constant></entry>
            <entry>boolean</entry>
            <entry>Enable the color killer (&ie; force a black &amp; white image in case of a weak video signal).</entry>
@@ -281,10 +287,28 @@ minimum value disables backlight compensation.</entry>
 <constant>V4L2_COLORFX_SEPIA</constant> (2).</entry>
          </row>
          <row>
+           <entry><constant>V4L2_CID_ROTATE</constant></entry>
+           <entry>integer</entry>
+           <entry>Rotates the image by specified angle. Common angles are 90,
+           270 and 180. Rotating the image to 90 and 270 will reverse the height
+           and width of the display window. It is necessary to set the new height and
+           width of the picture using the &VIDIOC-S-FMT; ioctl according to
+           the rotation angle selected.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_BG_COLOR</constant></entry>
+           <entry>integer</entry>
+           <entry>Sets the background color on the current output device.
+           Background color needs to be specified in the RGB24 format. The
+           supplied 32 bit value is interpreted as bits 0-7 Red color information,
+           bits 8-15 Green color information, bits 16-23 Blue color
+           information and bits 24-31 must be zero.</entry>
+         </row>
+         <row>
            <entry><constant>V4L2_CID_LASTP1</constant></entry>
            <entry></entry>
            <entry>End of the predefined control IDs (currently
-<constant>V4L2_CID_COLORFX</constant> + 1).</entry>
+<constant>V4L2_CID_BG_COLOR</constant> + 1).</entry>
          </row>
          <row>
            <entry><constant>V4L2_CID_PRIVATE_BASE</constant></entry>
@@ -1807,6 +1831,25 @@ wide-angle direction. The zoom speed unit is driver-specific.</entry>
          <row><entry></entry></row>
 
          <row>
+           <entry spanname="id"><constant>V4L2_CID_IRIS_ABSOLUTE</constant>&nbsp;</entry>
+           <entry>integer</entry>
+         </row><row><entry spanname="descr">This control sets the
+camera's aperture to the specified value. The unit is undefined.
+Larger values open the iris wider, smaller values close it.</entry>
+         </row>
+         <row><entry></entry></row>
+
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_IRIS_RELATIVE</constant>&nbsp;</entry>
+           <entry>integer</entry>
+         </row><row><entry spanname="descr">This control modifies the
+camera's aperture by the specified amount. The unit is undefined.
+Positive values open the iris one step further, negative values close
+it one step further. This is a write-only control.</entry>
+         </row>
+         <row><entry></entry></row>
+
+         <row>
            <entry spanname="id"><constant>V4L2_CID_PRIVACY</constant>&nbsp;</entry>
            <entry>boolean</entry>
          </row><row><entry spanname="descr">Prevent video from being acquired