diff options
author | Camera Software Integration <camswint@localhost> | 2016-05-31 03:32:24 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-05-31 03:43:31 -0700 |
commit | e8d4ba774d224e5076576ba4c29d1fc248456b40 (patch) | |
tree | ce4cb1eb5232e3064997d8ac40b50ff178f8d5c3 /src/com/android | |
parent | 07ab55b15c98cfa9d68e1af7ff9c08f11b049bae (diff) | |
download | android_packages_apps_Snap-e8d4ba774d224e5076576ba4c29d1fc248456b40.tar.gz android_packages_apps_Snap-e8d4ba774d224e5076576ba4c29d1fc248456b40.tar.bz2 android_packages_apps_Snap-e8d4ba774d224e5076576ba4c29d1fc248456b40.zip |
Revert "SnapdragonCamera: Update encoder from H265 to HEVC"
This reverts commit 08f68a1e4d05ae996f6bf42c83d692a182a8f34b
Change-Id: I659dd68861b30b6d79545ba3574320b63e4c4196
Diffstat (limited to 'src/com/android')
-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 acf0f135b..a12ce5de0 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.HEVC, "h265"); + // VIDEO_ENCODER_TABLE.put(MediaRecorder.VideoEncoder.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 cbfe7b94a..f8d79ed00 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.HEVC); + // VIDEO_ENCODER_TABLE.put("h265", MediaRecorder.VideoEncoder.H265); VIDEO_ENCODER_TABLE.put("m4v", MediaRecorder.VideoEncoder.MPEG_4_SP); VIDEO_ENCODER_TABLE.putDefault(MediaRecorder.VideoEncoder.DEFAULT); |