From 3fab952910c9988e61f6f83f22de5b434ff8bd20 Mon Sep 17 00:00:00 2001 From: Leena Winterrowd Date: Thu, 21 Aug 2014 14:08:34 -0700 Subject: SnapdragonCamera: Fix HFR string mismatch Enforce consistency between HFR strings at the app and HAL levels Change-Id: I10f1cce5f90c1a87c15dddf80d05c28c8eaff298 --- src/com/android/camera/VideoModule.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 src/com/android/camera/VideoModule.java diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java old mode 100644 new mode 100755 index 698e76ff9..3c2b3541a --- 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; -- cgit v1.2.3