summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSultanxda <sultanxda@gmail.com>2015-10-04 01:16:49 -0700
committerMichael Bestas <mikeioannina@gmail.com>2017-01-04 21:57:46 +0200
commit4be0536fc19dc2d9846c14118b0f16d2e7bacf54 (patch)
tree51b4d951d7fe04c67423ef48c3397b9586a8a1d5
parentb0be23871c6c741249c8b246d1f9e838d4e91ec1 (diff)
downloadandroid_packages_apps_Snap-4be0536fc19dc2d9846c14118b0f16d2e7bacf54.tar.gz
android_packages_apps_Snap-4be0536fc19dc2d9846c14118b0f16d2e7bacf54.tar.bz2
android_packages_apps_Snap-4be0536fc19dc2d9846c14118b0f16d2e7bacf54.zip
SnapdragonCamera: Lock AE and AWB for tap-to-focus in camcorder
Lock the auto exposure (AE) and auto white balance (AWB) when tap-to-focus is used in the camcorder. Change-Id: Ieb24e04b74a06b2390eb9302e74b4f69b1486951 Signed-off-by: Sultanxda <sultanxda@gmail.com>
-rw-r--r--src/com/android/camera/VideoModule.java20
1 files changed, 20 insertions, 0 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 065f3912b..e4ec96bd8 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -127,6 +127,8 @@ public class VideoModule implements CameraModule,
private Parameters mParameters;
private boolean mFocusAreaSupported;
private boolean mMeteringAreaSupported;
+ private boolean mAeLockSupported;
+ private boolean mAwbLockSupported;
private boolean mIsInReviewMode;
private boolean mSnapshotInProgress = false;
@@ -567,6 +569,20 @@ public class VideoModule implements CameraModule,
mPendingSwitchCameraId = -1;
}
+ @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
+ private void setAutoExposureLockIfSupported() {
+ if (mAeLockSupported) {
+ mParameters.setAutoExposureLock(mFocusManager.getAeAwbLock());
+ }
+ }
+
+ @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
+ private void setAutoWhiteBalanceLockIfSupported() {
+ if (mAwbLockSupported) {
+ mParameters.setAutoWhiteBalanceLock(mFocusManager.getAeAwbLock());
+ }
+ }
+
@Override
public void waitingLocationPermissionResult(boolean result) {
mLocationManager.waitingLocationPermissionResult(result);
@@ -608,6 +624,8 @@ public class VideoModule implements CameraModule,
mParameters.setFocusAreas(mFocusManager.getFocusAreas());
if (mMeteringAreaSupported)
mParameters.setMeteringAreas(mFocusManager.getMeteringAreas());
+ setAutoExposureLockIfSupported();
+ setAutoWhiteBalanceLockIfSupported();
if (mFocusAreaSupported || mMeteringAreaSupported) {
mParameters.setFocusMode(mFocusManager.getFocusMode(true));
mCameraDevice.setParameters(mParameters);
@@ -3043,6 +3061,8 @@ public class VideoModule implements CameraModule,
private void initializeCapabilities() {
mFocusAreaSupported = CameraUtil.isFocusAreaSupported(mParameters);
mMeteringAreaSupported = CameraUtil.isMeteringAreaSupported(mParameters);
+ mAeLockSupported = CameraUtil.isAutoExposureLockSupported(mParameters);
+ mAwbLockSupported = CameraUtil.isAutoWhiteBalanceLockSupported(mParameters);
}
// Preview texture has been copied. Now camera can be released and the