diff options
| author | Andy Huibers <andyhuibers@google.com> | 2014-08-15 12:56:42 -0700 |
|---|---|---|
| committer | Andy Huibers <andyhuibers@google.com> | 2014-08-15 12:59:29 -0700 |
| commit | 34ac0609e30601fe2ce9b2338a173d7740ab3f82 (patch) | |
| tree | e05a965f16b7ad290241293f0423a6eb2b558fd9 /src | |
| parent | 064f851a063c80be4e6cc3f1716ff19b605e4865 (diff) | |
| download | android_packages_apps_Camera2-34ac0609e30601fe2ce9b2338a173d7740ab3f82.tar.gz android_packages_apps_Camera2-34ac0609e30601fe2ce9b2338a173d7740ab3f82.tar.bz2 android_packages_apps_Camera2-34ac0609e30601fe2ce9b2338a173d7740ab3f82.zip | |
Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API.
Bug: 17028594
Change-Id: I8ce7dbd12f2b14a50068d8b034e7a80d8840f012
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/one/v2/OneCameraImpl.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/camera/one/v2/OneCameraImpl.java b/src/com/android/camera/one/v2/OneCameraImpl.java index 9c6a1003c..bc067864c 100644 --- a/src/com/android/camera/one/v2/OneCameraImpl.java +++ b/src/com/android/camera/one/v2/OneCameraImpl.java @@ -102,6 +102,10 @@ public class OneCameraImpl extends AbstractOneCamera { private static final float METERING_REGION_WEIGHT = 0.25f; /** Duration to hold after manual focus tap. */ private static final int FOCUS_HOLD_MILLIS = 3000; + /** Zero weight 3A region, to reset regions per API. */ + MeteringRectangle[] ZERO_WEIGHT_3A_REGION = new MeteringRectangle[]{ + new MeteringRectangle(0, 0, 1, 1, 0) + }; /** * CaptureRequest tags. @@ -516,6 +520,10 @@ public class OneCameraImpl extends AbstractOneCamera { mLastRequestedControlAFMode = CameraMetadata.CONTROL_AF_MODE_CONTINUOUS_PICTURE; builder.set(CaptureRequest.CONTROL_AF_MODE, CameraMetadata.CONTROL_AF_MODE_CONTINUOUS_PICTURE); + // TODO: Move to apply3ARegions(CaptureRequest.Builder builder). + // Reset 3A regions. + builder.set(CaptureRequest.CONTROL_AF_REGIONS, ZERO_WEIGHT_3A_REGION); + builder.set(CaptureRequest.CONTROL_AE_REGIONS, ZERO_WEIGHT_3A_REGION); builder.set(CaptureRequest.CONTROL_AF_TRIGGER, CameraMetadata.CONTROL_AF_TRIGGER_IDLE); mCaptureSession.setRepeatingRequest(builder.build(), mAutoFocusStateListener, mCameraHandler); |