From: Sylwester Nawrocki <s.nawrocki@samsung.com>
To: linux-media@vger.kernel.org
Cc: kyungmin.park@samsung.com, myungjoo.ham@samsung.com,
dh09.lee@samsung.com, shaik.samsung@gmail.com,
arun.kk@samsung.com, a.hajda@samsung.com,
linux-samsung-soc@vger.kernel.org,
Sylwester Nawrocki <s.nawrocki@samsung.com>
Subject: [PATCH v2 01/10] V4L: Add MATRIX option to V4L2_CID_EXPOSURE_METERING control
Date: Tue, 26 Mar 2013 18:29:43 +0100 [thread overview]
Message-ID: <1364318992-20562-2-git-send-email-s.nawrocki@samsung.com> (raw)
In-Reply-To: <1364318992-20562-1-git-send-email-s.nawrocki@samsung.com>
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>
---
Documentation/DocBook/media/v4l/controls.xml | 7 +++++++
drivers/media/v4l2-core/v4l2-ctrls.c | 1 +
include/uapi/linux/v4l2-controls.h | 1 +
3 files changed, 9 insertions(+)
diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml
index 7fe5be1..c5398ed 100644
--- a/Documentation/DocBook/media/v4l/controls.xml
+++ b/Documentation/DocBook/media/v4l/controls.xml
@@ -3159,6 +3159,13 @@ giving priority to the center of the metered area.</entry>
<entry><constant>V4L2_EXPOSURE_METERING_SPOT</constant> </entry>
<entry>Measure only very small area at the center of the frame.</entry>
</row>
+ <row>
+ <entry><constant>V4L2_EXPOSURE_METERING_MATRIX</constant> </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 4b45d49..6b56d7b 100644
--- 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 f56c945..22556a2 100644
--- a/include/uapi/linux/v4l2-controls.h
+++ b/include/uapi/linux/v4l2-controls.h
@@ -642,6 +642,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)
--
1.7.9.5
next prev parent reply other threads:[~2013-03-26 17:30 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-26 17:29 [PATCH v2 00/10] s5p-fimc: Exynos4x12 FIMC-IS support prerequisite Sylwester Nawrocki
2013-03-26 17:29 ` Sylwester Nawrocki [this message]
2013-03-26 17:29 ` [PATCH v2 02/10] s5p-fimc: Add error checks for pipeline stream on callbacks Sylwester Nawrocki
2013-03-26 17:29 ` [PATCH v2 03/10] s5p-fimc: Update graph traversal for entities with multiple source pads Sylwester Nawrocki
2013-03-26 17:29 ` [PATCH v2 04/10] s5p-fimc: Add support for PIXELASYNCMx clocks Sylwester Nawrocki
2013-03-26 17:29 ` [PATCH v2 05/10] s5p-fimc: Add support for ISP Writeback data input bus type Sylwester Nawrocki
2013-03-26 17:29 ` [PATCH v2 06/10] s5p-fimc: Ensure CAMCLK clock can be enabled by FIMC-LITE devices Sylwester Nawrocki
2013-03-26 17:29 ` [PATCH v2 07/10] s5p-fimc: Ensure proper s_stream() call order in the ISP datapaths Sylwester Nawrocki
2013-03-26 17:29 ` [PATCH v2 08/10] s5p-fimc: Ensure proper s_power() " Sylwester Nawrocki
2013-03-26 17:29 ` [PATCH v2 09/10] s5p-fimc: Remove dependency on fimc-core.h in fimc-lite driver Sylwester Nawrocki
2013-03-26 17:29 ` [PATCH v2 10/10] s5p-fimc: Change the driver directory name to exynos4-is Sylwester Nawrocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1364318992-20562-2-git-send-email-s.nawrocki@samsung.com \
--to=s.nawrocki@samsung.com \
--cc=a.hajda@samsung.com \
--cc=arun.kk@samsung.com \
--cc=dh09.lee@samsung.com \
--cc=kyungmin.park@samsung.com \
--cc=linux-media@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=myungjoo.ham@samsung.com \
--cc=shaik.samsung@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.