diff options
| author | Camera Software Integration <camswint@localhost> | 2016-11-15 06:59:52 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-15 06:59:52 -0800 |
| commit | 8c501cdda00e98b29e95a5ca92802e144566afdb (patch) | |
| tree | 229556ece346572e41d03952232b9824c6f31320 /src/com/android/camera/CaptureModule.java | |
| parent | 68549e078868f071581c7de693133d3cc84c1ee3 (diff) | |
| parent | 0c8aa668f80f9149e69eece0077cd7e0bbff292e (diff) | |
| download | android_packages_apps_Snap-8c501cdda00e98b29e95a5ca92802e144566afdb.tar.gz android_packages_apps_Snap-8c501cdda00e98b29e95a5ca92802e144566afdb.tar.bz2 android_packages_apps_Snap-8c501cdda00e98b29e95a5ca92802e144566afdb.zip | |
Merge "SnapdragonCamera: update face view for video recording use-case" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
| -rw-r--r-- | src/com/android/camera/CaptureModule.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 2c5fd744a..c4558ba18 100644 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -2530,6 +2530,8 @@ public class CaptureModule implements CameraModule, PhotoController, setUpMediaRecorder(cameraId); createVideoSnapshotImageReader(); mVideoRequestBuilder = mCameraDevice[cameraId].createCaptureRequest(CameraDevice.TEMPLATE_RECORD); + mVideoRequestBuilder.setTag(cameraId); + List<Surface> surfaces = new ArrayList<>(); Surface surface = getPreviewSurfaceForSession(cameraId); @@ -2560,7 +2562,7 @@ public class CaptureModule implements CameraModule, PhotoController, try { List list = session .createHighSpeedRequestList(mVideoRequestBuilder.build()); - session.setRepeatingBurst(list, null, mCameraHandler); + session.setRepeatingBurst(list, mCaptureCallback, mCameraHandler); } catch (CameraAccessException e) { Log.e(TAG, "Failed to start high speed video recording " + e.getMessage()); @@ -2600,7 +2602,8 @@ public class CaptureModule implements CameraModule, PhotoController, mCurrentSession = cameraCaptureSession; try { setUpVideoCaptureRequestBuilder(mVideoRequestBuilder); - mCurrentSession.setRepeatingRequest(mVideoRequestBuilder.build(), null, mCameraHandler); + mCurrentSession.setRepeatingRequest(mVideoRequestBuilder.build(), + mCaptureCallback, mCameraHandler); } catch (CameraAccessException e) { e.printStackTrace(); } |