diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-12-05 16:02:15 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-12-05 16:02:15 -0800 |
| commit | 1303d9c19ec7384e166cf4ac7d3fbd974f3b0f4d (patch) | |
| tree | 3afb06939f0c5ae438b13f9d5f79a5f5ebf6fe2f /src/com/android/camera/CaptureModule.java | |
| parent | 5c12bc7d731e932f1d55fde5f27943937db7baa0 (diff) | |
| parent | 1b6ec131d95354bf28d1dc04b84da91e2e4e06b5 (diff) | |
Merge "SnapdragonCamera: Fix video fps is 60, preview fps is 30." into camera-SnapdragonCamera.lnx.2.0
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 8d07d933f..a73d0e0f4 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -4341,8 +4341,9 @@ public class CaptureModule implements CameraModule, PhotoController, mCaptureSession[cameraId] = cameraCaptureSession; try { setUpVideoCaptureRequestBuilder(mVideoRequestBuilder, cameraId); - mCurrentSession.setRepeatingRequest(mVideoRequestBuilder.build(), - mCaptureCallback, mCameraHandler); + List list = CameraUtil + .createHighSpeedRequestList(mVideoRequestBuilder.build()); + mCurrentSession.setRepeatingBurst(list, mCaptureCallback, mCameraHandler); } catch (CameraAccessException e) { e.printStackTrace(); } catch (IllegalStateException e) { @@ -4383,15 +4384,9 @@ public class CaptureModule implements CameraModule, PhotoController, List<CaptureRequest> slowMoRequests = null; try { setUpVideoCaptureRequestBuilder(mVideoRequestBuilder, cameraId); - if (mHighSpeedCapture && ((int) mHighSpeedFPSRange.getUpper() > NORMAL_SESSION_MAX_FPS)) { - slowMoRequests = ((CameraConstrainedHighSpeedCaptureSession) mCurrentSession). - createHighSpeedRequestList(mVideoRequestBuilder.build()); - mCurrentSession.setRepeatingBurst(slowMoRequests, - mCaptureCallback, mCameraHandler); - } else { - mCurrentSession.setRepeatingRequest(mVideoRequestBuilder.build(), - mCaptureCallback, mCameraHandler); - } + List list = CameraUtil + .createHighSpeedRequestList(mVideoRequestBuilder.build()); + mCurrentSession.setRepeatingBurst(list,mCaptureCallback, mCameraHandler); } catch (CameraAccessException e) { e.printStackTrace(); } catch (IllegalStateException e) { @@ -4672,6 +4667,7 @@ public class CaptureModule implements CameraModule, PhotoController, @Override public void onConfigured(CameraCaptureSession cameraCaptureSession) { mCurrentSession = cameraCaptureSession; + Log.v(TAG, "createConstrainedHighSpeedCaptureSession onConfigured"); mCaptureSession[cameraId] = cameraCaptureSession; CameraConstrainedHighSpeedCaptureSession session = (CameraConstrainedHighSpeedCaptureSession) mCurrentSession; |