aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/v4l2-ctrls.c
diff options
context:
space:
mode:
authorSylwester Nawrocki <s.nawrocki@samsung.com>2012-05-02 05:24:33 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-05-14 13:29:35 -0400
commitfc162a099e7b34bfe3501028c919ff5d43e5e3d3 (patch)
treeed3e60fe068ad65c5a8846c110852d86582095f8 /drivers/media/video/v4l2-ctrls.c
parent0bf6b7dc5fd1e60e93657d4fe4b3d788216b9d5e (diff)
[media] V4L: Add camera 3A lock control
The V4L2_CID_3A_LOCK bitmask control allows applications to pause or resume the automatic exposure, focus and wite balance adjustments. It can be used, for example, to lock the 3A adjustments right before a still image is captured, for pre-focus, etc. The applications can control each of the algorithms independently, through a corresponding control bit, if driver allows that. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/v4l2-ctrls.c')
-rw-r--r--drivers/media/video/v4l2-ctrls.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/v4l2-ctrls.c b/drivers/media/video/v4l2-ctrls.c
index d4dc8ba7b755..a47b29270ba3 100644
--- a/drivers/media/video/v4l2-ctrls.c
+++ b/drivers/media/video/v4l2-ctrls.c
@@ -661,6 +661,7 @@ const char *v4l2_ctrl_get_name(u32 id)
661 case V4L2_CID_ISO_SENSITIVITY_AUTO: return "ISO Sensitivity, Auto"; 661 case V4L2_CID_ISO_SENSITIVITY_AUTO: return "ISO Sensitivity, Auto";
662 case V4L2_CID_EXPOSURE_METERING: return "Exposure, Metering Mode"; 662 case V4L2_CID_EXPOSURE_METERING: return "Exposure, Metering Mode";
663 case V4L2_CID_SCENE_MODE: return "Scene Mode"; 663 case V4L2_CID_SCENE_MODE: return "Scene Mode";
664 case V4L2_CID_3A_LOCK: return "3A Lock";
664 665
665 /* FM Radio Modulator control */ 666 /* FM Radio Modulator control */
666 /* Keep the order of the 'case's the same as in videodev2.h! */ 667 /* Keep the order of the 'case's the same as in videodev2.h! */
@@ -849,6 +850,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
849 break; 850 break;
850 case V4L2_CID_FLASH_FAULT: 851 case V4L2_CID_FLASH_FAULT:
851 case V4L2_CID_JPEG_ACTIVE_MARKER: 852 case V4L2_CID_JPEG_ACTIVE_MARKER:
853 case V4L2_CID_3A_LOCK:
852 *type = V4L2_CTRL_TYPE_BITMASK; 854 *type = V4L2_CTRL_TYPE_BITMASK;
853 break; 855 break;
854 case V4L2_CID_MIN_BUFFERS_FOR_CAPTURE: 856 case V4L2_CID_MIN_BUFFERS_FOR_CAPTURE: