diff options
| author | xianming wang <mingwax@codeaurora.org> | 2018-12-25 14:48:10 +0800 |
|---|---|---|
| committer | jinwu <jinwu@codeaurora.org> | 2018-12-28 20:23:27 +0800 |
| commit | 881ef949a7ef365444efb22a69df13b0ab31034f (patch) | |
| tree | 54fb791020c126306563d27ceff410c86713b0af /src/com/android/camera/CaptureModule.java | |
| parent | c48104739d7221ff3c617f34f2d6c63be5888288 (diff) | |
| download | android_packages_apps_Snap-881ef949a7ef365444efb22a69df13b0ab31034f.tar.gz android_packages_apps_Snap-881ef949a7ef365444efb22a69df13b0ab31034f.tar.bz2 android_packages_apps_Snap-881ef949a7ef365444efb22a69df13b0ab31034f.zip | |
SnapdragonCamera: Set preview 30fps for different targets
Set preview 30fps for low tier target, and set preview 60
fps for high tier target.
Change-Id: Ib2806474e0c057210e938b14408836c334e3d0c9
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index b2ebc34be..25394ab2d 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -4352,9 +4352,8 @@ public class CaptureModule implements CameraModule, PhotoController, mCaptureSession[cameraId] = cameraCaptureSession; try { setUpVideoCaptureRequestBuilder(mVideoRequestBuilder, cameraId); - List list = CameraUtil - .createHighSpeedRequestList(mVideoRequestBuilder.build()); - mCurrentSession.setRepeatingBurst(list, mCaptureCallback, mCameraHandler); + mCurrentSession.setRepeatingRequest(mVideoRequestBuilder.build(), + mCaptureCallback, mCameraHandler); } catch (CameraAccessException e) { e.printStackTrace(); } catch (IllegalStateException e) { @@ -4392,9 +4391,25 @@ public class CaptureModule implements CameraModule, PhotoController, List<CaptureRequest> slowMoRequests = null; try { setUpVideoCaptureRequestBuilder(mVideoRequestBuilder, cameraId); - List list = CameraUtil - .createHighSpeedRequestList(mVideoRequestBuilder.build()); - mCurrentSession.setRepeatingBurst(list,mCaptureCallback, mCameraHandler); + int deviceSocId = mSettingsManager.getDeviceSocId(); + if (deviceSocId == SettingsManager.TALOS_SOCID || + deviceSocId == SettingsManager.MOOREA_SOCID) { + List list = CameraUtil + .createHighSpeedRequestList(mVideoRequestBuilder.build()); + mCurrentSession.setRepeatingBurst(list,mCaptureCallback, mCameraHandler); + } else { + 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); + } + } } catch (CameraAccessException e) { e.printStackTrace(); } catch (IllegalStateException e) { |