diff options
| -rw-r--r-- | res/values/qcomarrays.xml | 2 | ||||
| -rw-r--r-- | res/values/qcomstrings.xml | 1 | ||||
| -rwxr-xr-x | src/com/android/camera/VideoModule.java | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml index 3a5387a22..f7d127993 100644 --- a/res/values/qcomarrays.xml +++ b/res/values/qcomarrays.xml @@ -476,12 +476,14 @@ <item>@string/pref_camera_videoencoder_entry_0</item> <item>@string/pref_camera_videoencoder_entry_1</item> <item>@string/pref_camera_videoencoder_entry_2</item> + <item>@string/pref_camera_videoencoder_entry_3</item> </string-array> <string-array name="pref_camera_videoencoder_entryvalues" translatable="false"> <item>m4v</item> <item>h263</item> <item>h264</item> + <item>h265</item> </string-array> <!-- Camera Preferences Audio Encoder dialog box entries --> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 2c93a7352..56b9350e1 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -70,6 +70,7 @@ <string name="pref_camera_videoencoder_entry_0">MPEG4</string> <string name="pref_camera_videoencoder_entry_1">H263</string> <string name="pref_camera_videoencoder_entry_2">H264</string> + <string name="pref_camera_videoencoder_entry_3">H265</string> <!-- Default video encoder setting. A numerical value. --> <string name="pref_camera_videoencoder_default" translatable="false">h264</string> diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 9b68e228a..679f89557 100755 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -281,6 +281,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("m4v", MediaRecorder.VideoEncoder.MPEG_4_SP); VIDEO_ENCODER_TABLE.putDefault(MediaRecorder.VideoEncoder.DEFAULT); |