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
commit0a73d81f213fb2d6f2fdd59c4dda047bf453bb1c (patch)
treeeab2ea363949c1b7f356fc4b921e48137d2db775 /media/libmediaplayerservice
parent7b55c7ce1d8f187430d0b6bda68378f549930289 (diff)
downloadframeworks_av-0a73d81f213fb2d6f2fdd59c4dda047bf453bb1c.zip
frameworks_av-0a73d81f213fb2d6f2fdd59c4dda047bf453bb1c.tar.gz
frameworks_av-0a73d81f213fb2d6f2fdd59c4dda047bf453bb1c.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;