diff options
| author | Shalaj Jain <shalajj@codeaurora.org> | 2015-07-29 13:33:25 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2015-10-06 03:26:49 -0600 |
| commit | 6229b9435da4d1a01ceb86bd04854139a7b3796e (patch) | |
| tree | 94b4ed7768241aea44a7d87401088a34a991b163 /media | |
| parent | cf5a398354864e4c1b0665f8ba7d7d008e433a7f (diff) | |
| download | frameworks_base-6229b9435da4d1a01ceb86bd04854139a7b3796e.zip frameworks_base-6229b9435da4d1a01ceb86bd04854139a7b3796e.tar.gz frameworks_base-6229b9435da4d1a01ceb86bd04854139a7b3796e.tar.bz2 | |
frameworks/base: media: Add support for extended file types
Add support for flv, divx and dash file and mime types.
Change-Id: I0b3654dee776dc70f0fc3f32e9fe8eca4f4faa8e
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/MediaFile.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/media/java/android/media/MediaFile.java b/media/java/android/media/MediaFile.java index 526656a..22669a5 100644 --- a/media/java/android/media/MediaFile.java +++ b/media/java/android/media/MediaFile.java @@ -69,8 +69,10 @@ public class MediaFile { // More video file types public static final int FILE_TYPE_MP2PS = 200; + public static final int FILE_TYPE_DIVX = 201; + public static final int FILE_TYPE_FLV = 202; private static final int FIRST_VIDEO_FILE_TYPE2 = FILE_TYPE_MP2PS; - private static final int LAST_VIDEO_FILE_TYPE2 = FILE_TYPE_MP2PS; + private static final int LAST_VIDEO_FILE_TYPE2 = FILE_TYPE_FLV; // Image file types public static final int FILE_TYPE_JPEG = 31; @@ -87,9 +89,10 @@ public class MediaFile { public static final int FILE_TYPE_PLS = 42; public static final int FILE_TYPE_WPL = 43; public static final int FILE_TYPE_HTTPLIVE = 44; + public static final int FILE_TYPE_DASH = 45; private static final int FIRST_PLAYLIST_FILE_TYPE = FILE_TYPE_M3U; - private static final int LAST_PLAYLIST_FILE_TYPE = FILE_TYPE_HTTPLIVE; + private static final int LAST_PLAYLIST_FILE_TYPE = FILE_TYPE_DASH; // Drm file types public static final int FILE_TYPE_FL = 51; @@ -240,6 +243,9 @@ public class MediaFile { addFileType("ZIP", FILE_TYPE_ZIP, "application/zip"); addFileType("MPG", FILE_TYPE_MP2PS, "video/mp2p"); addFileType("MPEG", FILE_TYPE_MP2PS, "video/mp2p"); + addFileType("DIVX", FILE_TYPE_DIVX, "video/divx"); + addFileType("FLV", FILE_TYPE_FLV, "video/flv"); + addFileType("MPD", FILE_TYPE_DASH, "application/dash+xml"); } public static boolean isAudioFileType(int fileType) { |