summaryrefslogtreecommitdiffstats
path: root/include
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 /include
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 'include')
-rw-r--r--include/media/MediaPlayerInterface.h2
-rw-r--r--include/media/MidiIoWrapper.h4
-rw-r--r--include/media/stagefright/MediaDefs.h1
3 files changed, 5 insertions, 2 deletions
diff --git a/include/media/MediaPlayerInterface.h b/include/media/MediaPlayerInterface.h
index c412299..0fc7dcf 100644
--- a/include/media/MediaPlayerInterface.h
+++ b/include/media/MediaPlayerInterface.h
@@ -43,8 +43,6 @@ class IGraphicBufferProducer;
template<typename T> class SortedVector;
enum player_type {
- PV_PLAYER = 1,
- SONIVOX_PLAYER = 2,
STAGEFRIGHT_PLAYER = 3,
NU_PLAYER = 4,
// Test players are available only in the 'test' and 'eng' builds.
diff --git a/include/media/MidiIoWrapper.h b/include/media/MidiIoWrapper.h
index caf1d75..e6f8cf7 100644
--- a/include/media/MidiIoWrapper.h
+++ b/include/media/MidiIoWrapper.h
@@ -19,12 +19,15 @@
#include <libsonivox/eas_types.h>
+#include "media/stagefright/DataSource.h"
+
namespace android {
class MidiIoWrapper : public RefBase {
public:
MidiIoWrapper(const char *path);
MidiIoWrapper(int fd, off64_t offset, int64_t size);
+ MidiIoWrapper(const sp<DataSource> &source);
~MidiIoWrapper();
@@ -37,6 +40,7 @@ private:
int mFd;
off64_t mBase;
int64_t mLength;
+ sp<DataSource> mDataSource;
EAS_FILE mEasFile;
};
diff --git a/include/media/stagefright/MediaDefs.h b/include/media/stagefright/MediaDefs.h
index e67d4d5..1f9ff45 100644
--- a/include/media/stagefright/MediaDefs.h
+++ b/include/media/stagefright/MediaDefs.h
@@ -36,6 +36,7 @@ extern const char *MEDIA_MIMETYPE_AUDIO_AMR_WB;
extern const char *MEDIA_MIMETYPE_AUDIO_MPEG; // layer III
extern const char *MEDIA_MIMETYPE_AUDIO_MPEG_LAYER_I;
extern const char *MEDIA_MIMETYPE_AUDIO_MPEG_LAYER_II;
+extern const char *MEDIA_MIMETYPE_AUDIO_MIDI;
extern const char *MEDIA_MIMETYPE_AUDIO_AAC;
extern const char *MEDIA_MIMETYPE_AUDIO_QCELP;
extern const char *MEDIA_MIMETYPE_AUDIO_VORBIS;