From 5d2bcdbf424bb791c6796caba086b77e2f96723e Mon Sep 17 00:00:00 2001 From: Sultanxda Date: Tue, 5 Jan 2016 22:53:08 -0800 Subject: SnapdragonCamera: Remove bitrate and framerate scaling for HFR This is done in the framework now. Change-Id: I3d35de5099db4f1e4b9a29d4a6c8c9e6ccdf5af7 --- src/com/android/camera/VideoModule.java | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index c87a797fd..a49f3be67 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -1601,20 +1601,12 @@ public class VideoModule implements CameraModule, if (mCaptureTimeLapse) { double fps = 1000 / (double) mTimeBetweenTimeLapseFrameCaptureMs; setCaptureRate(mMediaRecorder, fps); - } else if (captureRate > 0) { + } else if (isHSR && captureRate > 0) { Log.i(TAG, "Setting capture-rate = " + captureRate); mMediaRecorder.setCaptureRate(captureRate); - // for HFR, encoder's target-framerate = capture-rate - if (isHSR) { - Log.i(TAG, "Setting fps = " + captureRate + " for HSR"); - mMediaRecorder.setVideoFrameRate(captureRate); - } - // for HFR, encoder's taget-framerate = 30fps (from profile) - if (isHFR) { - Log.i(TAG, "Setting fps = 30 for HFR"); - mMediaRecorder.setVideoFrameRate(30); - } - // TODO : bitrate correction..check with google + // for HSR, encoder's target-framerate = capture-rate + Log.i(TAG, "Setting fps = " + captureRate + " for HSR"); + mMediaRecorder.setVideoFrameRate(captureRate); } setRecordLocation(); -- cgit v1.2.3