commit 6868628c0df9b8dfa0a1c16be109d907384e3186
author Robert Shih <robertshih@google.com> Thu Aug 28 22:57:39 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 28 22:57:40 2014 +0000
tree 3673c5111e25b7c68a6348d3cf185753a6147165
parent 8962e08c4989368d2c821b64f42632b6f5fb016e
parent 39f5874c4040bec6fdbf0c0912daffcb10010df8

Merge "PlaylistFetcher: add lower bound check when starting live streams" into lmp-dev

media/libstagefright/httplive/PlaylistFetcher.cpp

diff --git a/media/libstagefright/httplive/PlaylistFetcher.cpp b/media/libstagefright/httplive/PlaylistFetcher.cpp
index 80cb2d0..4d5d79e 100644
--- a/media/libstagefright/httplive/PlaylistFetcher.cpp
+++ b/media/libstagefright/httplive/PlaylistFetcher.cpp
@@ -754,6 +754,9 @@
             if (!mPlaylist->isComplete() && !mPlaylist->isEvent()) {
                 // If this is a live session, start 3 segments from the end on connect
                 mSeqNumber = lastSeqNumberInPlaylist - 3;
+                if (mSeqNumber < firstSeqNumberInPlaylist) {
+                    mSeqNumber = firstSeqNumberInPlaylist;
+                }
             } else {
                 mSeqNumber = getSeqNumberForTime(mStartTimeUs);
                 mStartTimeUs -= getSegmentStartTimeUs(mSeqNumber);