diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-05-23 17:59:09 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-05-23 17:59:09 -0700 |
| commit | b663982c9042cb57150bf86bc8ad84b476581538 (patch) | |
| tree | 0c603f875cace1a70a4c08fc85f6ef73b57462b0 /src/com/android/camera/CameraSettings.java | |
| parent | 84cc39facdfc5f32e18899b93f42cd5240c9402e (diff) | |
| parent | 08f68a1e4d05ae996f6bf42c83d692a182a8f34b (diff) | |
| download | android_packages_apps_Snap-b663982c9042cb57150bf86bc8ad84b476581538.tar.gz android_packages_apps_Snap-b663982c9042cb57150bf86bc8ad84b476581538.tar.bz2 android_packages_apps_Snap-b663982c9042cb57150bf86bc8ad84b476581538.zip | |
Merge "SnapdragonCamera: Update encoder from H265 to HEVC" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index a12ce5de0..acf0f135b 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -282,7 +282,7 @@ public class CameraSettings { //video encoders VIDEO_ENCODER_TABLE.put(MediaRecorder.VideoEncoder.H263, "h263"); VIDEO_ENCODER_TABLE.put(MediaRecorder.VideoEncoder.H264, "h264"); - // VIDEO_ENCODER_TABLE.put(MediaRecorder.VideoEncoder.H265, "h265"); + VIDEO_ENCODER_TABLE.put(MediaRecorder.VideoEncoder.HEVC, "h265"); VIDEO_ENCODER_TABLE.put(MediaRecorder.VideoEncoder.MPEG_4_SP, "m4v"); //video qualities |