diff options
| author | Sridhar Gujje <sgujje@qti.qualcomm.com> | 2019-02-04 22:29:09 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-02-04 22:29:09 -0800 |
| commit | 425319def614477a7fe1dd950c224904fa31b210 (patch) | |
| tree | a12dfebb9406db6a3fa2721ddd767a31cae658fc /src/com/android/camera/CaptureModule.java | |
| parent | 9e88e44832e3b99e0e3d1a4c194276bd80581024 (diff) | |
| parent | d1526c95203c23dcc6ff0b02d5e0406575d75b11 (diff) | |
| download | android_packages_apps_Snap-425319def614477a7fe1dd950c224904fa31b210.tar.gz android_packages_apps_Snap-425319def614477a7fe1dd950c224904fa31b210.tar.bz2 android_packages_apps_Snap-425319def614477a7fe1dd950c224904fa31b210.zip | |
Merge "fix force close when change color effect during HFR recording" into camera-SnapdragonCamera.lnx.2.0
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 3687b37ea..fffe715db 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -6884,8 +6884,15 @@ public class CaptureModule implements CameraModule, PhotoController, try { if (checkSessionAndBuilder(mCaptureSession[BAYER_ID], mPreviewRequestBuilder[BAYER_ID])) { - mCaptureSession[BAYER_ID].setRepeatingRequest(mPreviewRequestBuilder[BAYER_ID] - .build(), mCaptureCallback, mCameraHandler); + if (mIsRecordingVideo && mHighSpeedCapture) { + List requestList = CameraUtil.createHighSpeedRequestList( + mPreviewRequestBuilder[BAYER_ID].build()); + mCaptureSession[BAYER_ID].setRepeatingBurst(requestList, mCaptureCallback, + mCameraHandler); + } else { + mCaptureSession[BAYER_ID].setRepeatingRequest(mPreviewRequestBuilder[BAYER_ID] + .build(), mCaptureCallback, mCameraHandler); + } } } catch (CameraAccessException | IllegalStateException e) { e.printStackTrace(); |