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

Commit 72433b08 authored by Oscar Rydhé's avatar Oscar Rydhé Committed by Robert Shih
Browse files

Start with segment three times the target duration for HLS live 

For HLS live streams the first segment to play should be the
segment closest above three times the target duration from the
end of the playlist.

Bug: 31235498
Change-Id: I86859115460678518385a04379c2016ac0948c07
parent 51cdc88e

media/libstagefright/httplive/PlaylistFetcher.cpp

+34 −5
Original line number Diff line number Diff line
@@ -956,6 +956,38 @@ bool PlaylistFetcher::shouldPauseDownload() { 
    return false;

}



void PlaylistFetcher::initSeqNumberForLiveStream(

        int32_t &firstSeqNumberInPlaylist,

        int32_t &lastSeqNumberInPlaylist) {

    // start at least 3 target durations from the end.

    int64_t timeFromEnd = 0;

    size_t index = mPlaylist->size();

    sp<AMessage> itemMeta;

    int64_t itemDurationUs;

    int32_t targetDuration;

    if (mPlaylist->meta()->findInt32("target-duration", &targetDuration)) {

        do {

            --index;

            if (!mPlaylist->itemAt(index, NULL /* uri */, &itemMeta)

                    || !itemMeta->findInt64("durationUs", &itemDurationUs)) {

                ALOGW("item or itemDurationUs missing");

                mSeqNumber = lastSeqNumberInPlaylist - 3;

                break;

            }



            timeFromEnd += itemDurationUs;

            mSeqNumber = firstSeqNumberInPlaylist + index;

        } while (timeFromEnd < targetDuration * 3E6 && index > 0);

    } else {

        ALOGW("target-duration missing");

        mSeqNumber = lastSeqNumberInPlaylist - 3;

    }



    if (mSeqNumber < firstSeqNumberInPlaylist) {

        mSeqNumber = firstSeqNumberInPlaylist;

    }

}



bool PlaylistFetcher::initDownloadState(

        AString &uri,

        sp<AMessage> &itemMeta,
@@ -982,11 +1014,8 @@ bool PlaylistFetcher::initDownloadState( 


        if (mSegmentStartTimeUs < 0) {

            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;

                }

                // this is a live session

                initSeqNumberForLiveStream(firstSeqNumberInPlaylist, lastSeqNumberInPlaylist);

            } else {

                // When seeking mSegmentStartTimeUs is unavailable (< 0), we

                // use mStartTimeUs (client supplied timestamp) to determine both start segment

media/libstagefright/httplive/PlaylistFetcher.h

+3 −0
Original line number Diff line number Diff line
@@ -218,6 +218,9 @@ private: 
    void onStop(const sp<AMessage> &msg);

    void onMonitorQueue();

    void onDownloadNext();

    void initSeqNumberForLiveStream(

            int32_t &firstSeqNumberInPlaylist,

            int32_t &lastSeqNumberInPlaylist);

    bool initDownloadState(

            AString &uri,

            sp<AMessage> &itemMeta,