summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/VideoModule.java
diff options
context:
space:
mode:
authorSuman Mukherjee <sumam@codeaurora.org>2014-12-16 15:50:15 +0530
committerMichael Bestas <mikeioannina@gmail.com>2017-01-04 21:57:35 +0200
commit1b0ff5efa111e56f496600e7a2fd955c25161282 (patch)
treee6430997908f691373dff0b81f13f13f280f90d6 /src/com/android/camera/VideoModule.java
parent74ed3d03e9ecf4e05c90c9d90286d9cd5c8c5b86 (diff)
downloadandroid_packages_apps_Snap-1b0ff5efa111e56f496600e7a2fd955c25161282.tar.gz
android_packages_apps_Snap-1b0ff5efa111e56f496600e7a2fd955c25161282.tar.bz2
android_packages_apps_Snap-1b0ff5efa111e56f496600e7a2fd955c25161282.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/com/android/camera/VideoModule.java')
-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 fc801aea4..5ce980583 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -2055,6 +2055,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