diff options
author | Andreas Huber <andih@google.com> | 2010-10-14 23:22:21 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-14 23:22:21 -0700 |
commit | d6119356f45c9c57cac812357d969ecc3001087e (patch) | |
tree | 571a3fd12bab8ff32a863507d4e907e750456af9 /media/libstagefright/httplive/M3UParser.cpp | |
parent | 11b72e19970f620adfb1aa458b45ff06cec77f10 (diff) | |
parent | 43024e1f4953d9b8891b7b72f10e76f11812e772 (diff) | |
download | frameworks_av-d6119356f45c9c57cac812357d969ecc3001087e.zip frameworks_av-d6119356f45c9c57cac812357d969ecc3001087e.tar.gz frameworks_av-d6119356f45c9c57cac812357d969ecc3001087e.tar.bz2 |
am 28b93967: am 165c6579: Merge "HTTP Live content that are tagged as complete are now seekable." into gingerbread
Merge commit '28b93967d0e702304c7edec854a29d5ab88bfce0'
* commit '28b93967d0e702304c7edec854a29d5ab88bfce0':
HTTP Live content that are tagged as complete are now seekable.
Diffstat (limited to 'media/libstagefright/httplive/M3UParser.cpp')
-rw-r--r-- | media/libstagefright/httplive/M3UParser.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/media/libstagefright/httplive/M3UParser.cpp b/media/libstagefright/httplive/M3UParser.cpp index f6f7dbd..90f3d6d 100644 --- a/media/libstagefright/httplive/M3UParser.cpp +++ b/media/libstagefright/httplive/M3UParser.cpp @@ -27,7 +27,8 @@ M3UParser::M3UParser( : mInitCheck(NO_INIT), mBaseURI(baseURI), mIsExtM3U(false), - mIsVariantPlaylist(false) { + mIsVariantPlaylist(false), + mIsComplete(false) { mInitCheck = parse(data, size); } @@ -46,6 +47,10 @@ bool M3UParser::isVariantPlaylist() const { return mIsVariantPlaylist; } +bool M3UParser::isComplete() const { + return mIsComplete; +} + sp<AMessage> M3UParser::meta() { return mMeta; } @@ -153,6 +158,8 @@ status_t M3UParser::parse(const void *_data, size_t size) { return ERROR_MALFORMED; } err = parseMetaData(line, &mMeta, "media-sequence"); + } else if (line.startsWith("#EXT-X-ENDLIST")) { + mIsComplete = true; } else if (line.startsWith("#EXTINF")) { if (mIsVariantPlaylist) { return ERROR_MALFORMED; |