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/DataSource.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/DataSource.cpp')
| -rw-r--r-- | media/libstagefright/DataSource.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libstagefright/DataSource.cpp b/media/libstagefright/DataSource.cpp index c99db84..f7dcf35 100644 --- a/media/libstagefright/DataSource.cpp +++ b/media/libstagefright/DataSource.cpp @@ -22,6 +22,7 @@ #include "include/DRMExtractor.h" #include "include/FLACExtractor.h" #include "include/HTTPBase.h" +#include "include/MidiExtractor.h" #include "include/MP3Extractor.h" #include "include/MPEG2PSExtractor.h" #include "include/MPEG2TSExtractor.h" @@ -172,6 +173,7 @@ void DataSource::RegisterDefaultSniffers() { RegisterSniffer_l(SniffAAC); RegisterSniffer_l(SniffMPEG2PS); RegisterSniffer_l(SniffWVM); + RegisterSniffer_l(SniffMidi); char value[PROPERTY_VALUE_MAX]; if (property_get("drm.service.enabled", value, NULL) |