From 4bdf1561f46e85b14665b38804410340ffe1820b Mon Sep 17 00:00:00 2001 From: Andrew den Exter Date: Mon, 30 Jun 2014 05:59:10 +0000 Subject: Add additional exposure modes to QCameraExposure. [ChangeLog][GStreamer][Android] Camera exposure mode extended to support Action, Landscape, NightPortrait, Theatre, Sunset, SteadyPhoto, Fireworks, Party, Candlelight, and Barcode modes. Change-Id: I13d4bb042d27c0bd2ffcd369882b56bbabc84335 Reviewed-by: Yoann Lopes --- src/imports/multimedia/qdeclarativecamera_p.h | 10 ++++++++++ src/imports/multimedia/qdeclarativecameraexposure.cpp | 10 ++++++++++ src/imports/multimedia/qdeclarativecameraexposure_p.h | 10 ++++++++++ 3 files changed, 30 insertions(+) (limited to 'src/imports') diff --git a/src/imports/multimedia/qdeclarativecamera_p.h b/src/imports/multimedia/qdeclarativecamera_p.h index 113f01bd9..4bc60652e 100644 --- a/src/imports/multimedia/qdeclarativecamera_p.h +++ b/src/imports/multimedia/qdeclarativecamera_p.h @@ -191,6 +191,16 @@ public: ExposureBeach = QCameraExposure::ExposureBeach, ExposureLargeAperture = QCameraExposure::ExposureLargeAperture, ExposureSmallAperture = QCameraExposure::ExposureSmallAperture, + ExposureAction = QCameraExposure::ExposureAction, + ExposureLandscape = QCameraExposure::ExposureLandscape, + ExposureNightPortrait = QCameraExposure::ExposureNightPortrait, + ExposureTheatre = QCameraExposure::ExposureTheatre, + ExposureSunset = QCameraExposure::ExposureSunset, + ExposureSteadyPhoto = QCameraExposure::ExposureSteadyPhoto, + ExposureFireworks = QCameraExposure::ExposureFireworks, + ExposureParty = QCameraExposure::ExposureParty, + ExposureCandlelight = QCameraExposure::ExposureCandlelight, + ExposureBarcode = QCameraExposure::ExposureBarcode, ExposureModeVendor = QCameraExposure::ExposureModeVendor }; diff --git a/src/imports/multimedia/qdeclarativecameraexposure.cpp b/src/imports/multimedia/qdeclarativecameraexposure.cpp index cc793cdce..3b1f9201d 100644 --- a/src/imports/multimedia/qdeclarativecameraexposure.cpp +++ b/src/imports/multimedia/qdeclarativecameraexposure.cpp @@ -341,6 +341,16 @@ void QDeclarativeCameraExposure::setAutoIsoSensitivity() \row \li Camera.ExposureLargeAperture \li Use larger aperture with small depth of field. \row \li Camera.ExposureSmallAperture \li Use smaller aperture. \row \li Camera.ExposurePortrait \li Portrait exposure mode. + \row \li Camera.ExposureAction \li Action exposure mode. Since 5.5 + \row \li Camera.ExposureLandscape \li Landscape exposure mode. Since 5.5 + \row \li Camera.ExposureNightPortrait \li Night portrait exposure mode. Since 5.5 + \row \li Camera.ExposureTheatre \li Theatre exposure mode. Since 5.5 + \row \li Camera.ExposureSunset \li Sunset exposure mode. Since 5.5 + \row \li Camera.ExposureSteadyPhoto \li Steady photo exposure mode. Since 5.5 + \row \li Camera.ExposureFireworks \li Fireworks exposure mode. Since 5.5 + \row \li Camera.ExposureParty \li Party exposure mode. Since 5.5 + \row \li Camera.ExposureCandlelight \li Candlelight exposure mode. Since 5.5 + \row \li Camera.ExposureBarcode \li Barcode exposure mode. Since 5.5 \row \li Camera.ExposureModeVendor \li The base value for device specific exposure modes. \endtable */ diff --git a/src/imports/multimedia/qdeclarativecameraexposure_p.h b/src/imports/multimedia/qdeclarativecameraexposure_p.h index a8a53f0c5..83058a933 100644 --- a/src/imports/multimedia/qdeclarativecameraexposure_p.h +++ b/src/imports/multimedia/qdeclarativecameraexposure_p.h @@ -86,6 +86,16 @@ public: ExposureBeach = QCameraExposure::ExposureBeach, ExposureLargeAperture = QCameraExposure::ExposureLargeAperture, ExposureSmallAperture = QCameraExposure::ExposureSmallAperture, + ExposureAction = QCameraExposure::ExposureAction, + ExposureLandscape = QCameraExposure::ExposureLandscape, + ExposureNightPortrait = QCameraExposure::ExposureNightPortrait, + ExposureTheatre = QCameraExposure::ExposureTheatre, + ExposureSunset = QCameraExposure::ExposureSunset, + ExposureSteadyPhoto = QCameraExposure::ExposureSteadyPhoto, + ExposureFireworks = QCameraExposure::ExposureFireworks, + ExposureParty = QCameraExposure::ExposureParty, + ExposureCandlelight = QCameraExposure::ExposureCandlelight, + ExposureBarcode = QCameraExposure::ExposureBarcode, ExposureModeVendor = QCameraExposure::ExposureModeVendor }; -- cgit v1.2.3