summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MediaDefs.cpp
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-12-17 14:44:33 -0800
committerMarco Nelissen <marcone@google.com>2014-12-18 11:54:42 -0800
commitfaf4efc6a41e88adf85f76f48f020a6d681f5ff1 (patch)
treea54aa43c242bb9c640afcf0d7c8b5f3a2c9e45ab /media/libstagefright/MediaDefs.cpp
parent23c8dc13787186dc98731055858b2fba3aedc105 (diff)
downloadframeworks_av-faf4efc6a41e88adf85f76f48f020a6d681f5ff1.zip
frameworks_av-faf4efc6a41e88adf85f76f48f020a6d681f5ff1.tar.gz
frameworks_av-faf4efc6a41e88adf85f76f48f020a6d681f5ff1.tar.bz2
Replace MidiFile player with a Midi extractor
This gets rids of a bunch of special midi handling and replaces it with an extractor that works with NuPlayer and MediaMetadataRetriever. Change-Id: I8d0f5bbdde2ca24267cf4d62ab26afe9630e0217
Diffstat (limited to 'media/libstagefright/MediaDefs.cpp')
-rw-r--r--media/libstagefright/MediaDefs.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libstagefright/MediaDefs.cpp b/media/libstagefright/MediaDefs.cpp
index d48dd84..fde6fbd 100644
--- a/media/libstagefright/MediaDefs.cpp
+++ b/media/libstagefright/MediaDefs.cpp
@@ -34,6 +34,7 @@ const char *MEDIA_MIMETYPE_AUDIO_AMR_WB = "audio/amr-wb";
const char *MEDIA_MIMETYPE_AUDIO_MPEG = "audio/mpeg";
const char *MEDIA_MIMETYPE_AUDIO_MPEG_LAYER_I = "audio/mpeg-L1";
const char *MEDIA_MIMETYPE_AUDIO_MPEG_LAYER_II = "audio/mpeg-L2";
+const char *MEDIA_MIMETYPE_AUDIO_MIDI = "audio/midi";
const char *MEDIA_MIMETYPE_AUDIO_AAC = "audio/mp4a-latm";
const char *MEDIA_MIMETYPE_AUDIO_QCELP = "audio/qcelp";
const char *MEDIA_MIMETYPE_AUDIO_VORBIS = "audio/vorbis";