diff options
author | Susmitha Gummalla <vgummall@codeaurora.org> | 2016-04-13 17:51:27 -0700 |
---|---|---|
committer | Susmitha Gummalla <vgummall@codeaurora.org> | 2016-05-13 14:51:17 -0700 |
commit | 08f68a1e4d05ae996f6bf42c83d692a182a8f34b (patch) | |
tree | c1b842534c32687230f5f739d3c345a8cb465e43 | |
parent | 6b741069fbe98a3b75ae8744f4a7790525199deb (diff) | |
download | android_packages_apps_Snap-08f68a1e4d05ae996f6bf42c83d692a182a8f34b.tar.gz android_packages_apps_Snap-08f68a1e4d05ae996f6bf42c83d692a182a8f34b.tar.bz2 android_packages_apps_Snap-08f68a1e4d05ae996f6bf42c83d692a182a8f34b.zip |
SnapdragonCamera: Update encoder from H265 to HEVC
Update Camera setting to use HEVC instead of H265 as per
latest AOSP changes
CRs-fixed: 1015477
Change-Id: Ib17de6f778166f3a7cb7b8e403a9b3c7fb0b3f0c
-rw-r--r-- | src/com/android/camera/CameraSettings.java | 2 | ||||
-rw-r--r-- | src/com/android/camera/VideoModule.java | 2 |
2 files changed, 2 insertions, 2 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 diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index c21a56ae8..6e44a1af7 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -315,7 +315,7 @@ public class VideoModule implements CameraModule, VIDEO_ENCODER_TABLE.put("h263", MediaRecorder.VideoEncoder.H263); VIDEO_ENCODER_TABLE.put("h264", MediaRecorder.VideoEncoder.H264); - // VIDEO_ENCODER_TABLE.put("h265", MediaRecorder.VideoEncoder.H265); + VIDEO_ENCODER_TABLE.put("h265", MediaRecorder.VideoEncoder.HEVC); VIDEO_ENCODER_TABLE.put("m4v", MediaRecorder.VideoEncoder.MPEG_4_SP); VIDEO_ENCODER_TABLE.putDefault(MediaRecorder.VideoEncoder.DEFAULT); |