diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-04-01 11:14:23 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-04-01 11:14:23 -0700 |
| commit | e8f843709a6b37e387fc0123c9a3683fd3b0db3a (patch) | |
| tree | 7ba4547dc63c117bdcd8cf36ec44312fd2f60739 /src/com/android/camera/CaptureModule.java | |
| parent | 2d1d3b11fb19dbddcd735d5c1707936cab176ae5 (diff) | |
| parent | aa043803c8f97249cdd962964e096f8029a6f813 (diff) | |
| download | android_packages_apps_Snap-e8f843709a6b37e387fc0123c9a3683fd3b0db3a.tar.gz android_packages_apps_Snap-e8f843709a6b37e387fc0123c9a3683fd3b0db3a.tar.bz2 android_packages_apps_Snap-e8f843709a6b37e387fc0123c9a3683fd3b0db3a.zip | |
Merge "SnapdragonCamera: Fix crash when zoom with HFR/HSR" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index d156b68bf..ae017fdf5 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -4069,8 +4069,17 @@ public class CaptureModule implements CameraModule, PhotoController, mCaptureSession[id].capture(mPreviewRequestBuilder[id] .build(), mCaptureCallback, mCameraHandler); } else { - mCaptureSession[id].setRepeatingRequest(mPreviewRequestBuilder[id] - .build(), mCaptureCallback, mCameraHandler); + CameraCaptureSession session = mCaptureSession[id]; + if (session instanceof CameraConstrainedHighSpeedCaptureSession) { + List list = CameraUtil + .createHighSpeedRequestList(mPreviewRequestBuilder[id].build(),id); + ((CameraConstrainedHighSpeedCaptureSession) session).setRepeatingBurst(list + , mCaptureCallback, mCameraHandler); + } else { + mCaptureSession[id].setRepeatingRequest(mPreviewRequestBuilder[id] + .build(), mCaptureCallback, mCameraHandler); + } + } } catch (CameraAccessException | IllegalStateException e) { e.printStackTrace(); |