diff options
| author | Andreas Huber <andih@google.com> | 2010-06-07 13:05:37 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-06-07 13:05:37 -0700 |
| commit | a557b24ac4dd568d86b08753f7c0361d04f80d46 (patch) | |
| tree | 1f74017b413d818c3473e559451e9c45cd613acb /media/java | |
| parent | 455d41002e17de93b1486b2b2a97a71a0d62903b (diff) | |
| download | frameworks_base-a557b24ac4dd568d86b08753f7c0361d04f80d46.zip frameworks_base-a557b24ac4dd568d86b08753f7c0361d04f80d46.tar.gz frameworks_base-a557b24ac4dd568d86b08753f7c0361d04f80d46.tar.bz2 | |
Initial checkin of mpeg2 transport stream parser for stagefright.
Change-Id: I328ce77404daf7127933b48c9d58ed504fb8fc6f
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/MediaFile.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/media/java/android/media/MediaFile.java b/media/java/android/media/MediaFile.java index f1da72f..6e527d9 100644 --- a/media/java/android/media/MediaFile.java +++ b/media/java/android/media/MediaFile.java @@ -65,8 +65,9 @@ public class MediaFile { public static final int FILE_TYPE_WMV = 25; public static final int FILE_TYPE_ASF = 26; public static final int FILE_TYPE_MKV = 27; + public static final int FILE_TYPE_MP2TS = 28; private static final int FIRST_VIDEO_FILE_TYPE = FILE_TYPE_MP4; - private static final int LAST_VIDEO_FILE_TYPE = FILE_TYPE_MKV; + private static final int LAST_VIDEO_FILE_TYPE = FILE_TYPE_MP2TS; // Image file types public static final int FILE_TYPE_JPEG = 31; @@ -156,6 +157,8 @@ public class MediaFile { addFileType("3GPP2", FILE_TYPE_3GPP2, "video/3gpp2"); addFileType("MKV", FILE_TYPE_MKV, "video/x-matroska"); addFileType("WEBM", FILE_TYPE_MKV, "video/x-matroska"); + addFileType("TS", FILE_TYPE_MP2TS, "video/mp2ts"); + if (isWMVEnabled()) { addFileType("WMV", FILE_TYPE_WMV, "video/x-ms-wmv"); addFileType("ASF", FILE_TYPE_ASF, "video/x-ms-asf"); |