Hi HeungJun, On Wed, Dec 28, 2011 at 03:23:47PM +0900, HeungJun, Kim wrote: > It adds the new CID for setting White Balance Preset. This CID is provided as > button type. This can commands only if the camera turn on/off this function. > > Signed-off-by: HeungJun, Kim <riverful.kim@xxxxxxxxxxx> > Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx> > --- > Documentation/DocBook/media/v4l/controls.xml | 12 ++++++++++++ > drivers/media/video/v4l2-ctrls.c | 2 ++ > include/linux/videodev2.h | 2 ++ > 3 files changed, 16 insertions(+), 0 deletions(-) > > diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml > index afe1845..bed6c66 100644 > --- a/Documentation/DocBook/media/v4l/controls.xml > +++ b/Documentation/DocBook/media/v4l/controls.xml > @@ -2958,6 +2958,18 @@ it one step further. This is a write-only control.</entry> > <row><entry></entry></row> > > <row> > + <entry spanname="id"><constant>V4L2_CID_WDR</constant></entry> Just a simple comment: how about V4L2_CID_WIDE_DYNAMIC_RANGE instead? I dont't think it'd be too long. > + <entry>button</entry> > + </row> > + <row> > + <entry spanname="descr">Wide Dynamic Range. It makes > + the image be more clear by adjusting the image's intensity > + of the illumination. This function can be provided according to > + the capability of the hardware(sensor or AP's multimedia block). > + </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/drivers/media/video/v4l2-ctrls.c b/drivers/media/video/v4l2-ctrls.c > index fef58c2..66110bc 100644 > --- a/drivers/media/video/v4l2-ctrls.c > +++ b/drivers/media/video/v4l2-ctrls.c > @@ -598,6 +598,7 @@ const char *v4l2_ctrl_get_name(u32 id) > case V4L2_CID_IRIS_RELATIVE: return "Iris, Relative"; > case V4L2_CID_PRESET_WHITE_BALANCE: return "White Balance, Preset"; > case V4L2_CID_SCENEMODE: return "Scenemode"; > + case V4L2_CID_WDR: return "Wide Dynamic Range"; > > /* FM Radio Modulator control */ > /* Keep the order of the 'case's the same as in videodev2.h! */ > @@ -687,6 +688,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type, > break; > case V4L2_CID_PAN_RESET: > case V4L2_CID_TILT_RESET: > + case V4L2_CID_WDR: > case V4L2_CID_FLASH_STROBE: > case V4L2_CID_FLASH_STROBE_STOP: > *type = V4L2_CTRL_TYPE_BUTTON; > diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h > index bc14feb..f85ad6c 100644 > --- a/include/linux/videodev2.h > +++ b/include/linux/videodev2.h > @@ -1646,6 +1646,8 @@ enum v4l2_scenemode { > V4L2_SCENEMODE_CANDLE = 14, > }; > > +#define V4L2_CID_WDR (V4L2_CID_CAMERA_CLASS_BASE+21) > + > /* 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.7.4.1 > -- 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