summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/VideoModule.java
diff options
context:
space:
mode:
authorJay Wang <jaywang@codeaurora.org>2016-07-26 16:55:25 -0700
committerJay Wang <jaywang@codeaurora.org>2016-07-26 17:03:37 -0700
commitef851559b08f029c192785e284821d4cfbcd3555 (patch)
treea47b8274dee88ff9f68f6ce75f69062b42b8d8eb /src/com/android/camera/VideoModule.java
parent9f65ee95c61d70d6f7c34cd8bedea61ff1cdf2d1 (diff)
downloadandroid_packages_apps_Snap-ef851559b08f029c192785e284821d4cfbcd3555.tar.gz
android_packages_apps_Snap-ef851559b08f029c192785e284821d4cfbcd3555.tar.bz2
android_packages_apps_Snap-ef851559b08f029c192785e284821d4cfbcd3555.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
Diffstat (limited to 'src/com/android/camera/VideoModule.java')
-rwxr-xr-xsrc/com/android/camera/VideoModule.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 6b26a9c88..f5b53d8b6 100755
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -220,6 +220,9 @@ public class VideoModule implements CameraModule,
private static final boolean PERSIST_4K_NO_LIMIT =
android.os.SystemProperties.getBoolean("persist.camcorder.4k.nolimit", 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
@@ -2523,8 +2526,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");