diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-09 01:11:54 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-09 01:11:54 +0000 |
| commit | 98b7d14ba263d5b3233f1f152250a5ae01169d52 (patch) | |
| tree | e4063be7bcb18350ed7dc6fda80583e823847b7e | |
| parent | 621fee1d775524ffac5c9bed5c55420e429464ec (diff) | |
| parent | 86f6fed52cd0939db336faa346e268f642287898 (diff) | |
| download | Camera2-98b7d14ba263d5b3233f1f152250a5ae01169d52.tar.gz | |
Snap for 6477313 from 86f6fed52cd0939db336faa346e268f642287898 to rvc-release
Change-Id: Ia5975830cab0faaf08db32f9a118b713e1069b37
| -rw-r--r-- | src/com/android/camera/one/v2/photo/PictureTakerFactory.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/camera/one/v2/photo/PictureTakerFactory.java b/src/com/android/camera/one/v2/photo/PictureTakerFactory.java index 68ca5a752..97dd60482 100644 --- a/src/com/android/camera/one/v2/photo/PictureTakerFactory.java +++ b/src/com/android/camera/one/v2/photo/PictureTakerFactory.java @@ -48,14 +48,16 @@ public final class PictureTakerFactory { // performs the AF & AE precapture sequence. ImageCaptureCommand flashOnCommand = new ConvergedImageCaptureCommand( sharedImageReader, frameServer, rootRequestBuilder, - CameraDevice.TEMPLATE_STILL_CAPTURE, CameraDevice.TEMPLATE_STILL_CAPTURE, + CameraDevice.TEMPLATE_PREVIEW /* repeatingRequestTemplate */, + CameraDevice.TEMPLATE_STILL_CAPTURE /* stillCaptureRequestTemplate */, Arrays.asList(rootRequestBuilder), true /* ae */, true /* af */); // When flash is OFF, wait for AF convergence, but not AE convergence // (which can be very slow). ImageCaptureCommand flashOffCommand = new ConvergedImageCaptureCommand( sharedImageReader, frameServer, rootRequestBuilder, - CameraDevice.TEMPLATE_STILL_CAPTURE, CameraDevice.TEMPLATE_STILL_CAPTURE, + CameraDevice.TEMPLATE_PREVIEW /* repeatingRequestTemplate */, + CameraDevice.TEMPLATE_STILL_CAPTURE /* stillCaptureRequestTemplate */, Arrays.asList(rootRequestBuilder), false /* ae */, true /* af */); // When flash is AUTO, wait for AF & AE. @@ -63,7 +65,8 @@ public final class PictureTakerFactory { // not necessary, then this could skip waiting for AE convergence. ImageCaptureCommand flashAutoCommand = new ConvergedImageCaptureCommand( sharedImageReader, frameServer, rootRequestBuilder, - CameraDevice.TEMPLATE_STILL_CAPTURE, CameraDevice.TEMPLATE_STILL_CAPTURE, + CameraDevice.TEMPLATE_PREVIEW /* repeatingRequestTemplate */, + CameraDevice.TEMPLATE_STILL_CAPTURE /* stillCaptureRequestTemplate */, Arrays.asList(rootRequestBuilder), true /* ae */, true /* af */); ImageCaptureCommand flashBasedCommand = new FlashBasedPhotoCommand(logFactory, flashMode, |