summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorCamera Software Integration <camswint@localhost>2017-03-11 09:56:35 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-03-11 09:56:35 -0800
commit7b2544b69f142c76cfac678dde304c1c48ba114a (patch)
treeab01d2eb1623fc1ce59e2afdb76f4601c6e26cd1 /src
parenta73a99d659b5cfd2a9d628303f68efea96101222 (diff)
parent699025cee87c893c042736ebce76881b608e76b3 (diff)
downloadandroid_packages_apps_Snap-7b2544b69f142c76cfac678dde304c1c48ba114a.tar.gz
android_packages_apps_Snap-7b2544b69f142c76cfac678dde304c1c48ba114a.tar.bz2
android_packages_apps_Snap-7b2544b69f142c76cfac678dde304c1c48ba114a.zip
Merge "SnapdragonCamera: Fixed FC No pre-defined bitrate for video/picture size 1080p/720p and 60 FPS/120 FPS HFR. Runtine calculate bitrate formula is error" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src')
-rwxr-xr-xsrc/com/android/camera/SettingsManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java
index 2e207b970..7172b300c 100755
--- a/src/com/android/camera/SettingsManager.java
+++ b/src/com/android/camera/SettingsManager.java
@@ -1162,7 +1162,7 @@ public class SettingsManager implements ListMenu.SettingsListener {
bitRate = CameraSettings.VIDEO_ENCODER_BITRATE.get(key);
} else {
Log.i(TAG, "No pre-defined bitrate for "+key);
- bitRate = profile.videoBitRate * (targetRate / profile.videoFrameRate);
+ bitRate = (profile.videoBitRate * targetRate) / profile.videoFrameRate;
}
return bitRate;
}