diff options
| author | Andreas Huber <andih@google.com> | 2010-11-15 10:07:17 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-15 10:07:17 -0800 |
| commit | 81a602958ffc78d591700229e19acd653b7dd4de (patch) | |
| tree | 0752f22c026ace0236f482d9896113c860a2615d /media/java | |
| parent | c86b5a6af931fb0b7fae0a5a471b6dc6ad7ef42a (diff) | |
| parent | 5dffd0e3af502acdc2e45425139ef8081fa4f0a8 (diff) | |
| download | frameworks_base-81a602958ffc78d591700229e19acd653b7dd4de.zip frameworks_base-81a602958ffc78d591700229e19acd653b7dd4de.tar.gz frameworks_base-81a602958ffc78d591700229e19acd653b7dd4de.tar.bz2 | |
Merge "Add http live mime types to MediaFile, add support for playlist mime types to browser."
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/MediaFile.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/media/java/android/media/MediaFile.java b/media/java/android/media/MediaFile.java index 80c97a0..0e689e4 100644 --- a/media/java/android/media/MediaFile.java +++ b/media/java/android/media/MediaFile.java @@ -77,11 +77,13 @@ public class MediaFile { private static final int LAST_IMAGE_FILE_TYPE = FILE_TYPE_WBMP; // Playlist file types - public static final int FILE_TYPE_M3U = 41; - public static final int FILE_TYPE_PLS = 42; - public static final int FILE_TYPE_WPL = 43; + public static final int FILE_TYPE_M3U = 41; + public static final int FILE_TYPE_PLS = 42; + public static final int FILE_TYPE_WPL = 43; + public static final int FILE_TYPE_HTTPLIVE = 44; + private static final int FIRST_PLAYLIST_FILE_TYPE = FILE_TYPE_M3U; - private static final int LAST_PLAYLIST_FILE_TYPE = FILE_TYPE_WPL; + private static final int LAST_PLAYLIST_FILE_TYPE = FILE_TYPE_HTTPLIVE; // Drm file types public static final int FILE_TYPE_FL = 51; @@ -194,6 +196,9 @@ public class MediaFile { addFileType("M3U", FILE_TYPE_M3U, "audio/x-mpegurl", MtpConstants.FORMAT_M3U_PLAYLIST); addFileType("PLS", FILE_TYPE_PLS, "audio/x-scpls", MtpConstants.FORMAT_PLS_PLAYLIST); addFileType("WPL", FILE_TYPE_WPL, "application/vnd.ms-wpl", MtpConstants.FORMAT_WPL_PLAYLIST); + addFileType("M3U8", FILE_TYPE_HTTPLIVE, "application/vnd.apple.mpegurl"); + addFileType("M3U8", FILE_TYPE_HTTPLIVE, "audio/mpegurl"); + addFileType("M3U8", FILE_TYPE_HTTPLIVE, "audio/x-mpegurl"); addFileType("FL", FILE_TYPE_FL, "application/x-android-drm-fl"); |