diff options
| author | Andreas Huber <andih@google.com> | 2011-03-29 13:33:58 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-29 13:33:58 -0700 |
| commit | 8fddd761f9eb628213fa7bbad059b8f31bd7c696 (patch) | |
| tree | bf3ad0d19592025ad1148daaefbcd1012f32a240 /media | |
| parent | 1fb9f21676a13a716277c33eff5c997481634751 (diff) | |
| parent | eecadb9a84f357fb224592cc77603ff3e7c28f08 (diff) | |
| download | frameworks_base-8fddd761f9eb628213fa7bbad059b8f31bd7c696.zip frameworks_base-8fddd761f9eb628213fa7bbad059b8f31bd7c696.tar.gz frameworks_base-8fddd761f9eb628213fa7bbad059b8f31bd7c696.tar.bz2 | |
Merge "Adding support for the '.mxmf' MIDI file extension."
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/MediaFile.java | 1 | ||||
| -rw-r--r-- | media/libstagefright/StagefrightMediaScanner.cpp | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/media/java/android/media/MediaFile.java b/media/java/android/media/MediaFile.java index a027bc6..c41e0ad 100644 --- a/media/java/android/media/MediaFile.java +++ b/media/java/android/media/MediaFile.java @@ -185,6 +185,7 @@ public class MediaFile { addFileType("IMY", FILE_TYPE_IMY, "audio/imelody"); addFileType("RTX", FILE_TYPE_MID, "audio/midi"); addFileType("OTA", FILE_TYPE_MID, "audio/midi"); + addFileType("MXMF", FILE_TYPE_MID, "audio/midi"); addFileType("MPEG", FILE_TYPE_MP4, "video/mpeg", MtpConstants.FORMAT_MPEG); addFileType("MPG", FILE_TYPE_MP4, "video/mpeg", MtpConstants.FORMAT_MPEG); diff --git a/media/libstagefright/StagefrightMediaScanner.cpp b/media/libstagefright/StagefrightMediaScanner.cpp index 84f65ff..8b86e53 100644 --- a/media/libstagefright/StagefrightMediaScanner.cpp +++ b/media/libstagefright/StagefrightMediaScanner.cpp @@ -37,7 +37,7 @@ static bool FileHasAcceptableExtension(const char *extension) { ".mp3", ".mp4", ".m4a", ".3gp", ".3gpp", ".3g2", ".3gpp2", ".mpeg", ".ogg", ".mid", ".smf", ".imy", ".wma", ".aac", ".wav", ".amr", ".midi", ".xmf", ".rtttl", ".rtx", ".ota", - ".mkv", ".mka", ".webm", ".ts", ".fl", ".flac" + ".mkv", ".mka", ".webm", ".ts", ".fl", ".flac", ".mxmf", }; static const size_t kNumValidExtensions = sizeof(kValidExtensions) / sizeof(kValidExtensions[0]); @@ -124,7 +124,8 @@ status_t StagefrightMediaScanner::processFile( || !strcasecmp(extension, ".xmf") || !strcasecmp(extension, ".rtttl") || !strcasecmp(extension, ".rtx") - || !strcasecmp(extension, ".ota")) { + || !strcasecmp(extension, ".ota") + || !strcasecmp(extension, ".mxmf")) { status_t status = HandleMIDI(path, &client); if (status != OK) { return status; |