diff options
author | Emilian Peev <epeevs@codeaurora.org> | 2015-06-03 16:34:59 +0300 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2015-08-29 04:15:51 +0300 |
commit | 447b5a7e3791281f29bb149cb8d0e89f03abfdb4 (patch) | |
tree | a93941ed4388556371b9b3616040065bab9a96ad | |
parent | a1ba573ab1524c967a45161e7d31ca41ec17d874 (diff) | |
download | android_packages_apps_Snap-447b5a7e3791281f29bb149cb8d0e89f03abfdb4.tar.gz android_packages_apps_Snap-447b5a7e3791281f29bb149cb8d0e89f03abfdb4.tar.bz2 android_packages_apps_Snap-447b5a7e3791281f29bb149cb8d0e89f03abfdb4.zip |
Snapdragon Camera: Use consistent API for preview fps reset
Instead of using preview fps range API during
preview framerate reset use the fixed fps API.
This is to avoid any inconsistent behavior that
can be triggered when using both APIs from
MediaRecorder and Snapdragon application side.
Change-Id: Ib5251d8ea4d697db9bdea4e5ebf20606b286f54f
-rw-r--r-- | src/com/android/camera/VideoModule.java | 8 | ||||
-rw-r--r-- | src/com/android/camera/util/CameraUtil.java | 9 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index c6b1b0421..9849a26de 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -1823,11 +1823,9 @@ public class VideoModule implements CameraModule, startPreview(); } else { if (is4KEnabled()) { - int[] fpsRange = CameraUtil.getMaxPreviewFpsRange(mParameters); - if (fpsRange.length > 0) { - mParameters.setPreviewFpsRange( - fpsRange[Parameters.PREVIEW_FPS_MIN_INDEX], - fpsRange[Parameters.PREVIEW_FPS_MAX_INDEX]); + int fps = CameraUtil.getMaxPreviewFps(mParameters); + if (fps > 0) { + mParameters.setPreviewFrameRate(fps); } else { mParameters.setPreviewFrameRate(30); } diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java index 7201a7f8c..1217cde64 100644 --- a/src/com/android/camera/util/CameraUtil.java +++ b/src/com/android/camera/util/CameraUtil.java @@ -944,6 +944,15 @@ public class CameraUtil { return new int[0]; } + public static int getMaxPreviewFps(Parameters params) { + List<Integer> frameRates = params.getSupportedPreviewFrameRates(); + if (frameRates != null && frameRates.size() > 0) { + // The list is sorted. Return the last element. + return frameRates.get(frameRates.size() - 1).intValue(); + } + return -1; + } + private static class ImageFileNamer { private final SimpleDateFormat mFormat; |