diff options
| author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2012-02-28 10:29:01 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-14 19:34:30 +0200 |
| commit | dd9c471dd37c25127236dd36cd1f55c488228cf1 (patch) | |
| tree | fe764c9175e10678a43f94844a9fd76a0f57f20c | |
| parent | [media] m5mols: Add exposure metering control (diff) | |
| download | linux-dd9c471dd37c25127236dd36cd1f55c488228cf1.tar.xz linux-dd9c471dd37c25127236dd36cd1f55c488228cf1.zip | |
[media] m5mols: Add JPEG compression quality control
Add JPEG compression quality control for snapshot capture.
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>
| -rw-r--r-- | drivers/media/video/m5mols/m5mols.h | 2 | ||||
| -rw-r--r-- | drivers/media/video/m5mols/m5mols_controls.c | 10 | ||||
| -rw-r--r-- | drivers/media/video/m5mols/m5mols_reg.h | 1 |
3 files changed, 11 insertions, 2 deletions
diff --git a/drivers/media/video/m5mols/m5mols.h b/drivers/media/video/m5mols/m5mols.h index b7834654dc6c..00f8d3162bdc 100644 --- a/drivers/media/video/m5mols/m5mols.h +++ b/drivers/media/video/m5mols/m5mols.h @@ -172,6 +172,7 @@ struct m5mols_version { * @zoom: zoom control * @wdr: wide dynamic range control * @stabilization: image stabilization control + * @jpeg_quality: JPEG compression quality control * @ver: information of the version * @cap: the capture mode attributes * @power: current sensor's power status @@ -213,6 +214,7 @@ struct m5mols_info { struct v4l2_ctrl *zoom; struct v4l2_ctrl *wdr; struct v4l2_ctrl *stabilization; + struct v4l2_ctrl *jpeg_quality; struct m5mols_version ver; struct m5mols_capture cap; diff --git a/drivers/media/video/m5mols/m5mols_controls.c b/drivers/media/video/m5mols/m5mols_controls.c index ebc3a904b960..1c3b1e0a7bba 100644 --- a/drivers/media/video/m5mols/m5mols_controls.c +++ b/drivers/media/video/m5mols/m5mols_controls.c @@ -492,6 +492,10 @@ static int m5mols_s_ctrl(struct v4l2_ctrl *ctrl) case V4L2_CID_IMAGE_STABILIZATION: ret = m5mols_set_stabilization(info, ctrl->val); break; + + case V4L2_CID_JPEG_COMPRESSION_QUALITY: + ret = m5mols_write(sd, CAPP_JPEG_RATIO, ctrl->val); + break; } if (ret == 0 && info->mode != last_mode) @@ -530,8 +534,7 @@ int m5mols_init_controls(struct v4l2_subdev *sd) return ret; zoom_step = is_manufacturer(info, REG_SAMSUNG_OPTICS) ? 31 : 1; - - v4l2_ctrl_handler_init(&info->handle, 6); + v4l2_ctrl_handler_init(&info->handle, 20); info->auto_wb = v4l2_ctrl_new_std_menu(&info->handle, &m5mols_ctrl_ops, V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE, @@ -579,6 +582,9 @@ int m5mols_init_controls(struct v4l2_subdev *sd) info->stabilization = v4l2_ctrl_new_std(&info->handle, &m5mols_ctrl_ops, V4L2_CID_IMAGE_STABILIZATION, 0, 1, 1, 0); + info->jpeg_quality = v4l2_ctrl_new_std(&info->handle, &m5mols_ctrl_ops, + V4L2_CID_JPEG_COMPRESSION_QUALITY, 1, 100, 1, 80); + if (info->handle.error) { int ret = info->handle.error; v4l2_err(sd, "Failed to initialize controls: %d\n", ret); diff --git a/drivers/media/video/m5mols/m5mols_reg.h b/drivers/media/video/m5mols/m5mols_reg.h index ae4aced0f9b2..14d4be72aeff 100644 --- a/drivers/media/video/m5mols/m5mols_reg.h +++ b/drivers/media/video/m5mols/m5mols_reg.h @@ -310,6 +310,7 @@ #define REG_JPEG 0x10 #define CAPP_MAIN_IMAGE_SIZE I2C_REG(CAT_CAPT_PARM, 0x01, 1) +#define CAPP_JPEG_RATIO I2C_REG(CAT_CAPT_PARM, 0x17, 1) #define CAPP_MCC_MODE I2C_REG(CAT_CAPT_PARM, 0x1d, 1) #define REG_MCC_OFF 0x00 |