diff options
-rw-r--r-- | Documentation/DocBook/media/v4l/controls.xml | 15 | ||||
-rw-r--r-- | drivers/media/video/v4l2-ctrls.c | 2 | ||||
-rw-r--r-- | include/linux/videodev2.h | 2 |
3 files changed, 19 insertions, 0 deletions
diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml index 56dfdf02c76b..16c7aab595af 100644 --- a/Documentation/DocBook/media/v4l/controls.xml +++ b/Documentation/DocBook/media/v4l/controls.xml | |||
@@ -3092,6 +3092,21 @@ sky. It corresponds approximately to 9000...10000 K color temperature. | |||
3092 | </row> | 3092 | </row> |
3093 | <row><entry></entry></row> | 3093 | <row><entry></entry></row> |
3094 | 3094 | ||
3095 | <row id="v4l2-wide-dynamic-range"> | ||
3096 | <entry spanname="id"><constant>V4L2_CID_WIDE_DYNAMIC_RANGE</constant></entry> | ||
3097 | <entry>boolean</entry> | ||
3098 | </row> | ||
3099 | <row> | ||
3100 | <entry spanname="descr">Enables or disables the camera's wide dynamic | ||
3101 | range feature. This feature allows to obtain clear images in situations where | ||
3102 | intensity of the illumination varies significantly throughout the scene, i.e. | ||
3103 | there are simultaneously very dark and very bright areas. It is most commonly | ||
3104 | realized in cameras by combining two subsequent frames with different exposure | ||
3105 | times. <footnote id="ctypeconv"><para> This control may be changed to a menu | ||
3106 | control in the future, if more options are required.</para></footnote></entry> | ||
3107 | </row> | ||
3108 | <row><entry></entry></row> | ||
3109 | |||
3095 | </tbody> | 3110 | </tbody> |
3096 | </tgroup> | 3111 | </tgroup> |
3097 | </table> | 3112 | </table> |
diff --git a/drivers/media/video/v4l2-ctrls.c b/drivers/media/video/v4l2-ctrls.c index 56ac71c8ba37..0c18c82e0b59 100644 --- a/drivers/media/video/v4l2-ctrls.c +++ b/drivers/media/video/v4l2-ctrls.c | |||
@@ -621,6 +621,7 @@ const char *v4l2_ctrl_get_name(u32 id) | |||
621 | case V4L2_CID_IRIS_RELATIVE: return "Iris, Relative"; | 621 | case V4L2_CID_IRIS_RELATIVE: return "Iris, Relative"; |
622 | case V4L2_CID_AUTO_EXPOSURE_BIAS: return "Auto Exposure, Bias"; | 622 | case V4L2_CID_AUTO_EXPOSURE_BIAS: return "Auto Exposure, Bias"; |
623 | case V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE: return "White Balance, Auto & Preset"; | 623 | case V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE: return "White Balance, Auto & Preset"; |
624 | case V4L2_CID_WIDE_DYNAMIC_RANGE: return "Wide Dynamic Range"; | ||
624 | 625 | ||
625 | /* FM Radio Modulator control */ | 626 | /* FM Radio Modulator control */ |
626 | /* Keep the order of the 'case's the same as in videodev2.h! */ | 627 | /* Keep the order of the 'case's the same as in videodev2.h! */ |
@@ -723,6 +724,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type, | |||
723 | case V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM: | 724 | case V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM: |
724 | case V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_ENABLE: | 725 | case V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_ENABLE: |
725 | case V4L2_CID_MPEG_VIDEO_MPEG4_QPEL: | 726 | case V4L2_CID_MPEG_VIDEO_MPEG4_QPEL: |
727 | case V4L2_CID_WIDE_DYNAMIC_RANGE: | ||
726 | *type = V4L2_CTRL_TYPE_BOOLEAN; | 728 | *type = V4L2_CTRL_TYPE_BOOLEAN; |
727 | *min = 0; | 729 | *min = 0; |
728 | *max = *step = 1; | 730 | *max = *step = 1; |
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index 85c4e8f1090f..d93e42bc0348 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h | |||
@@ -1723,6 +1723,8 @@ enum v4l2_auto_n_preset_white_balance { | |||
1723 | V4L2_WHITE_BALANCE_SHADE = 9, | 1723 | V4L2_WHITE_BALANCE_SHADE = 9, |
1724 | }; | 1724 | }; |
1725 | 1725 | ||
1726 | #define V4L2_CID_WIDE_DYNAMIC_RANGE (V4L2_CID_CAMERA_CLASS_BASE+21) | ||
1727 | |||
1726 | /* FM Modulator class control IDs */ | 1728 | /* FM Modulator class control IDs */ |
1727 | #define V4L2_CID_FM_TX_CLASS_BASE (V4L2_CTRL_CLASS_FM_TX | 0x900) | 1729 | #define V4L2_CID_FM_TX_CLASS_BASE (V4L2_CTRL_CLASS_FM_TX | 0x900) |
1728 | #define V4L2_CID_FM_TX_CLASS (V4L2_CTRL_CLASS_FM_TX | 1) | 1730 | #define V4L2_CID_FM_TX_CLASS (V4L2_CTRL_CLASS_FM_TX | 1) |