summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/httplive/M3UParser.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-06-30 16:52:33 -0700
committerAndreas Huber <andih@google.com>2011-06-30 16:52:33 -0700
commit0f30bd90272c818aa37c0bb22d22eaa7d3689879 (patch)
tree0a843f5b297b088988bc1d153ec3ae6548b9cf93 /media/libstagefright/httplive/M3UParser.cpp
parent69c2b29eb72396068b9d116c2a54f283025c7d6b (diff)
downloadframeworks_av-0f30bd90272c818aa37c0bb22d22eaa7d3689879.tar.gz
frameworks_av-0f30bd90272c818aa37c0bb22d22eaa7d3689879.tar.bz2
frameworks_av-0f30bd90272c818aa37c0bb22d22eaa7d3689879.zip
Seeking/duration in HLS content is based on the individual segments' duration
not target-duration. Change-Id: I294097daa84c25e4084a6fc4ea80e39a543f3d10 related-to-bug: 4983285
Diffstat (limited to 'media/libstagefright/httplive/M3UParser.cpp')
-rw-r--r--media/libstagefright/httplive/M3UParser.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/media/libstagefright/httplive/M3UParser.cpp b/media/libstagefright/httplive/M3UParser.cpp
index 765f79565d..123fbf8b23 100644
--- a/media/libstagefright/httplive/M3UParser.cpp
+++ b/media/libstagefright/httplive/M3UParser.cpp
@@ -64,14 +64,21 @@ size_t M3UParser::size() {
}
bool M3UParser::itemAt(size_t index, AString *uri, sp<AMessage> *meta) {
- uri->clear();
- if (meta) { *meta = NULL; }
+ if (uri) {
+ uri->clear();
+ }
+
+ if (meta) {
+ *meta = NULL;
+ }
if (index >= mItems.size()) {
return false;
}
- *uri = mItems.itemAt(index).mURI;
+ if (uri) {
+ *uri = mItems.itemAt(index).mURI;
+ }
if (meta) {
*meta = mItems.itemAt(index).mMeta;