diff options
| author | Andreas Huber <andih@google.com> | 2011-09-08 14:12:44 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2011-09-30 15:26:31 -0700 |
| commit | bc554956128d69d8d2e60365fb6cffe6facf659b (patch) | |
| tree | 8a84036682044f96b5b5aade1b18add9c40e86f3 /media/java | |
| parent | ce0a7ade96ddbdcb342e0b382e9d3ea43962cafd (diff) | |
| download | frameworks_base-bc554956128d69d8d2e60365fb6cffe6facf659b.zip frameworks_base-bc554956128d69d8d2e60365fb6cffe6facf659b.tar.gz frameworks_base-bc554956128d69d8d2e60365fb6cffe6facf659b.tar.bz2 | |
Support for an MPEG2 Program Stream extractor.
Change-Id: I606d87c278f72b22a5b6d7ee57bce6b02e280d41
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/MediaFile.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/media/java/android/media/MediaFile.java b/media/java/android/media/MediaFile.java index 8793841..e275aa6 100644 --- a/media/java/android/media/MediaFile.java +++ b/media/java/android/media/MediaFile.java @@ -71,6 +71,11 @@ public class MediaFile { private static final int FIRST_VIDEO_FILE_TYPE = FILE_TYPE_MP4; private static final int LAST_VIDEO_FILE_TYPE = FILE_TYPE_WEBM; + // More video file types + public static final int FILE_TYPE_MP2PS = 200; + private static final int FIRST_VIDEO_FILE_TYPE2 = FILE_TYPE_MP2PS; + private static final int LAST_VIDEO_FILE_TYPE2 = FILE_TYPE_MP2PS; + // Image file types public static final int FILE_TYPE_JPEG = 31; public static final int FILE_TYPE_GIF = 32; @@ -235,6 +240,8 @@ public class MediaFile { addFileType("PPT", FILE_TYPE_MS_POWERPOINT, "application/mspowerpoint", MtpConstants.FORMAT_MS_POWERPOINT_PRESENTATION); addFileType("FLAC", FILE_TYPE_FLAC, "audio/flac", MtpConstants.FORMAT_FLAC); addFileType("ZIP", FILE_TYPE_ZIP, "application/zip"); + addFileType("MPG", FILE_TYPE_MP2PS, "video/mp2p"); + addFileType("MPEG", FILE_TYPE_MP2PS, "video/mp2p"); } public static boolean isAudioFileType(int fileType) { @@ -246,7 +253,9 @@ public class MediaFile { public static boolean isVideoFileType(int fileType) { return (fileType >= FIRST_VIDEO_FILE_TYPE && - fileType <= LAST_VIDEO_FILE_TYPE); + fileType <= LAST_VIDEO_FILE_TYPE) + || (fileType >= FIRST_VIDEO_FILE_TYPE2 && + fileType <= LAST_VIDEO_FILE_TYPE2); } public static boolean isImageFileType(int fileType) { |