Hi Sylwaster, Thanks for the patch. I noticed your pull req; I hope you could take into account a few more comments. :) On Thu, May 10, 2012 at 12:30:38PM +0200, Sylwester Nawrocki wrote: > This patch adds V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE control which is > an extended version of the V4L2_CID_AUTO_WHITE_BALANCE control, > including white balance presets. The following presets are defined: > > - V4L2_WHITE_BALANCE_INCANDESCENT, > - V4L2_WHITE_BALANCE_FLUORESCENT, > - V4L2_WHITE_BALANCE_FLUORESCENT_H, > - V4L2_WHITE_BALANCE_HORIZON, > - V4L2_WHITE_BALANCE_DAYLIGHT, > - V4L2_WHITE_BALANCE_FLASH, > - V4L2_WHITE_BALANCE_CLOUDY, > - V4L2_WHITE_BALANCE_SHADE. > > Signed-off-by: HeungJun Kim <riverful.kim@xxxxxxxxxxx> > Signed-off-by: Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx> > Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx> > Acked-by: Hans de Goede <hdegoede@xxxxxxxxxx> > --- > Documentation/DocBook/media/v4l/controls.xml | 70 ++++++++++++++++++++++++++ > drivers/media/video/v4l2-ctrls.c | 17 +++++++ > include/linux/videodev2.h | 14 ++++++ > 3 files changed, 101 insertions(+) > > diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml > index 40e6485..85d1ca0 100644 > --- a/Documentation/DocBook/media/v4l/controls.xml > +++ b/Documentation/DocBook/media/v4l/controls.xml > @@ -3022,6 +3022,76 @@ camera sensor on or off, or specify its strength. Such band-stop filters can > be used, for example, to filter out the fluorescent light component.</entry> > </row> > <row><entry></entry></row> > + > + <row id="v4l2-auto-n-preset-white-balance"> > + <entry spanname="id"><constant>V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE</constant> </entry> > + <entry>enum v4l2_auto_n_preset_white_balance</entry> > + </row><row><entry spanname="descr">Sets white balance to automatic, > +manual or a preset. The presets determine color temperature of the light as > +a hint to the camera for white balance adjustments resulting in most accurate > +color representation. The following white balance presets are listed in order > +of increasing color temperature.</entry> > + </row> > + <row> > + <entrytbl spanname="descr" cols="2"> > + <tbody valign="top"> > + <row> > + <entry><constant>V4L2_WHITE_BALANCE_MANUAL</constant> </entry> > + <entry>Manual white balance.</entry> > + </row> > + <row> > + <entry><constant>V4L2_WHITE_BALANCE_AUTO</constant> </entry> > + <entry>Automatic white balance adjustments.</entry> > + </row> > + <row> > + <entry><constant>V4L2_WHITE_BALANCE_INCANDESCENT</constant> </entry> > + <entry>White balance setting for incandescent (tungsten) lighting. > +It generally cools down the colors and corresponds approximately to 2500...3500 K > +color temperature range.</entry> > + </row> > + <row> > + <entry><constant>V4L2_WHITE_BALANCE_FLUORESCENT</constant> </entry> > + <entry>White balance preset for fluorescent lighting. > +It corresponds approximately to 4000...5000 K color temperature.</entry> > + </row> > + <row> > + <entry><constant>V4L2_WHITE_BALANCE_FLUORESCENT_H</constant> </entry> > + <entry>With this setting the camera will compensate for > +fluorescent H lighting.</entry> > + </row> I don't remember for quite sure if I replied to this already... what's the diff between the above two? The colour temperature of the fluorescent light depends on the lamp; 2500 K is not uncommon here in Finland. It's the spectrum that's different from incandescents, not necessarily the colour temperature. > + <row> > + <entry><constant>V4L2_WHITE_BALANCE_HORIZON</constant> </entry> > + <entry>White balance setting for horizon daylight. > +It corresponds approximately to 5000 K color temperature.</entry> > + </row> > + <row> > + <entry><constant>V4L2_WHITE_BALANCE_DAYLIGHT</constant> </entry> > + <entry>White balance preset for daylight (with clear sky). > +It corresponds approximately to 5000...6500 K color temperature.</entry> > + </row> > + <row> > + <entry><constant>V4L2_WHITE_BALANCE_FLASH</constant> </entry> > + <entry>With this setting the camera will compensate for the flash > +light. It slightly warms up the colors and corresponds roughly to 5000...5500 K > +color temperature.</entry> This also depends heavily on the type of the flash. I'd just remove the colour temperature from most of these since it looks more like assumptions made in a particular system rather than something generic. Kind regards, -- Sakari Ailus e-mail: sakari.ailus@xxxxxx jabber/XMPP/Gmail: sailus@xxxxxxxxxxxxxx -- 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
