diff options
| author | Marco Nelissen <marcone@google.com> | 2015-01-13 23:31:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-13 23:31:16 +0000 |
| commit | 17c933cc07be9656aee8afc82dc866a67b3fd78e (patch) | |
| tree | 1dbb1c050687cda6d0877c29d60ac80d281a05b3 /include | |
| parent | 7e85361e364bf8f80ab43dd5feb0f584e481019e (diff) | |
| parent | cec272dfe2cf6bf6cdb8a4afa5afdd0e910c915f (diff) | |
| download | frameworks_av-17c933cc07be9656aee8afc82dc866a67b3fd78e.zip frameworks_av-17c933cc07be9656aee8afc82dc866a67b3fd78e.tar.gz frameworks_av-17c933cc07be9656aee8afc82dc866a67b3fd78e.tar.bz2 | |
am cec272df: am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"
* commit 'cec272dfe2cf6bf6cdb8a4afa5afdd0e910c915f':
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 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 13695d5..a0036e0 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; |