summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-01-06 14:14:56 -0800
committerAndreas Huber <andih@google.com>2011-01-06 14:14:56 -0800
commitd7069ca0bc62a21321eef5e30f152ff6ba646e04 (patch)
tree91f6160b6ed676c4533ef3d0c66bfdeda8f5377e /media/libmediaplayerservice
parent1932fef94a14d0a1b86213864a2bcc690e0faa5e (diff)
downloadframeworks_base-d7069ca0bc62a21321eef5e30f152ff6ba646e04.zip
frameworks_base-d7069ca0bc62a21321eef5e30f152ff6ba646e04.tar.gz
frameworks_base-d7069ca0bc62a21321eef5e30f152ff6ba646e04.tar.bz2
Use NuPlayer for HTTP live streaming playback by default.
Reversed the property logic, set media.httplive.disable-nuplayer to true to revert Change-Id: I1057940667aaab56bb75c9ea15c2cdcab736f3c6
Diffstat (limited to 'media/libmediaplayerservice')
-rw-r--r--media/libmediaplayerservice/MediaPlayerService.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index 97c541a..439e4ce 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -733,8 +733,8 @@ player_type getPlayerType(const char* url)
}
char value[PROPERTY_VALUE_MAX];
- if (property_get("media.httplive.enable-nuplayer", value, NULL)
- && (!strcasecmp(value, "true") || !strcmp(value, "1"))) {
+ if (!property_get("media.httplive.disable-nuplayer", value, NULL)
+ || (strcasecmp(value, "true") && strcmp(value, "1"))) {
if (!strncasecmp("http://", url, 7)) {
size_t len = strlen(url);
if (len >= 5 && !strcasecmp(".m3u8", &url[len - 5])) {