Commit fc39f46b authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab

[media] V4L: Add MATRIX option to V4L2_CID_EXPOSURE_METERING control

This patch adds a menu option to the V4L2_CID_EXPOSURE_METERING
control for multi-zone metering.
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 4163851f
...@@ -3142,6 +3142,13 @@ giving priority to the center of the metered area.</entry> ...@@ -3142,6 +3142,13 @@ giving priority to the center of the metered area.</entry>
<entry><constant>V4L2_EXPOSURE_METERING_SPOT</constant>&nbsp;</entry> <entry><constant>V4L2_EXPOSURE_METERING_SPOT</constant>&nbsp;</entry>
<entry>Measure only very small area at the center of the frame.</entry> <entry>Measure only very small area at the center of the frame.</entry>
</row> </row>
<row>
<entry><constant>V4L2_EXPOSURE_METERING_MATRIX</constant>&nbsp;</entry>
<entry>A multi-zone metering. The light intensity is measured
in several points of the frame and the the results are combined. The
algorithm of the zones selection and their significance in calculating the
final value is device dependant.</entry>
</row>
</tbody> </tbody>
</entrytbl> </entrytbl>
</row> </row>
......
...@@ -234,6 +234,7 @@ const char * const *v4l2_ctrl_get_menu(u32 id) ...@@ -234,6 +234,7 @@ const char * const *v4l2_ctrl_get_menu(u32 id)
"Average", "Average",
"Center Weighted", "Center Weighted",
"Spot", "Spot",
"Matrix",
NULL NULL
}; };
static const char * const camera_auto_focus_range[] = { static const char * const camera_auto_focus_range[] = {
......
...@@ -658,6 +658,7 @@ enum v4l2_exposure_metering { ...@@ -658,6 +658,7 @@ enum v4l2_exposure_metering {
V4L2_EXPOSURE_METERING_AVERAGE = 0, V4L2_EXPOSURE_METERING_AVERAGE = 0,
V4L2_EXPOSURE_METERING_CENTER_WEIGHTED = 1, V4L2_EXPOSURE_METERING_CENTER_WEIGHTED = 1,
V4L2_EXPOSURE_METERING_SPOT = 2, V4L2_EXPOSURE_METERING_SPOT = 2,
V4L2_EXPOSURE_METERING_MATRIX = 3,
}; };
#define V4L2_CID_SCENE_MODE (V4L2_CID_CAMERA_CLASS_BASE+26) #define V4L2_CID_SCENE_MODE (V4L2_CID_CAMERA_CLASS_BASE+26)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment