Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit fc39f46b54b600f053bf9bab757023344e97925e

Authored by Sylwester Nawrocki
Committed by Mauro Carvalho Chehab
1 parent 4163851f7b
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

[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: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

Showing 3 changed files with 9 additions and 0 deletions Side-by-side Diff

Documentation/DocBook/media/v4l/controls.xml
Diff comments   View file @ fc39f46
... ... @@ -3142,6 +3142,13 @@
3142 3142 <entry><constant>V4L2_EXPOSURE_METERING_SPOT</constant>&nbsp;</entry>
3143 3143 <entry>Measure only very small area at the center of the frame.</entry>
3144 3144 </row>
  3145 + <row>
  3146 + <entry><constant>V4L2_EXPOSURE_METERING_MATRIX</constant>&nbsp;</entry>
  3147 + <entry>A multi-zone metering. The light intensity is measured
  3148 +in several points of the frame and the the results are combined. The
  3149 +algorithm of the zones selection and their significance in calculating the
  3150 +final value is device dependant.</entry>
  3151 + </row>
3145 3152 </tbody>
3146 3153 </entrytbl>
3147 3154 </row>
drivers/media/v4l2-core/v4l2-ctrls.c
Diff comments   View file @ fc39f46
... ... @@ -234,6 +234,7 @@
234 234 "Average",
235 235 "Center Weighted",
236 236 "Spot",
  237 + "Matrix",
237 238 NULL
238 239 };
239 240 static const char * const camera_auto_focus_range[] = {
include/uapi/linux/v4l2-controls.h
Diff comments   View file @ fc39f46
... ... @@ -658,6 +658,7 @@
658 658 V4L2_EXPOSURE_METERING_AVERAGE = 0,
659 659 V4L2_EXPOSURE_METERING_CENTER_WEIGHTED = 1,
660 660 V4L2_EXPOSURE_METERING_SPOT = 2,
  661 + V4L2_EXPOSURE_METERING_MATRIX = 3,
661 662 };
662 663  
663 664 #define V4L2_CID_SCENE_MODE (V4L2_CID_CAMERA_CLASS_BASE+26)