summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSultanxda <sultanxda@gmail.com>2016-01-05 22:53:08 -0800
committerMichael Bestas <mikeioannina@cyanogenmod.org>2016-02-17 22:57:45 +0200
commit5d2bcdbf424bb791c6796caba086b77e2f96723e (patch)
treecd88af2fe271b0dc8a22a3e06947aab399e0c7e4
parent2ecc5b98821c847162c865fb7d798da79b7699f4 (diff)
downloadandroid_packages_apps_Snap-5d2bcdbf424bb791c6796caba086b77e2f96723e.zip
android_packages_apps_Snap-5d2bcdbf424bb791c6796caba086b77e2f96723e.tar.gz
android_packages_apps_Snap-5d2bcdbf424bb791c6796caba086b77e2f96723e.tar.bz2
SnapdragonCamera: Remove bitrate and framerate scaling for HFR
This is done in the framework now. Change-Id: I3d35de5099db4f1e4b9a29d4a6c8c9e6ccdf5af7
-rw-r--r--src/com/android/camera/VideoModule.java16
1 files changed, 4 insertions, 12 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index c87a797..a49f3be 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();