diff options
Diffstat (limited to 'v4l2-spec')
| -rw-r--r-- | v4l2-spec/compat.sgml | 11 | ||||
| -rw-r--r-- | v4l2-spec/controls.sgml | 33 | ||||
| -rw-r--r-- | v4l2-spec/vidioc-queryctrl.sgml | 15 |
3 files changed, 46 insertions, 13 deletions
diff --git a/v4l2-spec/compat.sgml b/v4l2-spec/compat.sgml index 8c3177b22..94713023d 100644 --- a/v4l2-spec/compat.sgml +++ b/v4l2-spec/compat.sgml @@ -2281,6 +2281,17 @@ was renamed to <structname id=v4l2-chip-ident-old>v4l2_chip_ident_old</structnam <constant>V4L2_CID_ZOOM_CONTINUOUS</constant> and <constant>V4L2_CID_PRIVACY</constant>.</para> </listitem> + </orderedlist> + </section> + <section> + <title>V4L2 in Linux 2.6.30</title> + <orderedlist> + <listitem> + <para>New control flag <constant>V4L2_CTRL_FLAG_WRITE_ONLY</constant> was added.</para> + </listitem> + <listitem> + <para>New control <constant>V4L2_CID_COLORFX</constant> was added.</para> + </listitem> </orderedlist> </section> </section> diff --git a/v4l2-spec/controls.sgml b/v4l2-spec/controls.sgml index 0df57dcf7..477a97077 100644 --- a/v4l2-spec/controls.sgml +++ b/v4l2-spec/controls.sgml @@ -271,11 +271,20 @@ minimum value disables backlight compensation.</entry> <entry>boolean</entry> <entry>Enable the color killer (&ie; force a black & white image in case of a weak video signal).</entry> </row> + <row id="v4l2-colorfx"> + <entry><constant>V4L2_CID_COLORFX</constant></entry> + <entry>enum</entry> + <entry>Selects a color effect. Possible values for +<constant>enum v4l2_colorfx</constant> are: +<constant>V4L2_COLORFX_NONE</constant> (0), +<constant>V4L2_COLORFX_BW</constant> (1) and +<constant>V4L2_COLORFX_SEPIA</constant> (2).</entry> + </row> <row> <entry><constant>V4L2_CID_LASTP1</constant></entry> <entry></entry> <entry>End of the predefined control IDs (currently -<constant>V4L2_CID_COLOR_KILLER</constant> + 1).</entry> +<constant>V4L2_CID_COLORFX</constant> + 1).</entry> </row> <row> <entry><constant>V4L2_CID_PRIVATE_BASE</constant></entry> @@ -1679,7 +1688,7 @@ remain constant.</entry> camera horizontally by the specified amount. The unit is undefined. A positive value moves the camera to the right (clockwise when viewed from above), a negative value to the left. A value of zero does not -cause motion.</entry> +cause motion. This is a write-only control.</entry> </row> <row><entry></entry></row> @@ -1689,25 +1698,23 @@ cause motion.</entry> </row><row><entry spanname="descr">This control turns the camera vertically by the specified amount. The unit is undefined. A positive value moves the camera up, a negative value down. A value of -zero does not cause motion.</entry> +zero does not cause motion. This is a write-only control.</entry> </row> <row><entry></entry></row> <row> <entry spanname="id"><constant>V4L2_CID_PAN_RESET</constant> </entry> - <entry>boolean</entry> - </row><row><entry spanname="descr">When this control is set -to <constant>TRUE</constant> (1), the camera moves horizontally to the -default position.</entry> + <entry>button</entry> + </row><row><entry spanname="descr">When this control is set, +the camera moves horizontally to the default position.</entry> </row> <row><entry></entry></row> <row> <entry spanname="id"><constant>V4L2_CID_TILT_RESET</constant> </entry> - <entry>boolean</entry> - </row><row><entry spanname="descr">When this control is set -to <constant>TRUE</constant> (1), the camera moves vertically to the -default position.</entry> + <entry>button</entry> + </row><row><entry spanname="descr">When this control is set, +the camera moves vertically to the default position.</entry> </row> <row><entry></entry></row> @@ -1750,7 +1757,7 @@ negative values towards infinity.</entry> </row><row><entry spanname="descr">This control moves the focal point of the camera by the specified amount. The unit is undefined. Positive values move the focus closer to the camera, -negative values towards infinity.</entry> +negative values towards infinity. This is a write-only control.</entry> </row> <row><entry></entry></row> @@ -1778,7 +1785,7 @@ value should be a positive integer.</entry> </row><row><entry spanname="descr">Specify the objective lens focal length relatively to the current value. Positive values move the zoom lens group towards the telephoto direction, negative values towards the -wide-angle direction. The zoom unit is driver-specific.</entry> +wide-angle direction. The zoom unit is driver-specific. This is a write-only control.</entry> </row> <row><entry></entry></row> diff --git a/v4l2-spec/vidioc-queryctrl.sgml b/v4l2-spec/vidioc-queryctrl.sgml index 20c4147eb..9908a964d 100644 --- a/v4l2-spec/vidioc-queryctrl.sgml +++ b/v4l2-spec/vidioc-queryctrl.sgml @@ -361,6 +361,15 @@ control.</entry> <entry>A hint that this control is best represented as a slider-like element in a user interface.</entry> </row> + <row> + <entry><constant>V4L2_CTRL_FLAG_WRITE_ONLY</constant></entry> + <entry>0x0040</entry> + <entry>This control is permanently writable only. Any +attempt to read the control will result in an &EACCES; error code. This +flag is typically present for relative controls or action controls where +writing a value will cause the device to carry out a given action +(⪚ motor control) but no meaningful value can be returned.</entry> + </row> </tbody> </tgroup> </table> @@ -378,6 +387,12 @@ is invalid. The &v4l2-querymenu; <structfield>id</structfield> or <structfield>index</structfield> is invalid.</para> </listitem> </varlistentry> + <varlistentry> + <term><errorcode>EACCES</errorcode></term> + <listitem> + <para>An attempt was made to read a write-only control.</para> + </listitem> + </varlistentry> </variablelist> </refsect1> </refentry> |