diff options
| author | Andreas Huber <andih@google.com> | 2010-05-20 14:56:53 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-05-20 14:56:53 -0700 |
| commit | 072f5247ef893e683728263a540bb93daafda376 (patch) | |
| tree | d3f993a2bbf68c8fb05c1b8dd27991168dc89f28 /media/java | |
| parent | c6a16327328cf04066ce948c3fbad34fdf1fbff4 (diff) | |
| download | frameworks_base-072f5247ef893e683728263a540bb93daafda376.zip frameworks_base-072f5247ef893e683728263a540bb93daafda376.tar.gz frameworks_base-072f5247ef893e683728263a540bb93daafda376.tar.bz2 | |
Support for media extraction from .mkv/.mka Matroska files in stagefright.
Change-Id: I4c26579828ad575523ccf58b0b5cb144046c04ca
related-to-bug: 2483739
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/MediaFile.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/media/java/android/media/MediaFile.java b/media/java/android/media/MediaFile.java index 9d1d420..f1da72f 100644 --- a/media/java/android/media/MediaFile.java +++ b/media/java/android/media/MediaFile.java @@ -46,8 +46,9 @@ public class MediaFile { public static final int FILE_TYPE_WMA = 6; public static final int FILE_TYPE_OGG = 7; public static final int FILE_TYPE_AAC = 8; + public static final int FILE_TYPE_MKA = 9; private static final int FIRST_AUDIO_FILE_TYPE = FILE_TYPE_MP3; - private static final int LAST_AUDIO_FILE_TYPE = FILE_TYPE_AAC; + private static final int LAST_AUDIO_FILE_TYPE = FILE_TYPE_MKA; // MIDI file types public static final int FILE_TYPE_MID = 11; @@ -63,8 +64,9 @@ public class MediaFile { public static final int FILE_TYPE_3GPP2 = 24; public static final int FILE_TYPE_WMV = 25; public static final int FILE_TYPE_ASF = 26; + public static final int FILE_TYPE_MKV = 27; private static final int FIRST_VIDEO_FILE_TYPE = FILE_TYPE_MP4; - private static final int LAST_VIDEO_FILE_TYPE = FILE_TYPE_ASF; + private static final int LAST_VIDEO_FILE_TYPE = FILE_TYPE_MKV; // Image file types public static final int FILE_TYPE_JPEG = 31; @@ -134,6 +136,7 @@ public class MediaFile { addFileType("OGG", FILE_TYPE_OGG, "application/ogg"); addFileType("OGA", FILE_TYPE_OGG, "application/ogg"); addFileType("AAC", FILE_TYPE_AAC, "audio/aac"); + addFileType("MKA", FILE_TYPE_MKA, "audio/x-matroska"); addFileType("MID", FILE_TYPE_MID, "audio/midi"); addFileType("MIDI", FILE_TYPE_MID, "audio/midi"); @@ -151,6 +154,8 @@ public class MediaFile { addFileType("3GPP", FILE_TYPE_3GPP, "video/3gpp"); addFileType("3G2", FILE_TYPE_3GPP2, "video/3gpp2"); addFileType("3GPP2", FILE_TYPE_3GPP2, "video/3gpp2"); + addFileType("MKV", FILE_TYPE_MKV, "video/x-matroska"); + addFileType("WEBM", FILE_TYPE_MKV, "video/x-matroska"); if (isWMVEnabled()) { addFileType("WMV", FILE_TYPE_WMV, "video/x-ms-wmv"); addFileType("ASF", FILE_TYPE_ASF, "video/x-ms-asf"); |