Hi Frank,
On Friday 19 March 2010 16:26:12 Frank Schaefer wrote:
> Laurent Pinchart schrieb:
> > Those control, as their names imply, control the camera aperture
> > settings.
> >
> > Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> > ---
> >
> > Documentation/DocBook/v4l/compat.xml | 11 +++++++++++
> > Documentation/DocBook/v4l/controls.xml | 19 +++++++++++++++++++
> > Documentation/DocBook/v4l/videodev2.h.xml | 3 +++
> > include/linux/videodev2.h | 3 +++
> > 4 files changed, 36 insertions(+), 0 deletions(-)
> >
> > diff --git a/Documentation/DocBook/v4l/compat.xml
> > b/Documentation/DocBook/v4l/compat.xml index b9dbdf9..854235b 100644
> > --- a/Documentation/DocBook/v4l/compat.xml
> > +++ b/Documentation/DocBook/v4l/compat.xml
> > @@ -2332,6 +2332,17 @@ more information.</para>
> >
> > </listitem>
> >
> > </orderedlist>
> >
> > </section>
> >
> > + <section>
> > + <title>V4L2 in Linux 2.6.34</title>
> > + <orderedlist>
> > + <listitem>
> > + <para>Added
> > +<constant>V4L2_CID_IRIS_ABSOLUTE</constant> and
> > +<constant>V4L2_CID_IRIS_RELATIVE</constant> controls to the
> > + <link linkend="camera-controls">Camera controls class</link>.
> > + </para>
> > + </listitem>
> > + </orderedlist>
> >
> > </section>
> >
> > <section id="other">
> >
> > diff --git a/Documentation/DocBook/v4l/controls.xml
> > b/Documentation/DocBook/v4l/controls.xml index f464506..e47999d 100644
> > --- a/Documentation/DocBook/v4l/controls.xml
> > +++ b/Documentation/DocBook/v4l/controls.xml
> > @@ -1825,6 +1825,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> </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> </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> </entry>
> > <entry>boolean</entry>
> >
> > </row><row><entry spanname="descr">Prevent video from being acquired
> >
> > diff --git a/Documentation/DocBook/v4l/videodev2.h.xml
> > b/Documentation/DocBook/v4l/videodev2.h.xml index 0683259..c18dfeb
> > 100644
> > --- a/Documentation/DocBook/v4l/videodev2.h.xml
> > +++ b/Documentation/DocBook/v4l/videodev2.h.xml
> > @@ -1271,6 +1271,9 @@ enum <link
> > linkend="v4l2-exposure-auto-type">v4l2_exposure_auto_type</link> {
> >
> > #define V4L2_CID_PRIVACY
> > (V4L2_CID_CAMERA_CLASS_BASE+16)
> >
> > +#define V4L2_CID_IRIS_ABSOLUTE
> > (V4L2_CID_CAMERA_CLASS_BASE+17) +#define V4L2_CID_IRIS_RELATIVE
> > (V4L2_CID_CAMERA_CLASS_BASE+18) +
> >
> > /* FM Modulator class control IDs */
> > #define V4L2_CID_FM_TX_CLASS_BASE (V4L2_CTRL_CLASS_FM_TX |
> > 0x900) #define V4L2_CID_FM_TX_CLASS
> > (V4L2_CTRL_CLASS_FM_TX | 1)
> >
> > diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
> > index 3c26560..c9d2120 100644
> > --- a/include/linux/videodev2.h
> > +++ b/include/linux/videodev2.h
> > @@ -1277,6 +1277,9 @@ enum v4l2_exposure_auto_type {
> >
> > #define V4L2_CID_PRIVACY (V4L2_CID_CAMERA_CLASS_BASE+16)
> >
> > +#define V4L2_CID_IRIS_ABSOLUTE (V4L2_CID_CAMERA_CLASS_BASE+17)
> > +#define V4L2_CID_IRIS_RELATIVE (V4L2_CID_CAMERA_CLASS_BASE+18)
> > +
> >
> > /* FM Modulator class control IDs */
> > #define V4L2_CID_FM_TX_CLASS_BASE (V4L2_CTRL_CLASS_FM_TX | 0x900)
> > #define V4L2_CID_FM_TX_CLASS (V4L2_CTRL_CLASS_FM_TX | 1)
>
> Please also add proper titles to v4l2_ctrl_get_name() in v4l2-common.c.
Very good point. I'll resubmit the patches.
--
Regards,
Laurent Pinchart
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
