Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aea5aff4 authored by Andreas Huber's avatar Andreas Huber
Browse files

If the stream for the new bandwidth doesn't have the segment we're looking for... 

go back to the previous bandwidth' stream.

Change-Id: I3477cb6932102883509a7cbe9fb2b3bb02dac8c6
parent 9a3c0d65

media/libstagefright/httplive/LiveSession.cpp

+13 −0
Original line number Diff line number Diff line
@@ -340,6 +340,7 @@ size_t LiveSession::getBandwidthIndex() { 
void LiveSession::onDownloadNext() {

    size_t bandwidthIndex = getBandwidthIndex();



rinse_repeat:

    int64_t nowUs = ALooper::GetNowUs();



    if (mLastPlaylistFetchTimeUs < 0
@@ -437,6 +438,18 @@ void LiveSession::onDownloadNext() { 


    if (mSeqNumber < firstSeqNumberInPlaylist

            || mSeqNumber > lastSeqNumberInPlaylist) {

        if (mSeqNumber < firstSeqNumberInPlaylist

                && mPrevBandwidthIndex != (ssize_t)bandwidthIndex) {

            // Go back to the previous bandwidth.



            LOGI("new bandwidth does not have the sequence number "

                 "we're looking for, switching back to previous bandwidth");



            mLastPlaylistFetchTimeUs = -1;

            bandwidthIndex = mPrevBandwidthIndex;

            goto rinse_repeat;

        }



        if (!mPlaylist->isComplete()

                && mSeqNumber > lastSeqNumberInPlaylist

                && mNumRetries < kMaxNumRetries) {