summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Wonsik Kim <wonsik@google.com> 2015-12-07 13:53:12 +0900
committer Wonsik Kim <wonsik@google.com> 2016-01-18 23:37:50 -0800
commit886e562bc5aa51b1bbb3f429a440d1f4e90db1c2 (patch)
tree0aebeabd287c81bc78b607d77243e0dab1b275f3
parenta0b16caf88f06189daaf4ded007c46db0dae5fe5 (diff)
media: add HEVC support to MediaRecorder
Bug: 22879917 Change-Id: Ie4ffd3fdf215296d742ace669ae1897bda6df380
-rw-r--r--api/current.txt1
-rw-r--r--api/system-current.txt1
-rw-r--r--api/test-current.txt1
-rw-r--r--media/java/android/media/MediaRecorder.java1
4 files changed, 4 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 657c7c392561..a3a88cf69dc9 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -20766,6 +20766,7 @@ package android.media {
field public static final int DEFAULT = 0; // 0x0
field public static final int H263 = 1; // 0x1
field public static final int H264 = 2; // 0x2
+ field public static final int HEVC = 5; // 0x5
field public static final int MPEG_4_SP = 3; // 0x3
field public static final int VP8 = 4; // 0x4
}
diff --git a/api/system-current.txt b/api/system-current.txt
index 459dc5996627..a2ebc683545c 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -22076,6 +22076,7 @@ package android.media {
field public static final int DEFAULT = 0; // 0x0
field public static final int H263 = 1; // 0x1
field public static final int H264 = 2; // 0x2
+ field public static final int HEVC = 5; // 0x5
field public static final int MPEG_4_SP = 3; // 0x3
field public static final int VP8 = 4; // 0x4
}
diff --git a/api/test-current.txt b/api/test-current.txt
index d78973f16d82..3151efc7ec9a 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -20774,6 +20774,7 @@ package android.media {
field public static final int DEFAULT = 0; // 0x0
field public static final int H263 = 1; // 0x1
field public static final int H264 = 2; // 0x2
+ field public static final int HEVC = 5; // 0x5
field public static final int MPEG_4_SP = 3; // 0x3
field public static final int VP8 = 4; // 0x4
}
diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java
index 504c6d0d2003..951738723a15 100644
--- a/media/java/android/media/MediaRecorder.java
+++ b/media/java/android/media/MediaRecorder.java
@@ -389,6 +389,7 @@ public class MediaRecorder
public static final int H264 = 2;
public static final int MPEG_4_SP = 3;
public static final int VP8 = 4;
+ public static final int HEVC = 5;
}
/**