diff options
| author | 2011-01-06 14:14:56 -0800 | |
|---|---|---|
| committer | 2011-01-06 14:14:56 -0800 | |
| commit | d7069ca0bc62a21321eef5e30f152ff6ba646e04 (patch) | |
| tree | 91f6160b6ed676c4533ef3d0c66bfdeda8f5377e | |
| parent | 1932fef94a14d0a1b86213864a2bcc690e0faa5e (diff) | |
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
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 4 | ||||
| -rw-r--r-- | media/libstagefright/httplive/LiveSession.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 97c541a50fe0..439e4ce37a2f 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])) { diff --git a/media/libstagefright/httplive/LiveSession.cpp b/media/libstagefright/httplive/LiveSession.cpp index 6fd017190405..a3e7fc7358f1 100644 --- a/media/libstagefright/httplive/LiveSession.cpp +++ b/media/libstagefright/httplive/LiveSession.cpp @@ -158,8 +158,8 @@ void LiveSession::onConnect(const sp<AMessage> &msg) { 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. |