summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/MediaPlayerFactory.cpp
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2014-07-27 21:22:11 -0700
committerLajos Molnar <lajos@google.com>2014-07-27 22:01:56 -0700
commitf5bdd770d509373cc4174a55d0b81b223ecc4d81 (patch)
tree4447b8e997d0e4f59a2988eab3d7567301b0cc71 /media/libmediaplayerservice/MediaPlayerFactory.cpp
parent141670d465d7673dfa6ad712ad100f84882dfa95 (diff)
downloadframeworks_av-f5bdd770d509373cc4174a55d0b81b223ecc4d81.zip
frameworks_av-f5bdd770d509373cc4174a55d0b81b223ecc4d81.tar.gz
frameworks_av-f5bdd770d509373cc4174a55d0b81b223ecc4d81.tar.bz2
mediaplayer: make nuplayer the default player
Bug: 11784824 Change-Id: I60d215d0348adcd589da5bd479d5921dcf076ee4
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerFactory.cpp')
-rw-r--r--media/libmediaplayerservice/MediaPlayerFactory.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerFactory.cpp b/media/libmediaplayerservice/MediaPlayerFactory.cpp
index e9c5e8e..dacb144 100644
--- a/media/libmediaplayerservice/MediaPlayerFactory.cpp
+++ b/media/libmediaplayerservice/MediaPlayerFactory.cpp
@@ -62,18 +62,18 @@ status_t MediaPlayerFactory::registerFactory_l(IFactory* factory,
player_type MediaPlayerFactory::getDefaultPlayerType() {
char value[PROPERTY_VALUE_MAX];
- if (property_get("media.stagefright.use-nuplayer", value, NULL)
+ if (property_get("media.stagefright.use-awesome", value, NULL)
&& (!strcmp("1", value) || !strcasecmp("true", value))) {
- return NU_PLAYER;
+ return STAGEFRIGHT_PLAYER;
}
// TODO: remove this EXPERIMENTAL developer settings property
- if (property_get("persist.sys.media.use-nuplayer", value, NULL)
+ if (property_get("persist.sys.media.use-awesome", value, NULL)
&& !strcasecmp("true", value)) {
- return NU_PLAYER;
+ return STAGEFRIGHT_PLAYER;
}
- return STAGEFRIGHT_PLAYER;
+ return NU_PLAYER;
}
status_t MediaPlayerFactory::registerFactory(IFactory* factory,