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

Commit 0f30bd90 authored by Andreas Huber's avatar Andreas Huber
Browse files

Seeking/duration in HLS content is based on the individual segments' duration 

not target-duration.

Change-Id: I294097daa84c25e4084a6fc4ea80e39a543f3d10
related-to-bug: 4983285
parent 69c2b29e

media/libstagefright/httplive/LiveSession.cpp

+32 −13
Original line number Diff line number Diff line
@@ -408,13 +408,20 @@ rinse_repeat: 
        if (firstTime) {

            Mutex::Autolock autoLock(mLock);



            int32_t targetDuration;

            if (!mPlaylist->isComplete()

                    || !mPlaylist->meta()->findInt32(

                    "target-duration", &targetDuration)) {

            if (!mPlaylist->isComplete()) {

                mDurationUs = -1;

            } else {

                mDurationUs = 1000000ll * targetDuration * mPlaylist->size();

                mDurationUs = 0;

                for (size_t i = 0; i < mPlaylist->size(); ++i) {

                    sp<AMessage> itemMeta;

                    CHECK(mPlaylist->itemAt(

                                i, NULL /* uri */, &itemMeta));



                    int64_t itemDurationUs;

                    CHECK(itemMeta->findInt64("durationUs", &itemDurationUs));



                    mDurationUs += itemDurationUs;

                }

            }

        }
@@ -431,14 +438,26 @@ rinse_repeat: 
    bool bandwidthChanged = false;



    if (mSeekTimeUs >= 0) {

        int32_t targetDuration;

        if (mPlaylist->isComplete() &&

                mPlaylist->meta()->findInt32(

                    "target-duration", &targetDuration)) {

            int64_t seekTimeSecs = (mSeekTimeUs + 500000ll) / 1000000ll;

            int64_t index = seekTimeSecs / targetDuration;



            if (index >= 0 && index < mPlaylist->size()) {

        if (mPlaylist->isComplete()) {

            size_t index = 0;

            int64_t segmentStartUs = 0;

            while (index < mPlaylist->size()) {

                sp<AMessage> itemMeta;

                CHECK(mPlaylist->itemAt(

                            index, NULL /* uri */, &itemMeta));



                int64_t itemDurationUs;

                CHECK(itemMeta->findInt64("durationUs", &itemDurationUs));



                if (mSeekTimeUs < segmentStartUs + itemDurationUs) {

                    break;

                }



                segmentStartUs += itemDurationUs;

                ++index;

            }



            if (index < mPlaylist->size()) {

                int32_t newSeqNumber = firstSeqNumberInPlaylist + index;



                if (newSeqNumber != mSeqNumber) {

media/libstagefright/httplive/M3UParser.cpp

+10 −3
Original line number Diff line number Diff line
@@ -64,14 +64,21 @@ size_t M3UParser::size() { 
}



bool M3UParser::itemAt(size_t index, AString *uri, sp<AMessage> *meta) {

    if (uri) {

        uri->clear();

    if (meta) { *meta = NULL; }

    }



    if (meta) {

        *meta = NULL;

    }



    if (index >= mItems.size()) {

        return false;

    }



    if (uri) {

        *uri = mItems.itemAt(index).mURI;

    }



    if (meta) {

        *meta = mItems.itemAt(index).mMeta;