summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-03-21 16:28:04 -0700
committerAndreas Huber <andih@google.com>2011-03-21 16:34:02 -0700
commit554d0ea10f8ae13a2d71289ff1f4d8adf6a9e6dd (patch)
tree25a05dd1963efbfb3ea942d3954c5192fb9d0f8e /media/libmediaplayerservice
parent36a58a544089e7d1abd83548c57f539db93f3688 (diff)
downloadframeworks_base-554d0ea10f8ae13a2d71289ff1f4d8adf6a9e6dd.zip
frameworks_base-554d0ea10f8ae13a2d71289ff1f4d8adf6a9e6dd.tar.gz
frameworks_base-554d0ea10f8ae13a2d71289ff1f4d8adf6a9e6dd.tar.bz2
Enable http-live support for https:// urls, fix a parsing issue.
Change-Id: I2284e1d62babde7f739fba6a3cb4e2619f0e62f9 related-to-bug: 4148291
Diffstat (limited to 'media/libmediaplayerservice')
-rw-r--r--media/libmediaplayerservice/MediaPlayerService.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index f075706..5eecbde 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -610,7 +610,8 @@ player_type getPlayerType(const char* url)
return TEST_PLAYER;
}
- if (!strncasecmp("http://", url, 7)) {
+ if (!strncasecmp("http://", url, 7)
+ || !strncasecmp("https://", url, 8)) {
size_t len = strlen(url);
if (len >= 5 && !strcasecmp(".m3u8", &url[len - 5])) {
return NU_PLAYER;