It adds the new CID for setting Anti-shake. 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 | 11 +++++++++++ drivers/media/video/v4l2-ctrls.c | 2 ++ include/linux/videodev2.h | 1 + 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml index bed6c66..73ff05c 100644 --- a/Documentation/DocBook/media/v4l/controls.xml +++ b/Documentation/DocBook/media/v4l/controls.xml @@ -2970,6 +2970,17 @@ it one step further. This is a write-only control.</entry> </row> <row> + <entry spanname="id"><constant>V4L2_CID_ANTISHAKE</constant></entry> + <entry>button</entry> + </row> + <row> + <entry spanname="descr">Anti-Shake. It makes + the image be more stabilized from the image's shakeness. + 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 66110bc..05ff6bb 100644 --- a/drivers/media/video/v4l2-ctrls.c +++ b/drivers/media/video/v4l2-ctrls.c @@ -599,6 +599,7 @@ const char *v4l2_ctrl_get_name(u32 id) case V4L2_CID_PRESET_WHITE_BALANCE: return "White Balance, Preset"; case V4L2_CID_SCENEMODE: return "Scenemode"; case V4L2_CID_WDR: return "Wide Dynamic Range"; + case V4L2_CID_ANTISHAKE: return "Antishake"; /* FM Radio Modulator control */ /* Keep the order of the 'case's the same as in videodev2.h! */ @@ -689,6 +690,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type, case V4L2_CID_PAN_RESET: case V4L2_CID_TILT_RESET: case V4L2_CID_WDR: + case V4L2_CID_ANTISHAKE: 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 f85ad6c..ddd775f 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -1647,6 +1647,7 @@ enum v4l2_scenemode { }; #define V4L2_CID_WDR (V4L2_CID_CAMERA_CLASS_BASE+21) +#define V4L2_CID_ANTISHAKE (V4L2_CID_CAMERA_CLASS_BASE+22) /* FM Modulator class control IDs */ #define V4L2_CID_FM_TX_CLASS_BASE (V4L2_CTRL_CLASS_FM_TX | 0x900) -- 1.7.4.1 -- 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