diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-05-01 09:55:55 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-05-01 09:55:55 -0700 |
| commit | 890ded29e66ef3a77660f520827968e858f2b15c (patch) | |
| tree | 7641ac77288c07b02791b29478d971f03b9bc945 /src/com | |
| parent | 339f67e37d35ffe60cfc55647d0689686ee390a5 (diff) | |
| parent | 32cf74735d988b788fc0f87742ffaf6e48b9cf34 (diff) | |
| download | android_packages_apps_Snap-890ded29e66ef3a77660f520827968e858f2b15c.tar.gz android_packages_apps_Snap-890ded29e66ef3a77660f520827968e858f2b15c.tar.bz2 android_packages_apps_Snap-890ded29e66ef3a77660f520827968e858f2b15c.zip | |
Merge "SnapdragonCamera: Enable video flash btn in high speed video"
Diffstat (limited to 'src/com')
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index e14c09c6e..73952b0d7 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -3654,7 +3654,6 @@ public class CaptureModule implements CameraModule, PhotoController, mCaptureSession[cameraId] = cameraCaptureSession; try { setUpVideoCaptureRequestBuilder(mVideoRequestBuilder, cameraId); - mCurrentSession.setRepeatingRequest(mVideoRequestBuilder.build(), mCaptureCallback, mCameraHandler); } catch (CameraAccessException e) { @@ -3760,6 +3759,7 @@ public class CaptureModule implements CameraModule, PhotoController, CameraConstrainedHighSpeedCaptureSession session = (CameraConstrainedHighSpeedCaptureSession) mCurrentSession; try { + setUpVideoCaptureRequestBuilder(mVideoRequestBuilder, cameraId); List list = CameraUtil .createHighSpeedRequestList(mVideoRequestBuilder.build()); session.setRepeatingBurst(list, mCaptureCallback, mCameraHandler); @@ -3788,7 +3788,7 @@ public class CaptureModule implements CameraModule, PhotoController, mRecordingTotalTime = 0L; mRecordingStartTime = SystemClock.uptimeMillis(); mUI.enableShutter(false); - mUI.showRecordingUI(true, true); + mUI.showRecordingUI(true, false); updateRecordingTime(); keepScreenOn(); } @@ -3979,12 +3979,20 @@ public class CaptureModule implements CameraModule, PhotoController, if (!mIsRecordingVideo) return; applyVideoFlash(mVideoRequestBuilder); applyVideoFlash(mVideoPausePreviewRequestBuilder); + CaptureRequest captureRequest = null; try { if (mMediaRecorderPausing) { - mCurrentSession.setRepeatingRequest(mVideoPausePreviewRequestBuilder.build(), - mCaptureCallback, mCameraHandler); + captureRequest = mVideoPausePreviewRequestBuilder.build(); + } else { + captureRequest = mVideoRequestBuilder.build(); + } + if (mCurrentSession instanceof CameraConstrainedHighSpeedCaptureSession) { + CameraConstrainedHighSpeedCaptureSession session = + (CameraConstrainedHighSpeedCaptureSession) mCurrentSession; + List requestList = session.createHighSpeedRequestList(captureRequest); + session.setRepeatingBurst(requestList, mCaptureCallback, mCameraHandler); } else { - mCurrentSession.setRepeatingRequest(mVideoRequestBuilder.build(), mCaptureCallback, + mCurrentSession.setRepeatingRequest(captureRequest, mCaptureCallback, mCameraHandler); } } catch (CameraAccessException e) { |