diff options
| author | Marco Nelissen <marcone@google.com> | 2015-01-13 23:19:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-13 23:19:39 +0000 |
| commit | 724b9ea51db0c191cc3184319719a38b5a1f6502 (patch) | |
| tree | 0a0b5df2154f538db5bae3dfdd8388665e95c6b2 /include | |
| parent | a2d2c48a7ca3331ee77421d776e9849651b488c1 (diff) | |
| parent | 0e8928bf4f2b01b783f6da97d15e8f1abb0fd7d7 (diff) | |
| download | frameworks_av-724b9ea51db0c191cc3184319719a38b5a1f6502.zip frameworks_av-724b9ea51db0c191cc3184319719a38b5a1f6502.tar.gz frameworks_av-724b9ea51db0c191cc3184319719a38b5a1f6502.tar.bz2 | |
Merge "Replace MidiFile player with a Midi extractor"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/MediaPlayerInterface.h | 2 | ||||
| -rw-r--r-- | include/media/MidiIoWrapper.h | 4 | ||||
| -rw-r--r-- | include/media/stagefright/MediaDefs.h | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/include/media/MediaPlayerInterface.h b/include/media/MediaPlayerInterface.h index cf18a45..0f38c16 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; |