diff options
| author | Robert Shih <robertshih@google.com> | 2014-09-04 22:58:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-04 22:58:35 +0000 |
| commit | 6a548e9114c4a283a6e08a2d35540f8549f44b82 (patch) | |
| tree | 2aed756ebab257875e9c3c1aca51433e01e17583 /media | |
| parent | 9007305003e689362749a264af2eafea80eb12a0 (diff) | |
| parent | 0f9a3cf9962b6859cfee9d4bf4676b5aafca79cb (diff) | |
| download | frameworks_av-6a548e9114c4a283a6e08a2d35540f8549f44b82.zip frameworks_av-6a548e9114c4a283a6e08a2d35540f8549f44b82.tar.gz frameworks_av-6a548e9114c4a283a6e08a2d35540f8549f44b82.tar.bz2 | |
Merge "PlaylistFetcher: do not reset mStartTimeUs if we are resuming" into lmp-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/httplive/PlaylistFetcher.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ status_t PlaylistFetcher::onStart(const sp<AMessage> &msg) { mStreamTypeMask = streamTypeMask; - mStartTimeUs = startTimeUs; mSegmentStartTimeUs = segmentStartTimeUs; mDiscontinuitySeq = startDiscontinuitySeq; - if (mStartTimeUs >= 0ll) { + if (startTimeUs >= 0) { + mStartTimeUs = startTimeUs; mSeqNumber = -1; mStartup = true; mPrepared = false; |