diff options
author | Rachad Alao <rachad@google.com> | 2014-08-25 21:49:35 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-25 21:49:36 +0000 |
commit | d42173a44721af1a600b9c8599bc736394fcc724 (patch) | |
tree | 3b72f6d9e26052242f7f15496f3caee7462332b5 | |
parent | 8dad3f606a3112e24f0b75f2edc05be299d18c43 (diff) | |
parent | da65048e8e6f65ed9b3f23cda3f4554025c76fc4 (diff) | |
download | frameworks_av-d42173a44721af1a600b9c8599bc736394fcc724.zip frameworks_av-d42173a44721af1a600b9c8599bc736394fcc724.tar.gz frameworks_av-d42173a44721af1a600b9c8599bc736394fcc724.tar.bz2 |
Merge "Revert "disable AwesomePlayer for Ogg vorbis"" into lmp-dev
-rw-r--r-- | media/libmediaplayerservice/MediaPlayerFactory.cpp | 25 | ||||
-rw-r--r-- | media/libmediaplayerservice/MediaPlayerFactory.h | 1 |
2 files changed, 12 insertions, 14 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerFactory.cpp b/media/libmediaplayerservice/MediaPlayerFactory.cpp index 3e0fc0d..dacb144 100644 --- a/media/libmediaplayerservice/MediaPlayerFactory.cpp +++ b/media/libmediaplayerservice/MediaPlayerFactory.cpp @@ -60,7 +60,7 @@ status_t MediaPlayerFactory::registerFactory_l(IFactory* factory, return OK; } -static player_type getDefaultPlayerType() { +player_type MediaPlayerFactory::getDefaultPlayerType() { char value[PROPERTY_VALUE_MAX]; if (property_get("media.stagefright.use-awesome", value, NULL) && (!strcmp("1", value) || !strcasecmp("true", value))) { @@ -181,19 +181,16 @@ class StagefrightPlayerFactory : int64_t offset, int64_t /*length*/, float /*curScore*/) { - if (getDefaultPlayerType() - == STAGEFRIGHT_PLAYER) { - char buf[20]; - lseek(fd, offset, SEEK_SET); - read(fd, buf, sizeof(buf)); - lseek(fd, offset, SEEK_SET); - - uint32_t ident = *((uint32_t*)buf); - - // Ogg vorbis? - if (ident == 0x5367674f) // 'OggS' - return 1.0; - } + char buf[20]; + lseek(fd, offset, SEEK_SET); + read(fd, buf, sizeof(buf)); + lseek(fd, offset, SEEK_SET); + + uint32_t ident = *((uint32_t*)buf); + + // Ogg vorbis? + if (ident == 0x5367674f) // 'OggS' + return 1.0; return 0.0; } diff --git a/media/libmediaplayerservice/MediaPlayerFactory.h b/media/libmediaplayerservice/MediaPlayerFactory.h index 55ff918..5ddde19 100644 --- a/media/libmediaplayerservice/MediaPlayerFactory.h +++ b/media/libmediaplayerservice/MediaPlayerFactory.h @@ -71,6 +71,7 @@ class MediaPlayerFactory { static status_t registerFactory_l(IFactory* factory, player_type type); + static player_type getDefaultPlayerType(); static Mutex sLock; static tFactoryMap sFactoryMap; |