diff options
| author | Jay Wang <jaywang@codeaurora.org> | 2016-07-26 16:55:25 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-08-25 21:55:20 -0700 |
| commit | 6d09d041dd1dbf18f17846bf38bad6efe3f909b6 (patch) | |
| tree | 08f9bcaf2a9f9f1d2e843d650827a308d6be9661 | |
| parent | 475298e6a98c634704ca3479d365161f55ca7f19 (diff) | |
| download | android_packages_apps_Snap-6d09d041dd1dbf18f17846bf38bad6efe3f909b6.tar.gz android_packages_apps_Snap-6d09d041dd1dbf18f17846bf38bad6efe3f909b6.tar.bz2 android_packages_apps_Snap-6d09d041dd1dbf18f17846bf38bad6efe3f909b6.zip | |
SnapdragonCamera: Add system property to set EIS supported rate
By default, EIS is enabled with FPS <= 30. The maximum FPS
can be changed by setting persist.camcorder.eis.maxfps
Change-Id: I46ee1eee8121de0b5e5b1125b45d3a5f1a036461
CRs-Fixed: 1043548
| -rwxr-xr-x | src/com/android/camera/VideoModule.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 71b45666b..25a77ee2b 100755 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -224,6 +224,9 @@ public class VideoModule implements CameraModule, private boolean mFaceDetectionEnabled = false; private boolean mFaceDetectionStarted = false; + private static final int PERSIST_EIS_MAX_FPS = + android.os.SystemProperties.getInt("persist.camcorder.eis.maxfps", 30); + private final MediaSaveService.OnMediaSavedListener mOnVideoSavedListener = new MediaSaveService.OnMediaSavedListener() { @Override @@ -2618,8 +2621,14 @@ public class VideoModule implements CameraModule, CameraSettings.KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL, mActivity.getString(R.string.pref_video_time_lapse_frame_interval_default)); int timeLapseInterval = Integer.parseInt(frameIntervalStr); + int rate = 0; + if (!hfr.equals("off")) + rate = Integer.parseInt(hfr); + else + rate = Integer.parseInt(hsr); + Log.v(TAG, "rate = "+rate); if ( (timeLapseInterval != 0) || - (disMode.equals("enable")) || + (disMode.equals("enable") && (rate > PERSIST_EIS_MAX_FPS)) || ((hdr != null) && (!hdr.equals("off"))) ) { Log.v(TAG,"HDR/DIS/Time Lapse ON for HFR/HSR selection, turning HFR/HSR off"); mParameters.setVideoHighFrameRate("off"); |