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/libmediaplayerservice/MediaPlayerFactory.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/libmediaplayerservice/MediaPlayerFactory.cpp')
-rw-r--r-- | media/libmediaplayerservice/MediaPlayerFactory.cpp | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerFactory.cpp b/media/libmediaplayerservice/MediaPlayerFactory.cpp index c689470..48884b9 100644 --- a/media/libmediaplayerservice/MediaPlayerFactory.cpp +++ b/media/libmediaplayerservice/MediaPlayerFactory.cpp @@ -21,7 +21,6 @@ #include <cutils/properties.h> #include <media/IMediaPlayer.h> -#include <media/MidiIoWrapper.h> #include <media/stagefright/DataSource.h> #include <media/stagefright/FileSource.h> #include <media/stagefright/foundation/ADebug.h> @@ -31,7 +30,6 @@ #include "MediaPlayerFactory.h" -#include "MidiFile.h" #include "TestPlayerStub.h" #include "StagefrightPlayer.h" #include "nuplayer/NuPlayerDriver.h" @@ -281,70 +279,6 @@ class NuPlayerFactory : public MediaPlayerFactory::IFactory { } }; -class SonivoxPlayerFactory : public MediaPlayerFactory::IFactory { - public: - virtual float scoreFactory(const sp<IMediaPlayer>& /*client*/, - const char* url, - float curScore) { - static const float kOurScore = 0.4; - static const char* const FILE_EXTS[] = { ".mid", - ".midi", - ".smf", - ".xmf", - ".mxmf", - ".imy", - ".rtttl", - ".rtx", - ".ota" }; - if (kOurScore <= curScore) - return 0.0; - - // use MidiFile for MIDI extensions - int lenURL = strlen(url); - for (int i = 0; i < NELEM(FILE_EXTS); ++i) { - int len = strlen(FILE_EXTS[i]); - int start = lenURL - len; - if (start > 0) { - if (!strncasecmp(url + start, FILE_EXTS[i], len)) { - return kOurScore; - } - } - } - return 0.0; - } - - virtual float scoreFactory(const sp<IMediaPlayer>& /*client*/, - int fd, - int64_t offset, - int64_t length, - float curScore) { - static const float kOurScore = 0.8; - - if (kOurScore <= curScore) - return 0.0; - - // Some kind of MIDI? - EAS_DATA_HANDLE easdata; - sp<MidiIoWrapper> wrapper = new MidiIoWrapper(fd, offset, length); - if (EAS_Init(&easdata) == EAS_SUCCESS) { - EAS_HANDLE eashandle; - if (EAS_OpenFile(easdata, wrapper->getLocator(), &eashandle) == EAS_SUCCESS) { - EAS_CloseFile(easdata, eashandle); - EAS_Shutdown(easdata); - return kOurScore; - } - EAS_Shutdown(easdata); - } - - return 0.0; - } - - virtual sp<MediaPlayerBase> createPlayer() { - ALOGV(" create MidiFile"); - return new MidiFile(); - } -}; - class TestPlayerFactory : public MediaPlayerFactory::IFactory { public: virtual float scoreFactory(const sp<IMediaPlayer>& /*client*/, @@ -371,7 +305,6 @@ void MediaPlayerFactory::registerBuiltinFactories() { registerFactory_l(new StagefrightPlayerFactory(), STAGEFRIGHT_PLAYER); registerFactory_l(new NuPlayerFactory(), NU_PLAYER); - registerFactory_l(new SonivoxPlayerFactory(), SONIVOX_PLAYER); registerFactory_l(new TestPlayerFactory(), TEST_PLAYER); sInitComplete = true; |