OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[media] m5mols: Add exposure metering control

Browse Source 
This patch adds V4L2_CID_EXPOSURE_METERING control which allows
to select the light metering mode for automatic exposure as one
of the following modes: spot (small area at the frame center),
center weighted and frame averaged.

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>
This commit is contained in:
Sylwester Nawrocki 2012-04-09 14:51:49 -03:00 committed by Mauro Carvalho Chehab
parent efcb07c1bb
commit 50d3f93e39
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/video/m5mols/m5mols.h
View File

@ -163,6 +163,7 @@ struct m5mols_version {
* @auto_exposure: auto/manual exposure control
* @exposure_bias: exposure compensation control
* @exposure: manual exposure control
* @metering: exposure metering control
* @auto_iso: auto/manual ISO sensitivity control
* @iso: manual ISO sensitivity control
* @auto_wb: auto white balance control
@ -198,6 +199,7 @@ struct m5mols_info {
struct v4l2_ctrl *auto_exposure;
struct v4l2_ctrl *exposure_bias;
struct v4l2_ctrl *exposure;
struct v4l2_ctrl *metering;
};
struct {
/* iso/auto iso cluster */

34
drivers/media/video/m5mols/m5mols_controls.c
View File

@ -227,7 +227,25 @@ int m5mols_lock_3a(struct m5mols_info *info, bool lock)
return ret;
}
/* Set exposure/auto exposure cluster */
static int m5mols_set_metering_mode(struct m5mols_info *info, int mode)
{
unsigned int metering;
switch (mode) {
case V4L2_EXPOSURE_METERING_CENTER_WEIGHTED:
metering = REG_AE_CENTER;
break;
case V4L2_EXPOSURE_METERING_SPOT:
metering = REG_AE_SPOT;
break;
default:
metering = REG_AE_ALL;
break;
}
return m5mols_write(&info->sd, AE_MODE, metering);
}
static int m5mols_set_exposure(struct m5mols_info *info, int exposure)
{
struct v4l2_subdev *sd = &info->sd;
@ -238,12 +256,14 @@ static int m5mols_set_exposure(struct m5mols_info *info, int exposure)
return ret;
if (exposure == V4L2_EXPOSURE_AUTO) {
ret = m5mols_write(sd, AE_MODE, REG_AE_ALL);
ret = m5mols_set_metering_mode(info, info->metering->val);
if (ret < 0)
return ret;
v4l2_dbg(1, m5mols_debug, sd, "%s: exposure bias: %#x\n",
__func__, info->exposure_bias->val);
v4l2_dbg(1, m5mols_debug, sd,
"%s: exposure bias: %#x, metering: %#x\n",
__func__, info->exposure_bias->val,
info->metering->val);
return m5mols_write(sd, AE_INDEX, info->exposure_bias->val);
}
@ -532,6 +552,10 @@ int m5mols_init_controls(struct v4l2_subdev *sd)
ARRAY_SIZE(ev_bias_qmenu)/2 - 1,
ev_bias_qmenu);
info->metering = v4l2_ctrl_new_std_menu(&info->handle,
&m5mols_ctrl_ops, V4L2_CID_EXPOSURE_METERING,
2, ~0x7, V4L2_EXPOSURE_METERING_AVERAGE);
/* ISO control cluster */
info->auto_iso = v4l2_ctrl_new_std_menu(&info->handle, &m5mols_ctrl_ops,
V4L2_CID_ISO_SENSITIVITY_AUTO, 1, ~0x03, 1);
@ -562,7 +586,7 @@ int m5mols_init_controls(struct v4l2_subdev *sd)
return ret;
}
v4l2_ctrl_auto_cluster(3, &info->auto_exposure, 1, false);
v4l2_ctrl_auto_cluster(4, &info->auto_exposure, 1, false);
info->auto_iso->flags |= V4L2_CTRL_FLAG_VOLATILE |
V4L2_CTRL_FLAG_UPDATE;
v4l2_ctrl_auto_cluster(2, &info->auto_iso, 0, false);