* [PATCH 0/2] Add iris absolute and relative control CIDs @ 2010-03-18 11:55 Laurent Pinchart 2010-03-18 11:55 ` [PATCH 1/2] v4l: Add V4L2_CID_IRIS_ABSOLUTE and V4L2_CID_IRIS_RELATIVE controls Laurent Pinchart 2010-03-18 11:55 ` [PATCH 2/2] uvcvideo: Support iris absolute and relative controls Laurent Pinchart 0 siblings, 2 replies; 11+ messages in thread From: Laurent Pinchart @ 2010-03-18 11:55 UTC (permalink / raw) To: linux-media Hi everybody, Here's a patch set that add two new standard V4L2 CIDs to control aperture setting on cameras. The first patch adds the control definitions (including documentation update) while the second patch adds support for those controls in the uvcvideo driver. I can send a pull request for those after the CIDs definitions patch has been reviewed. Laurent Pinchart (2): v4l: Add V4L2_CID_IRIS_ABSOLUTE and V4L2_CID_IRIS_RELATIVE controls uvcvideo: Support iris absolute and relative controls Documentation/DocBook/v4l/compat.xml | 11 +++++++++++ Documentation/DocBook/v4l/controls.xml | 19 +++++++++++++++++++ Documentation/DocBook/v4l/videodev2.h.xml | 3 +++ drivers/media/video/uvc/uvc_ctrl.c | 20 ++++++++++++++++++++ include/linux/videodev2.h | 3 +++ 5 files changed, 56 insertions(+), 0 deletions(-) -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/2] v4l: Add V4L2_CID_IRIS_ABSOLUTE and V4L2_CID_IRIS_RELATIVE controls 2010-03-18 11:55 [PATCH 0/2] Add iris absolute and relative control CIDs Laurent Pinchart @ 2010-03-18 11:55 ` Laurent Pinchart 2010-03-18 12:19 ` Mauro Carvalho Chehab 2010-03-18 12:19 ` Aguirre, Sergio 2010-03-18 11:55 ` [PATCH 2/2] uvcvideo: Support iris absolute and relative controls Laurent Pinchart 1 sibling, 2 replies; 11+ messages in thread From: Laurent Pinchart @ 2010-03-18 11:55 UTC (permalink / raw) To: linux-media Those control, as their names imply, control the camera aperture settings. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- 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..c412e89 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 aperture's to the specified value. The unit is undefined. +Positive values open the iris, negative 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 aperture's 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) -- 1.6.4.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] v4l: Add V4L2_CID_IRIS_ABSOLUTE and V4L2_CID_IRIS_RELATIVE controls 2010-03-18 11:55 ` [PATCH 1/2] v4l: Add V4L2_CID_IRIS_ABSOLUTE and V4L2_CID_IRIS_RELATIVE controls Laurent Pinchart @ 2010-03-18 12:19 ` Mauro Carvalho Chehab 2010-03-18 12:33 ` Laurent Pinchart 2010-03-18 12:19 ` Aguirre, Sergio 1 sibling, 1 reply; 11+ messages in thread From: Mauro Carvalho Chehab @ 2010-03-18 12:19 UTC (permalink / raw) To: Laurent Pinchart; +Cc: linux-media Laurent Pinchart wrote: > Those control, as their names imply, control the camera aperture > settings. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > 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..c412e89 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 aperture's to the specified value. The unit is undefined. > +Positive values open the iris, negative 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 aperture's 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 Seems ok to me, but it would be good to add some sort of scale for those controls. Cheers, Mauro ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] v4l: Add V4L2_CID_IRIS_ABSOLUTE and V4L2_CID_IRIS_RELATIVE controls 2010-03-18 12:19 ` Mauro Carvalho Chehab @ 2010-03-18 12:33 ` Laurent Pinchart 2010-03-18 12:41 ` Mauro Carvalho Chehab 0 siblings, 1 reply; 11+ messages in thread From: Laurent Pinchart @ 2010-03-18 12:33 UTC (permalink / raw) To: Mauro Carvalho Chehab; +Cc: linux-media Hi Mauro, On Thursday 18 March 2010 13:19:57 Mauro Carvalho Chehab wrote: > Laurent Pinchart wrote: > > Those control, as their names imply, control the camera aperture > > settings. > > > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > --- > > > > 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..c412e89 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 aperture's to the specified value. The unit is undefined. > > +Positive values open the iris, negative 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 aperture's 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 > > Seems ok to me, but it would be good to add some sort of scale for those > controls. I'd love to, but most iris controllers will just let you specify a value in an arbitrary scale (0 for closed, 255 for fully opened for instance). In that case do we want to force driver developers to measure the aperture in µm units with a micrometer caliper ? :-) -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] v4l: Add V4L2_CID_IRIS_ABSOLUTE and V4L2_CID_IRIS_RELATIVE controls 2010-03-18 12:33 ` Laurent Pinchart @ 2010-03-18 12:41 ` Mauro Carvalho Chehab 2010-03-18 12:50 ` Laurent Pinchart 0 siblings, 1 reply; 11+ messages in thread From: Mauro Carvalho Chehab @ 2010-03-18 12:41 UTC (permalink / raw) To: Laurent Pinchart; +Cc: linux-media Laurent Pinchart wrote: > Hi Mauro, > > On Thursday 18 March 2010 13:19:57 Mauro Carvalho Chehab wrote: >> Laurent Pinchart wrote: >>> Those control, as their names imply, control the camera aperture >>> settings. >>> >>> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> >>> --- >>> >>> 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..c412e89 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 aperture's to the specified value. The unit is undefined. >>> +Positive values open the iris, negative 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 aperture's 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 >> Seems ok to me, but it would be good to add some sort of scale for those >> controls. > > I'd love to, but most iris controllers will just let you specify a value in an > arbitrary scale (0 for closed, 255 for fully opened for instance). In that > case do we want to force driver developers to measure the aperture in µm units > with a micrometer caliper ? :-) :) Well, maybe then you could just comment that higher values means more opened apertures. -- Cheers, Mauro ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] v4l: Add V4L2_CID_IRIS_ABSOLUTE and V4L2_CID_IRIS_RELATIVE controls 2010-03-18 12:41 ` Mauro Carvalho Chehab @ 2010-03-18 12:50 ` Laurent Pinchart 2010-03-18 12:51 ` Laurent Pinchart 0 siblings, 1 reply; 11+ messages in thread From: Laurent Pinchart @ 2010-03-18 12:50 UTC (permalink / raw) To: Mauro Carvalho Chehab; +Cc: linux-media Hi Mauro, On Thursday 18 March 2010 13:41:36 Mauro Carvalho Chehab wrote: > Laurent Pinchart wrote: > > On Thursday 18 March 2010 13:19:57 Mauro Carvalho Chehab wrote: > >> Laurent Pinchart wrote: > >>> Those control, as their names imply, control the camera aperture > >>> settings. > >>> > >>> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > >>> --- > >>> > >>> 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..c412e89 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 aperture's to the specified value. The unit is undefined. > >>> +Positive values open the iris, negative 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 aperture's 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 > >> > >> Seems ok to me, but it would be good to add some sort of scale for those > >> controls. > > > > I'd love to, but most iris controllers will just let you specify a value > > in an arbitrary scale (0 for closed, 255 for fully opened for instance). > > In that case do we want to force driver developers to measure the > > aperture in µm units with a micrometer caliper ? :-) > : > :) > > Well, maybe then you could just comment that higher values means more > opened apertures. Could point, I will do. -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] v4l: Add V4L2_CID_IRIS_ABSOLUTE and V4L2_CID_IRIS_RELATIVE controls 2010-03-18 12:50 ` Laurent Pinchart @ 2010-03-18 12:51 ` Laurent Pinchart 2010-03-18 17:04 ` Mauro Carvalho Chehab 0 siblings, 1 reply; 11+ messages in thread From: Laurent Pinchart @ 2010-03-18 12:51 UTC (permalink / raw) To: Mauro Carvalho Chehab; +Cc: linux-media Hi Mauro, On Thursday 18 March 2010 13:50:50 Laurent Pinchart wrote: > On Thursday 18 March 2010 13:41:36 Mauro Carvalho Chehab wrote: > > Laurent Pinchart wrote: > > > On Thursday 18 March 2010 13:19:57 Mauro Carvalho Chehab wrote: > > >> Laurent Pinchart wrote: > > >>> Those control, as their names imply, control the camera aperture > > >>> settings. > > >>> > > >>> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > >>> --- > > >>> > > >>> 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..c412e89 > > >>> 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> </entr > > >>> y> + <entry>integer</entry> > > >>> + </row><row><entry spanname="descr">This control sets the > > >>> +camera aperture's to the specified value. The unit is undefined. > > >>> +Positive values open the iris, negative close it.</entry> > > >>> + </row> > > >>> + <row><entry></entry></row> > > >>> + > > >>> + <row> > > >>> + <entry > > >>> spanname="id"><constant>V4L2_CID_IRIS_RELATIVE</constant> </entr > > >>> y> + <entry>integer</entry> > > >>> + </row><row><entry spanname="descr">This control modifies the > > >>> +camera aperture's 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> </entr > > >>> y> <entry>boolean</entry> > > >>> > > >>> </row><row><entry spanname="descr">Prevent video from being > > >>> acquired > > >> > > >> Seems ok to me, but it would be good to add some sort of scale for > > >> those controls. > > > > > > I'd love to, but most iris controllers will just let you specify a > > > value in an arbitrary scale (0 for closed, 255 for fully opened for > > > instance). In that case do we want to force driver developers to > > > measure the aperture in µm units with a micrometer caliper ? :-) > > : > > :) > > > > Well, maybe then you could just comment that higher values means more > > opened apertures. > > Could point, I will do. I spoke too fast, it's already there :-) -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] v4l: Add V4L2_CID_IRIS_ABSOLUTE and V4L2_CID_IRIS_RELATIVE controls 2010-03-18 12:51 ` Laurent Pinchart @ 2010-03-18 17:04 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 11+ messages in thread From: Mauro Carvalho Chehab @ 2010-03-18 17:04 UTC (permalink / raw) To: Laurent Pinchart; +Cc: linux-media Laurent Pinchart wrote: > Hi Mauro, > > On Thursday 18 March 2010 13:50:50 Laurent Pinchart wrote: >> On Thursday 18 March 2010 13:41:36 Mauro Carvalho Chehab wrote: >>> Laurent Pinchart wrote: >>>> On Thursday 18 March 2010 13:19:57 Mauro Carvalho Chehab wrote: >>>>> Laurent Pinchart wrote: >>>>>> Those control, as their names imply, control the camera aperture >>>>>> settings. >>>>>> >>>>>> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> >>>>>> --- >>>>>> >>>>>> 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..c412e89 >>>>>> 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> </entr >>>>>> y> + <entry>integer</entry> >>>>>> + </row><row><entry spanname="descr">This control sets the >>>>>> +camera aperture's to the specified value. The unit is undefined. >>>>>> +Positive values open the iris, negative close it.</entry> >>>>>> + </row> >>>>>> + <row><entry></entry></row> >>>>>> + >>>>>> + <row> >>>>>> + <entry >>>>>> spanname="id"><constant>V4L2_CID_IRIS_RELATIVE</constant> </entr >>>>>> y> + <entry>integer</entry> >>>>>> + </row><row><entry spanname="descr">This control modifies the >>>>>> +camera aperture's 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> </entr >>>>>> y> <entry>boolean</entry> >>>>>> >>>>>> </row><row><entry spanname="descr">Prevent video from being >>>>>> acquired >>>>> Seems ok to me, but it would be good to add some sort of scale for >>>>> those controls. >>>> I'd love to, but most iris controllers will just let you specify a >>>> value in an arbitrary scale (0 for closed, 255 for fully opened for >>>> instance). In that case do we want to force driver developers to >>>> measure the aperture in µm units with a micrometer caliper ? :-) >>> : >>> :) >>> >>> Well, maybe then you could just comment that higher values means more >>> opened apertures. >> Could point, I will do. > > I spoke too fast, it's already there :-) Oh. OK then ;) Cheers, Mauro ^ permalink raw reply [flat|nested] 11+ messages in thread
* RE: [PATCH 1/2] v4l: Add V4L2_CID_IRIS_ABSOLUTE and V4L2_CID_IRIS_RELATIVE controls 2010-03-18 11:55 ` [PATCH 1/2] v4l: Add V4L2_CID_IRIS_ABSOLUTE and V4L2_CID_IRIS_RELATIVE controls Laurent Pinchart 2010-03-18 12:19 ` Mauro Carvalho Chehab @ 2010-03-18 12:19 ` Aguirre, Sergio 2010-03-18 12:34 ` Laurent Pinchart 1 sibling, 1 reply; 11+ messages in thread From: Aguirre, Sergio @ 2010-03-18 12:19 UTC (permalink / raw) To: Laurent Pinchart, linux-media Hi Laurent, Just a minor grammar issue. > -----Original Message----- > From: linux-media-owner@vger.kernel.org [mailto:linux-media- > owner@vger.kernel.org] On Behalf Of Laurent Pinchart > Sent: Thursday, March 18, 2010 6:55 AM > To: linux-media@vger.kernel.org > Subject: [PATCH 1/2] v4l: Add V4L2_CID_IRIS_ABSOLUTE and > V4L2_CID_IRIS_RELATIVE controls > <snip> > > <section id="other"> > diff --git a/Documentation/DocBook/v4l/controls.xml > b/Documentation/DocBook/v4l/controls.xml > index f464506..c412e89 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 aperture's to the specified value. The unit is undefined. "camera's aperture" > +Positive values open the iris, negative 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 aperture's by the specified amount. The unit is undefined. "camera's aperture" Regards, Sergio <snip> ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] v4l: Add V4L2_CID_IRIS_ABSOLUTE and V4L2_CID_IRIS_RELATIVE controls 2010-03-18 12:19 ` Aguirre, Sergio @ 2010-03-18 12:34 ` Laurent Pinchart 0 siblings, 0 replies; 11+ messages in thread From: Laurent Pinchart @ 2010-03-18 12:34 UTC (permalink / raw) To: Aguirre, Sergio; +Cc: linux-media Hi Sergio, On Thursday 18 March 2010 13:19:57 Aguirre, Sergio wrote: > Hi Laurent, > > Just a minor grammar issue. Thanks. I'll resubmit a new version (or will send a pull request with that change if the current version is accepted). -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 2/2] uvcvideo: Support iris absolute and relative controls 2010-03-18 11:55 [PATCH 0/2] Add iris absolute and relative control CIDs Laurent Pinchart 2010-03-18 11:55 ` [PATCH 1/2] v4l: Add V4L2_CID_IRIS_ABSOLUTE and V4L2_CID_IRIS_RELATIVE controls Laurent Pinchart @ 2010-03-18 11:55 ` Laurent Pinchart 1 sibling, 0 replies; 11+ messages in thread From: Laurent Pinchart @ 2010-03-18 11:55 UTC (permalink / raw) To: linux-media Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- drivers/media/video/uvc/uvc_ctrl.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c index 3b2e780..3697d72 100644 --- a/drivers/media/video/uvc/uvc_ctrl.c +++ b/drivers/media/video/uvc/uvc_ctrl.c @@ -561,6 +561,26 @@ static struct uvc_control_mapping uvc_ctrl_mappings[] = { .data_type = UVC_CTRL_DATA_TYPE_BOOLEAN, }, { + .id = V4L2_CID_IRIS_ABSOLUTE, + .name = "Iris, Absolute", + .entity = UVC_GUID_UVC_CAMERA, + .selector = UVC_CT_IRIS_ABSOLUTE_CONTROL, + .size = 16, + .offset = 0, + .v4l2_type = V4L2_CTRL_TYPE_INTEGER, + .data_type = UVC_CTRL_DATA_TYPE_UNSIGNED, + }, + { + .id = V4L2_CID_IRIS_RELATIVE, + .name = "Iris, Relative", + .entity = UVC_GUID_UVC_CAMERA, + .selector = UVC_CT_IRIS_RELATIVE_CONTROL, + .size = 8, + .offset = 0, + .v4l2_type = V4L2_CTRL_TYPE_INTEGER, + .data_type = UVC_CTRL_DATA_TYPE_SIGNED, + }, + { .id = V4L2_CID_ZOOM_ABSOLUTE, .name = "Zoom, Absolute", .entity = UVC_GUID_UVC_CAMERA, -- 1.6.4.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2010-03-18 17:04 UTC | newest] Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2010-03-18 11:55 [PATCH 0/2] Add iris absolute and relative control CIDs Laurent Pinchart 2010-03-18 11:55 ` [PATCH 1/2] v4l: Add V4L2_CID_IRIS_ABSOLUTE and V4L2_CID_IRIS_RELATIVE controls Laurent Pinchart 2010-03-18 12:19 ` Mauro Carvalho Chehab 2010-03-18 12:33 ` Laurent Pinchart 2010-03-18 12:41 ` Mauro Carvalho Chehab 2010-03-18 12:50 ` Laurent Pinchart 2010-03-18 12:51 ` Laurent Pinchart 2010-03-18 17:04 ` Mauro Carvalho Chehab 2010-03-18 12:19 ` Aguirre, Sergio 2010-03-18 12:34 ` Laurent Pinchart 2010-03-18 11:55 ` [PATCH 2/2] uvcvideo: Support iris absolute and relative controls Laurent Pinchart
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.