summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSuman Mukherjee <sumam@codeaurora.org>2014-12-16 15:50:15 +0530
committerSteve Kondik <steve@cyngn.com>2016-11-02 12:22:24 -0700
commit07c995eed95fbda9146b9b0bf8b3a8803c3c1b61 (patch)
tree974be8de662833276c8afbad9771542edaffaf6c /src
parent167fa0c665caff37a289450efe644dd0d1e65df0 (diff)
downloadandroid_packages_apps_Snap-07c995eed95fbda9146b9b0bf8b3a8803c3c1b61.tar.gz
android_packages_apps_Snap-07c995eed95fbda9146b9b0bf8b3a8803c3c1b61.tar.bz2
android_packages_apps_Snap-07c995eed95fbda9146b9b0bf8b3a8803c3c1b61.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 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