summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-08-23 19:20:52 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2018-08-23 19:20:51 -0700
commit8c41a1cf591cd609b66c5e436ac30e5e205e9345 (patch)
tree29142eca7d5580b298fd2762f0cd6b2cbccfe652 /src/com
parent6ee775b0a6f961687f933d3bc9953e82eeaf4acf (diff)
parent24e0058e5d25891e962495a1a9eb4f911ef44121 (diff)
downloadandroid_packages_apps_Snap-8c41a1cf591cd609b66c5e436ac30e5e205e9345.tar.gz
android_packages_apps_Snap-8c41a1cf591cd609b66c5e436ac30e5e205e9345.tar.bz2
android_packages_apps_Snap-8c41a1cf591cd609b66c5e436ac30e5e205e9345.zip
Merge "Add new bit rate for 1920x1080:240 and 1280x720:480" into camera-SnapdragonCamera.lnx.2.0
Diffstat (limited to 'src/com')
-rwxr-xr-xsrc/com/android/camera/CameraSettings.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 57d217132..9a0a8219b 100755
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -335,8 +335,10 @@ public class CameraSettings {
VIDEO_ENCODER_BITRATE.put("3840x2160:60", 67200000);
VIDEO_ENCODER_BITRATE.put("1920x1080:60", 32000000);
VIDEO_ENCODER_BITRATE.put("1920x1080:120", 50000000);
+ VIDEO_ENCODER_BITRATE.put("1920x1080:240", 80000000);
VIDEO_ENCODER_BITRATE.put("1280x720:120", 35000000);
VIDEO_ENCODER_BITRATE.put("1280x720:240", 72000000);
+ VIDEO_ENCODER_BITRATE.put("1280x720:480", 88000000);
VIDEO_ENCODER_BITRATE.put("720:480:120", 5200000);
//4k DCI
VIDEO_ENCODER_BITRATE.put("4096x2160:60" + MediaRecorder.VideoEncoder.HEVC, 70840000);