diff options
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | media/java/android/media/MediaRecorder.java | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 6da3365..41dc3f7 100644 --- a/api/current.txt +++ b/api/current.txt @@ -15116,6 +15116,7 @@ package android.media { field public static final int AMR_WB = 2; // 0x2 field public static final int DEFAULT = 0; // 0x0 field public static final int HE_AAC = 4; // 0x4 + field public static final int VORBIS = 6; // 0x6 } public final class MediaRecorder.AudioSource { @@ -15146,6 +15147,7 @@ package android.media { field public static final int MPEG_4 = 2; // 0x2 field public static final deprecated int RAW_AMR = 3; // 0x3 field public static final int THREE_GPP = 1; // 0x1 + field public static final int WEBM = 9; // 0x9 } public final class MediaRecorder.VideoEncoder { @@ -15153,6 +15155,7 @@ package android.media { field public static final int H263 = 1; // 0x1 field public static final int H264 = 2; // 0x2 field public static final int MPEG_4_SP = 3; // 0x3 + field public static final int VP8 = 4; // 0x4 } public final class MediaRecorder.VideoSource { diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java index 3917bf1..59307d0 100644 --- a/media/java/android/media/MediaRecorder.java +++ b/media/java/android/media/MediaRecorder.java @@ -299,6 +299,9 @@ public class MediaRecorder /** @hide H.264/AAC data encapsulated in MPEG2/TS */ public static final int OUTPUT_FORMAT_MPEG2TS = 8; + + /** VP8/VORBIS data in a WEBM container */ + public static final int WEBM = 9; }; /** @@ -321,6 +324,8 @@ public class MediaRecorder public static final int HE_AAC = 4; /** Enhanced Low Delay AAC (AAC-ELD) audio codec */ public static final int AAC_ELD = 5; + /** Ogg Vorbis audio codec */ + public static final int VORBIS = 6; } /** @@ -336,6 +341,7 @@ public class MediaRecorder public static final int H263 = 1; public static final int H264 = 2; public static final int MPEG_4_SP = 3; + public static final int VP8 = 4; } /** |