summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSultanxda <sultanxda@gmail.com>2015-10-04 01:16:49 -0700
committerArne Coucheron <arco68@gmail.com>2018-01-26 01:08:03 +0100
commit2fe3cd720a511025e6246608e6f644e9fdede053 (patch)
tree8a749d6b5789dad9d268f54d163cf7a7e12e1862
parent835e2c91eb40c6984bb238571402dedfc0af18db (diff)
downloadandroid_packages_apps_Snap-2fe3cd720a511025e6246608e6f644e9fdede053.tar.gz
android_packages_apps_Snap-2fe3cd720a511025e6246608e6f644e9fdede053.tar.bz2
android_packages_apps_Snap-2fe3cd720a511025e6246608e6f644e9fdede053.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 a3bb72674..0bd6649f3 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -130,6 +130,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;
@@ -575,6 +577,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);
@@ -616,6 +632,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);
@@ -3123,6 +3141,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