diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-03-21 16:30:35 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-22 06:47:05 +0100 |
| commit | 8477d735c96f40f41208671ac4f78ca1e9eefe8a (patch) | |
| tree | a3f76b0df30b76a6a438cfb0fee80294d58af291 /src/multimedia/camera | |
| parent | 9cf0b2b90d46f58d3ad7b3a1a33e7f5746f17e5c (diff) | |
Added VideoLight camera flash mode.
Unlike the torch mode, it's enabled only while camera is active.
Change-Id: Ib92349ac190586c5aa8e49a8fddbdf937e757fd0
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src/multimedia/camera')
| -rw-r--r-- | src/multimedia/camera/qcameraexposure.cpp | 5 | ||||
| -rw-r--r-- | src/multimedia/camera/qcameraexposure.h | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/multimedia/camera/qcameraexposure.cpp b/src/multimedia/camera/qcameraexposure.cpp index c85e78006..2a52a5f8d 100644 --- a/src/multimedia/camera/qcameraexposure.cpp +++ b/src/multimedia/camera/qcameraexposure.cpp @@ -610,7 +610,10 @@ void QCameraExposure::setAutoShutterSpeed() \value FlashAuto Automatic flash. \value FlashRedEyeReduction Red eye reduction flash. \value FlashFill Use flash to fillin shadows. - \value FlashTorch Constant light source, useful for focusing and video capture. + \value FlashTorch Constant light source. If supported, + torch can be enabled without loading the camera. + \value FlashVideoLight Constant light source, useful for video capture. + The light is turned on only while camera is active. \value FlashSlowSyncFrontCurtain Use the flash in conjunction with a slow shutter speed. This mode allows better exposure of distant objects and/or motion blur effect. diff --git a/src/multimedia/camera/qcameraexposure.h b/src/multimedia/camera/qcameraexposure.h index 6684f8c61..728ea9a9c 100644 --- a/src/multimedia/camera/qcameraexposure.h +++ b/src/multimedia/camera/qcameraexposure.h @@ -78,9 +78,10 @@ public: FlashRedEyeReduction = 0x8, FlashFill = 0x10, FlashTorch = 0x20, - FlashSlowSyncFrontCurtain = 0x40, - FlashSlowSyncRearCurtain = 0x80, - FlashManual = 0x100 + FlashVideoLight = 0x40, + FlashSlowSyncFrontCurtain = 0x80, + FlashSlowSyncRearCurtain = 0x100, + FlashManual = 0x200 }; Q_DECLARE_FLAGS(FlashModes, FlashMode) |