diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-06-10 23:15:50 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-06-10 23:15:50 -0700 |
| commit | 69b71ffdc38b7261c9eabb3a22259da13ed11b02 (patch) | |
| tree | b979099f7db9381723dc75731b576fbd95e95030 | |
| parent | 4f9543ab9769a3e2bca44e1a54d7262dbc947d93 (diff) | |
| parent | 26d3e7fe41256349c50cdfd021cb385a573fbb18 (diff) | |
| download | android_packages_apps_Snap-69b71ffdc38b7261c9eabb3a22259da13ed11b02.tar.gz android_packages_apps_Snap-69b71ffdc38b7261c9eabb3a22259da13ed11b02.tar.bz2 android_packages_apps_Snap-69b71ffdc38b7261c9eabb3a22259da13ed11b02.zip | |
Merge "SnapdragonCamera: Using reflection to remove compilation error" into camera.lnx.1.0-dev.1.0
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 8 | ||||
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index da203d52c..6c4247dd8 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -278,7 +278,13 @@ 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"); + int h265 = ApiHelper.getIntFieldIfExists(MediaRecorder.VideoEncoder.class, + "HEVC", null, MediaRecorder.VideoEncoder.DEFAULT); + if (h265 == MediaRecorder.VideoEncoder.DEFAULT) { + h265 = ApiHelper.getIntFieldIfExists(MediaRecorder.VideoEncoder.class, + "H265", null, MediaRecorder.VideoEncoder.DEFAULT); + } + VIDEO_ENCODER_TABLE.put(h265, "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 9ad8f0197..96423044f 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -315,7 +315,13 @@ 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); + int h265 = ApiHelper.getIntFieldIfExists(MediaRecorder.VideoEncoder.class, + "HEVC", null, MediaRecorder.VideoEncoder.DEFAULT); + if (h265 == MediaRecorder.VideoEncoder.DEFAULT) { + h265 = ApiHelper.getIntFieldIfExists(MediaRecorder.VideoEncoder.class, + "H265", null, MediaRecorder.VideoEncoder.DEFAULT); + } + VIDEO_ENCODER_TABLE.put("h265", h265); VIDEO_ENCODER_TABLE.put("m4v", MediaRecorder.VideoEncoder.MPEG_4_SP); VIDEO_ENCODER_TABLE.putDefault(MediaRecorder.VideoEncoder.DEFAULT); |