diff options
| author | Marco Nelissen <marcone@google.com> | 2014-12-17 14:44:33 -0800 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2014-12-18 11:54:42 -0800 |
| commit | faf4efc6a41e88adf85f76f48f020a6d681f5ff1 (patch) | |
| tree | a54aa43c242bb9c640afcf0d7c8b5f3a2c9e45ab /media/libstagefright/MediaExtractor.cpp | |
| parent | 23c8dc13787186dc98731055858b2fba3aedc105 (diff) | |
| download | frameworks_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/MediaExtractor.cpp')
| -rw-r--r-- | media/libstagefright/MediaExtractor.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/MediaExtractor.cpp b/media/libstagefright/MediaExtractor.cpp index 9ab6611..e21fe6e 100644 --- a/media/libstagefright/MediaExtractor.cpp +++ b/media/libstagefright/MediaExtractor.cpp @@ -29,6 +29,7 @@ #include "include/WVMExtractor.h" #include "include/FLACExtractor.h" #include "include/AACExtractor.h" +#include "include/MidiExtractor.h" #include "matroska/MatroskaExtractor.h" @@ -116,6 +117,8 @@ sp<MediaExtractor> MediaExtractor::Create( ret = new AACExtractor(source, meta); } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_MPEG2PS)) { ret = new MPEG2PSExtractor(source); + } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_MIDI)) { + ret = new MidiExtractor(source); } if (ret != NULL) { |