summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-02-16 09:05:38 -0800
committerAndreas Huber <andih@google.com>2011-02-16 09:19:40 -0800
commitd6c421f1a0ae556d315159dff8a76e4a0e62e700 (patch)
tree81bd10042741ec51a47a46ea35e70e10250a68d3 /media/libmediaplayerservice
parentb4242275095da96fe37176c13ee44ac3dd83dc3e (diff)
downloadframeworks_base-d6c421f1a0ae556d315159dff8a76e4a0e62e700.zip
frameworks_base-d6c421f1a0ae556d315159dff8a76e4a0e62e700.tar.gz
frameworks_base-d6c421f1a0ae556d315159dff8a76e4a0e62e700.tar.bz2
Remove legacy, AwesomePlayer-based http live implementation.
Change-Id: I455d0faa5612dcd4d2bb6f2b3c7b64a1caaabf69
Diffstat (limited to 'media/libmediaplayerservice')
-rw-r--r--media/libmediaplayerservice/MediaPlayerService.cpp18
1 files changed, 7 insertions, 11 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index 439e4ce..60bdd62 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -732,18 +732,14 @@ player_type getPlayerType(const char* url)
return TEST_PLAYER;
}
- char value[PROPERTY_VALUE_MAX];
- 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])) {
- return NU_PLAYER;
- }
+ if (!strncasecmp("http://", url, 7)) {
+ size_t len = strlen(url);
+ if (len >= 5 && !strcasecmp(".m3u8", &url[len - 5])) {
+ return NU_PLAYER;
+ }
- if (strstr(url,"m3u8")) {
- return NU_PLAYER;
- }
+ if (strstr(url,"m3u8")) {
+ return NU_PLAYER;
}
}