diff options
author | Lajos Molnar <lajos@google.com> | 2014-03-07 18:31:25 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 18:31:25 +0000 |
commit | 3eee65fa79e382b065ff5299bdc81f3a5b85be9a (patch) | |
tree | 06ae58990f32e0f8d51a90a22cce7733290156ad /media/libstagefright/httplive/M3UParser.cpp | |
parent | c202aed28f3a24a7fbc74f7a65d806ef8deefb0b (diff) | |
parent | 49ea13379fb15ddb73183ebafa3a377342ef932f (diff) | |
download | frameworks_av-3eee65fa79e382b065ff5299bdc81f3a5b85be9a.zip frameworks_av-3eee65fa79e382b065ff5299bdc81f3a5b85be9a.tar.gz frameworks_av-3eee65fa79e382b065ff5299bdc81f3a5b85be9a.tar.bz2 |
am 49ea1337: Merge changes I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d, ... into klp-dev
* commit '49ea13379fb15ddb73183ebafa3a377342ef932f':
LiveSession: Use the actual, possibly redirected url as base in the M3U
M3UParser: Skip query strings when looking for the last slash in a URL
ChromiumHTTPDataSource: Keep track of the redirected URL
Initial HLS seamless switch implementation.
NuPlayer side support for seamless format switch.
LiveSession refactor
PlaylistFetcher: Add support for block-by-block decryption.
LiveSession: Add support for block-by-block fetchFile.
Diffstat (limited to 'media/libstagefright/httplive/M3UParser.cpp')
-rw-r--r-- | media/libstagefright/httplive/M3UParser.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/media/libstagefright/httplive/M3UParser.cpp b/media/libstagefright/httplive/M3UParser.cpp index a5a18d9..4c2c1f4 100644 --- a/media/libstagefright/httplive/M3UParser.cpp +++ b/media/libstagefright/httplive/M3UParser.cpp @@ -388,18 +388,6 @@ bool M3UParser::getTypeURI(size_t index, const char *key, AString *uri) const { return true; } -bool M3UParser::getAudioURI(size_t index, AString *uri) const { - return getTypeURI(index, "audio", uri); -} - -bool M3UParser::getVideoURI(size_t index, AString *uri) const { - return getTypeURI(index, "video", uri); -} - -bool M3UParser::getSubtitleURI(size_t index, AString *uri) const { - return getTypeURI(index, "subtitles", uri); -} - static bool MakeURL(const char *baseURL, const char *url, AString *out) { out->clear(); |