summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/httplive/LiveSession.h
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2013-11-22 17:57:31 +0200
committerMartin Storsjo <martin@martin.st>2014-01-10 11:43:10 +0200
commit784faaf1d76902be6b36d3af01fb5325f0d45a04 (patch)
treed54037bc0a62d6192cfdca0279c8377174299c18 /media/libstagefright/httplive/LiveSession.h
parent0c9045e42eebdfcfeb1d372e932f043bb99f7ad9 (diff)
downloadframeworks_av-784faaf1d76902be6b36d3af01fb5325f0d45a04.zip
frameworks_av-784faaf1d76902be6b36d3af01fb5325f0d45a04.tar.gz
frameworks_av-784faaf1d76902be6b36d3af01fb5325f0d45a04.tar.bz2
LiveSession: Use the actual, possibly redirected url as base in the M3U
This fixes playback of HLS streams where the M3U playlists use relative paths and the main playlist is opened via a redirect. Change-Id: I787e1c050daddc566be4c8e3f84803d3f91eec46
Diffstat (limited to 'media/libstagefright/httplive/LiveSession.h')
-rw-r--r--media/libstagefright/httplive/LiveSession.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/httplive/LiveSession.h b/media/libstagefright/httplive/LiveSession.h
index 99b480a8..8f6a4ea 100644
--- a/media/libstagefright/httplive/LiveSession.h
+++ b/media/libstagefright/httplive/LiveSession.h
@@ -147,7 +147,8 @@ private:
status_t fetchFile(
const char *url, sp<ABuffer> *out,
- int64_t range_offset = 0, int64_t range_length = -1);
+ int64_t range_offset = 0, int64_t range_length = -1,
+ String8 *actualUrl = NULL);
sp<M3UParser> fetchPlaylist(
const char *url, uint8_t *curPlaylistHash, bool *unchanged);