diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-08-22 05:38:31 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-08-22 05:38:31 -0700 |
| commit | 1f426e12d7b34c719e146a7965df8f6e8f682ca7 (patch) | |
| tree | 94d0e4cb6f91765efe3dede9baae2ac389779586 | |
| parent | 064326fa58d5172549077ca1d7330df020bb2525 (diff) | |
| parent | 3fab952910c9988e61f6f83f22de5b434ff8bd20 (diff) | |
| download | android_packages_apps_Snap-1f426e12d7b34c719e146a7965df8f6e8f682ca7.tar.gz android_packages_apps_Snap-1f426e12d7b34c719e146a7965df8f6e8f682ca7.tar.bz2 android_packages_apps_Snap-1f426e12d7b34c719e146a7965df8f6e8f682ca7.zip | |
Merge "SnapdragonCamera: Fix HFR string mismatch"
| -rwxr-xr-x[-rw-r--r--] | src/com/android/camera/VideoModule.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 698e76ff9..3c2b3541a 100644..100755 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -840,9 +840,9 @@ public class VideoModule implements CameraModule, if(!("off".equals(HighFrameRate)) && !("hsr".equals(HighFrameRate))) { Size size = null; try { - if (isSupported(HighFrameRate, mParameters.getSupportedVideoHighFrameRateModes())) { + if (isSupported(HighFrameRate.substring(3), mParameters.getSupportedVideoHighFrameRateModes())) { int index = mParameters.getSupportedVideoHighFrameRateModes().indexOf( - HighFrameRate); + HighFrameRate.substring(3)); size = mParameters.getSupportedHfrSizes().get(index); } else { return false; @@ -861,7 +861,7 @@ public class VideoModule implements CameraModule, return false; } - int hfrFps = Integer.parseInt(HighFrameRate); + int hfrFps = Integer.parseInt(HighFrameRate.substring(3)); int inputBitrate = videoWidth * videoHeight * hfrFps; boolean supported = false; |