commit 6a548e9114c4a283a6e08a2d35540f8549f44b82
author Robert Shih <robertshih@google.com> Thu Sep 04 22:58:34 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 04 22:58:35 2014 +0000
tree 2aed756ebab257875e9c3c1aca51433e01e17583
parent 9007305003e689362749a264af2eafea80eb12a0
parent 0f9a3cf9962b6859cfee9d4bf4676b5aafca79cb

Merge "PlaylistFetcher: do not reset mStartTimeUs if we are resuming" into lmp-dev

media/libstagefright/httplive/PlaylistFetcher.cpp

diff --git a/media/libstagefright/httplive/PlaylistFetcher.cpp b/media/libstagefright/httplive/PlaylistFetcher.cpp
index 4d5d79e..82a4c39 100644
--- a/media/libstagefright/httplive/PlaylistFetcher.cpp
+++ b/media/libstagefright/httplive/PlaylistFetcher.cpp
@@ -490,11 +490,11 @@
 
     mStreamTypeMask = streamTypeMask;
 
-    mStartTimeUs = startTimeUs;
     mSegmentStartTimeUs = segmentStartTimeUs;
     mDiscontinuitySeq = startDiscontinuitySeq;
 
-    if (mStartTimeUs >= 0ll) {
+    if (startTimeUs >= 0) {
+        mStartTimeUs = startTimeUs;
         mSeqNumber = -1;
         mStartup = true;
         mPrepared = false;