slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add additional exposure modes to QCameraExposure.

Browse Source 
[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 <yoann.lopes@theqtcompany.com>
This commit is contained in:
Andrew den Exter
2014-06-30 05:59:10 +00:00
committed by Yoann Lopes
parent 25ad679c25
commit 4bdf1561f4
7 changed files with 172 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/plugins/android/src/mediacapture/qandroidcameraexposurecontrol.cpp
View File

@@ -181,6 +181,36 @@ bool QAndroidCameraExposureControl::setValue(ExposureParameter parameter, const
case QCameraExposure::ExposureNight:
sceneMode = QLatin1String("night");
break;
case QCameraExposure::ExposureAction:
sceneMode = QLatin1String("action");
break;
case QCameraExposure::ExposureLandscape:
sceneMode = QLatin1String("landscape");
break;
case QCameraExposure::ExposureNightPortrait:
sceneMode = QLatin1String("night-portrait");
break;
case QCameraExposure::ExposureTheatre:
sceneMode = QLatin1String("theatre");
break;
case QCameraExposure::ExposureSunset:
sceneMode = QLatin1String("sunset");
break;
case QCameraExposure::ExposureSteadyPhoto:
sceneMode = QLatin1String("steadyphoto");
break;
case QCameraExposure::ExposureFireworks:
sceneMode = QLatin1String("fireworks");
break;
case QCameraExposure::ExposureParty:
sceneMode = QLatin1String("party");
break;
case QCameraExposure::ExposureCandlelight:
sceneMode = QLatin1String("candlelight");
break;
case QCameraExposure::ExposureBarcode:
sceneMode = QLatin1String("barcode");
break;
default:
sceneMode = QLatin1String("auto");
m_actualExposureMode = QCameraExposure::ExposureAuto;
@@ -226,6 +256,26 @@ void QAndroidCameraExposureControl::onCameraOpened()
m_supportedExposureModes << QVariant::fromValue(QCameraExposure::ExposureSnow);
else if (sceneMode == QLatin1String("sports"))
m_supportedExposureModes << QVariant::fromValue(QCameraExposure::ExposureSports);
else if (sceneMode == QLatin1String("action"))
m_supportedExposureModes << QVariant::fromValue(QCameraExposure::ExposureAction);
else if (sceneMode == QLatin1String("landscape"))
m_supportedExposureModes << QVariant::fromValue(QCameraExposure::ExposureLandscape);
else if (sceneMode == QLatin1String("night-portrait"))
m_supportedExposureModes << QVariant::fromValue(QCameraExposure::ExposureNightPortrait);
else if (sceneMode == QLatin1String("theatre"))
m_supportedExposureModes << QVariant::fromValue(QCameraExposure::ExposureTheatre);
else if (sceneMode == QLatin1String("sunset"))
m_supportedExposureModes << QVariant::fromValue(QCameraExposure::ExposureSunset);
else if (sceneMode == QLatin1String("steadyphoto"))
m_supportedExposureModes << QVariant::fromValue(QCameraExposure::ExposureSteadyPhoto);
else if (sceneMode == QLatin1String("fireworks"))
m_supportedExposureModes << QVariant::fromValue(QCameraExposure::ExposureFireworks);
else if (sceneMode == QLatin1String("party"))
m_supportedExposureModes << QVariant::fromValue(QCameraExposure::ExposureParty);
else if (sceneMode == QLatin1String("candlelight"))
m_supportedExposureModes << QVariant::fromValue(QCameraExposure::ExposureCandlelight);
else if (sceneMode == QLatin1String("barcode"))
m_supportedExposureModes << QVariant::fromValue(QCameraExposure::ExposureBarcode);
}
emit parameterRangeChanged(QCameraExposureControl::ExposureMode);
}