Add flash controls for metering of the light conditions
regarding the necessity of the flash firing.
Signed-off-by: Andrzej Hajda <a.hajda@xxxxxxxxxxx>
Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
---
Documentation/DocBook/media/v4l/controls.xml | 25 +++++++++++++++++++++++++
drivers/media/v4l2-core/v4l2-ctrls.c | 4 ++++
include/uapi/linux/v4l2-controls.h | 3 +++
3 files changed, 32 insertions(+)
diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml
index 9d4af8a..7496dca 100644
--- a/Documentation/DocBook/media/v4l/controls.xml
+++ b/Documentation/DocBook/media/v4l/controls.xml
@@ -4247,6 +4247,31 @@ interface and may change in the future.</para>
after strobe during which another strobe will not be
possible. This is a read-only control.</entry>
</row>
+ <row>
+ <entry spanname="id"><constant>V4L2_CID_FLASH_UNDEREXPOSURE_METERING</constant></entry>
+ <entry>boolean</entry>
+ </row>
+ <row>
+ <entry spanname="descr">Enable or disable metering of the light
+ conditions regarding the necessity of the flash firing.</entry>
+ </row>
+ <row>
+ <entry spanname="id"><constant>V4L2_CID_FLASH_UNDEREXPOSURE_LEVEL</constant></entry>
+ <entry>integer</entry>
+ </row>
+ <row>
+ <entry spanname="descr">This is a read-only control that can be read
+ by the application and used as a hint to determine if the flash
+ should be used to obtain optimal exposure. Valid only if
+ <constant>V4L2_CID_FLASH_UNDEREXPOSURE_METERING</constant>
+ is enabled. Value 0 means the flash should not be used.
+ Otherwise the flash should be used and the value indicates the
+ optimal intensity of the flash. It should use the same units as
+ <constant>V4L2_CID_FLASH_INTENSITY</constant>. In case
+ <constant>V4L2_CID_FLASH_INTENSITY</constant> is not supported the
+ maximum value should be 1.
+ </entry>
+ </row>
<row><entry></entry></row>
</tbody>
</tgroup>
diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
index 9cdf4b8..8a7e4f7 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
@@ -779,6 +779,8 @@ const char *v4l2_ctrl_get_name(u32 id)
case V4L2_CID_FLASH_FAULT: return "Faults";
case V4L2_CID_FLASH_CHARGE: return "Charge";
case V4L2_CID_FLASH_READY: return "Ready to Strobe";
+ case V4L2_CID_FLASH_UNDEREXPOSURE_METERING: return "Underexposure Metering";
+ case V4L2_CID_FLASH_UNDEREXPOSURE_LEVEL: return "Underexposure Level";
/* JPEG encoder controls */
/* Keep the order of the 'case's the same as in videodev2.h! */
@@ -857,6 +859,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
case V4L2_CID_MPEG_VIDEO_MPEG4_QPEL:
case V4L2_CID_WIDE_DYNAMIC_RANGE:
case V4L2_CID_IMAGE_STABILIZATION:
+ case V4L2_CID_FLASH_UNDEREXPOSURE_METERING:
*type = V4L2_CTRL_TYPE_BOOLEAN;
*min = 0;
*max = *step = 1;
@@ -962,6 +965,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
break;
case V4L2_CID_MIN_BUFFERS_FOR_CAPTURE:
case V4L2_CID_MIN_BUFFERS_FOR_OUTPUT:
+ case V4L2_CID_FLASH_UNDEREXPOSURE_LEVEL:
*type = V4L2_CTRL_TYPE_INTEGER;
*flags |= V4L2_CTRL_FLAG_READ_ONLY;
break;
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
index 0eb1c1a..4cb493a 100644
--- a/include/uapi/linux/v4l2-controls.h
+++ b/include/uapi/linux/v4l2-controls.h
@@ -763,6 +763,9 @@ enum v4l2_flash_strobe_source {
#define V4L2_CID_FLASH_CHARGE (V4L2_CID_FLASH_CLASS_BASE + 11)
#define V4L2_CID_FLASH_READY (V4L2_CID_FLASH_CLASS_BASE + 12)
+#define V4L2_CID_FLASH_UNDEREXPOSURE_METERING (V4L2_CID_FLASH_CLASS_BASE + 13)
+#define V4L2_CID_FLASH_UNDEREXPOSURE_LEVEL (V4L2_CID_FLASH_CLASS_BASE + 14)
+
/* JPEG-class control IDs */
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
