[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>

diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml
index c8eb6c222274df9eaeabd0eef68eade0aca16501..8d7a77928d49f00005a5ab9db3383836ddbfb039 100644 (file)
--- a/Documentation/DocBook/media/v4l/controls.xml
+++ b/Documentation/DocBook/media/v4l/controls.xml
@@ -3142,6 +3142,13 @@ giving priority to the center of the metered area.</entry>
                  <entry><constant>V4L2_EXPOSURE_METERING_SPOT</constant>&nbsp;</entry>
                  <entry>Measure only very small area at the center of the frame.</entry>
                </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>
            </entrytbl>
          </row>

diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
index ec89fd16361ca049db7939a6719ce19672b8a17f..ebb8e48619a29583f15bd298b92f6634d05e0a42 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
@@ -234,6 +234,7 @@ const char * const *v4l2_ctrl_get_menu(u32 id)
                "Average",
                "Center Weighted",
                "Spot",
+               "Matrix",
                NULL
        };
        static const char * const camera_auto_focus_range[] = {

diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
index 7da22cec30cd50e8c19fc273ec64389de6549998..69bd5bb0d5afdf4cb4a484cccd836f48d7f29dd5 100644 (file)
--- a/include/uapi/linux/v4l2-controls.h
+++ b/include/uapi/linux/v4l2-controls.h
@@ -658,6 +658,7 @@ enum v4l2_exposure_metering {
        V4L2_EXPOSURE_METERING_AVERAGE          = 0,
        V4L2_EXPOSURE_METERING_CENTER_WEIGHTED  = 1,
        V4L2_EXPOSURE_METERING_SPOT             = 2,
+       V4L2_EXPOSURE_METERING_MATRIX           = 3,
 };
 
 #define V4L2_CID_SCENE_MODE                    (V4L2_CID_CAMERA_CLASS_BASE+26)