summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSuman Mukherjee <sumam@codeaurora.org>2014-12-16 15:50:15 +0530
committerMichael Bestas <mikeioannina@gmail.com>2015-08-29 04:15:51 +0300
commit98a0154904534298b111ba0e583c5edd1b4f7c31 (patch)
treed8d830be31223256ed3e4c04f183f34a7042fa8d /src
parent27384ba0f0cb95118f53766f119508237abd6cdd (diff)
downloadandroid_packages_apps_Snap-98a0154904534298b111ba0e583c5edd1b4f7c31.tar.gz
android_packages_apps_Snap-98a0154904534298b111ba0e583c5edd1b4f7c31.tar.bz2
android_packages_apps_Snap-98a0154904534298b111ba0e583c5edd1b4f7c31.zip
Camera: Set preview fps after recording.
4k DCI recorded FPS is getting picked up from profile and not getting reset to preview FPS after stop recording. Fix made to set the preview FPS range after stop recording. Change-Id: I4892e6fcee3eefbcbd6ca9426e56e2303cdad844
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/VideoModule.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 2acb7eee1..2b3e944b0 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -1821,6 +1821,18 @@ public class VideoModule implements CameraModule,
mUI.hideSurfaceView();
// Switch back to use SurfaceTexture for preview.
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]);
+ } else {
+ mParameters.setPreviewFrameRate(30);
+ }
+ mCameraDevice.setParameters(mParameters);
+ }
}
}
// Update the parameters here because the parameters might have been altered