summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CaptureModule.java
diff options
context:
space:
mode:
authorCamera Software Integration <camswint@localhost>2016-12-22 22:55:23 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-12-22 22:55:23 -0800
commit1507d7f588ce455aa6b4f72ff90609c4fde33e0a (patch)
tree87b5622086ff0b341fcd141bae22b0af161d652a /src/com/android/camera/CaptureModule.java
parentaedc2351ec569c670dd167220cb2f2ca5dc7d71e (diff)
parentd0eb4c5e2cbd4b5af416e7150957d64b52edb04c (diff)
downloadandroid_packages_apps_Snap-1507d7f588ce455aa6b4f72ff90609c4fde33e0a.tar.gz
android_packages_apps_Snap-1507d7f588ce455aa6b4f72ff90609c4fde33e0a.tar.bz2
android_packages_apps_Snap-1507d7f588ce455aa6b4f72ff90609c4fde33e0a.zip
Merge "SnapdragonCamera: HFR Crash on 720 120FPS with Camera 2" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
-rw-r--r--[-rwxr-xr-x]src/com/android/camera/CaptureModule.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 184b03a1d..e870161f3 100755..100644
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -2716,8 +2716,8 @@ public class CaptureModule implements CameraModule, PhotoController,
CameraConstrainedHighSpeedCaptureSession session =
(CameraConstrainedHighSpeedCaptureSession) mCurrentSession;
try {
- List list = session
- .createHighSpeedRequestList(mVideoRequestBuilder.build());
+ List list = CameraUtil
+ .createHighSpeedRequestList(mVideoRequestBuilder.build(),cameraId);
session.setRepeatingBurst(list, mCaptureCallback, mCameraHandler);
} catch (CameraAccessException e) {
Log.e(TAG, "Failed to start high speed video recording "