diff options
| author | 2009-06-26 17:57:22 -0500 | |
|---|---|---|
| committer | 2009-07-24 11:26:30 -0700 | |
| commit | 974ff946d114610ec41172fb6076d9d8810c3680 (patch) | |
| tree | 48056bbc2b534102198a0def72bf78b81a2e9b21 | |
| parent | c8f361450403e0b08a9d7dc4785bb12624435c37 (diff) | |
Add support for .aac and .asf extensions.
| -rw-r--r-- | media/java/android/media/MediaFile.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/media/java/android/media/MediaFile.java b/media/java/android/media/MediaFile.java index 8be11df0fd27..03ffc6764dfb 100644 --- a/media/java/android/media/MediaFile.java +++ b/media/java/android/media/MediaFile.java @@ -41,8 +41,9 @@ public class MediaFile { public static final int FILE_TYPE_AWB = 5; public static final int FILE_TYPE_WMA = 6; public static final int FILE_TYPE_OGG = 7; + public static final int FILE_TYPE_AAC = 8; private static final int FIRST_AUDIO_FILE_TYPE = FILE_TYPE_MP3; - private static final int LAST_AUDIO_FILE_TYPE = FILE_TYPE_OGG; + private static final int LAST_AUDIO_FILE_TYPE = FILE_TYPE_AAC; // MIDI file types public static final int FILE_TYPE_MID = 11; @@ -57,8 +58,9 @@ public class MediaFile { public static final int FILE_TYPE_3GPP = 23; public static final int FILE_TYPE_3GPP2 = 24; public static final int FILE_TYPE_WMV = 25; + public static final int FILE_TYPE_ASF = 26; private static final int FIRST_VIDEO_FILE_TYPE = FILE_TYPE_MP4; - private static final int LAST_VIDEO_FILE_TYPE = FILE_TYPE_WMV; + private static final int LAST_VIDEO_FILE_TYPE = FILE_TYPE_ASF; // Image file types public static final int FILE_TYPE_JPEG = 31; @@ -104,6 +106,7 @@ public class MediaFile { addFileType("WMA", FILE_TYPE_WMA, "audio/x-ms-wma"); addFileType("OGG", FILE_TYPE_OGG, "application/ogg"); addFileType("OGA", FILE_TYPE_OGG, "application/ogg"); + addFileType("AAC", FILE_TYPE_AAC, "audio/aac"); addFileType("MID", FILE_TYPE_MID, "audio/midi"); addFileType("MIDI", FILE_TYPE_MID, "audio/midi"); @@ -121,6 +124,7 @@ public class MediaFile { addFileType("3G2", FILE_TYPE_3GPP2, "video/3gpp2"); addFileType("3GPP2", FILE_TYPE_3GPP2, "video/3gpp2"); addFileType("WMV", FILE_TYPE_WMV, "video/x-ms-wmv"); + addFileType("ASF", FILE_TYPE_ASF, "video/x-ms-asf"); addFileType("JPG", FILE_TYPE_JPEG, "image/jpeg"); addFileType("JPEG", FILE_TYPE_JPEG, "image/jpeg"); |