diff options
| author | Andreas Huber <andih@google.com> | 2011-07-19 15:04:53 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2011-07-19 15:04:53 -0700 |
| commit | d6a46a6bda23667e06ee5ccca3781e407c7d1204 (patch) | |
| tree | 87b9586bceaf9a11880ff9ee1d3150c85c5ed5ea /media/libstagefright/httplive/LiveSession.cpp | |
| parent | 8ebe5be6b0b3caa7d9d6277a1216ed786bd1e66a (diff) | |
| download | frameworks_av-d6a46a6bda23667e06ee5ccca3781e407c7d1204.zip frameworks_av-d6a46a6bda23667e06ee5ccca3781e407c7d1204.tar.gz frameworks_av-d6a46a6bda23667e06ee5ccca3781e407c7d1204.tar.bz2 | |
More HLS fixes
properly expand URLs where the "new" URL is an absolute path.
properly include any extra headers even when fetching the key files.
Change-Id: I7cd8879015ea8e3d3e2334f4e7e16b8c1a5d48e9
Diffstat (limited to 'media/libstagefright/httplive/LiveSession.cpp')
| -rw-r--r-- | media/libstagefright/httplive/LiveSession.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/media/libstagefright/httplive/LiveSession.cpp b/media/libstagefright/httplive/LiveSession.cpp index 73b3d5b..90d64ba 100644 --- a/media/libstagefright/httplive/LiveSession.cpp +++ b/media/libstagefright/httplive/LiveSession.cpp @@ -785,7 +785,10 @@ status_t LiveSession::decryptBuffer( keySource->setUID(mUID); } - status_t err = keySource->connect(keyURI.c_str()); + status_t err = + keySource->connect( + keyURI.c_str(), + mExtraHeaders.isEmpty() ? NULL : &mExtraHeaders); if (err == OK) { size_t offset = 0; |