commit f25410ed9695f3f07ce0302232fa6e1985ffffd7
author Andreas Huber <andih@google.com> Thu Jan 06 14:30:27 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 06 14:30:27 2011 -0800
tree d3f12cedc963be0a1632f463aa0f0b30a5e96846
parent a107eaff030a0211417d1e65d1baa052357776d9
parent d7069ca0bc62a21321eef5e30f152ff6ba646e04

Merge "Use NuPlayer for HTTP live streaming playback by default." into honeycomb

media/libmediaplayerservice/MediaPlayerService.cpp

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 @@
     }
 
     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])) {

media/libstagefright/httplive/LiveSession.cpp

diff --git a/media/libstagefright/httplive/LiveSession.cpp b/media/libstagefright/httplive/LiveSession.cpp
index 6fd0171..a3e7fc7 100644
--- a/media/libstagefright/httplive/LiveSession.cpp
+++ b/media/libstagefright/httplive/LiveSession.cpp
@@ -158,8 +158,8 @@
         mBandwidthItems.sort(SortByBandwidth);
 
         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"))) {
             // The "legacy" player cannot deal with audio format changes,
             // some streams use different audio encoding parameters for
             // their lowest bandwidth stream.