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

Commit 46246e5b authored by Lajos Molnar's avatar Lajos Molnar
Browse files

resolved conflicts for merge of 59d1d010 to lmp-mr1-dev-plus-aosp 

Change-Id: I52e17685b3aa058d6c6b0c023659231fa00a8f71
parents 9c8bce57 59d1d010

media/libstagefright/httplive/PlaylistFetcher.cpp

+3 −3
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ namespace android { 
const int64_t PlaylistFetcher::kMinBufferedDurationUs = 10000000ll;

const int64_t PlaylistFetcher::kMaxMonitorDelayUs = 3000000ll;

const int32_t PlaylistFetcher::kDownloadBlockSize = 2048;

const int32_t PlaylistFetcher::kNumSkipFrames = 10;

const int32_t PlaylistFetcher::kNumSkipFrames = 5;



PlaylistFetcher::PlaylistFetcher(

        const sp<AMessage> &notify,
@@ -560,7 +560,7 @@ status_t PlaylistFetcher::onResumeUntil(const sp<AMessage> &msg) { 
        // Don't resume if we would stop within a resume threshold.

        int32_t discontinuitySeq;

        int64_t latestTimeUs = 0, stopTimeUs = 0;

        sp<AMessage> latestMeta = packetSource->getLatestDequeuedMeta();

        sp<AMessage> latestMeta = packetSource->getLatestEnqueuedMeta();

        if (latestMeta != NULL

                && latestMeta->findInt32("discontinuitySeq", &discontinuitySeq)

                && discontinuitySeq == mDiscontinuitySeq
@@ -1677,7 +1677,7 @@ void PlaylistFetcher::updateDuration() { 


int64_t PlaylistFetcher::resumeThreshold(const sp<AMessage> &msg) {

    int64_t durationUs;

    if (msg->findInt64("durationUs", &durationUs)) {

    if (msg->findInt64("durationUs", &durationUs) && durationUs > 0) {

        return kNumSkipFrames * durationUs;

    }

media/libstagefright/mpeg2ts/AnotherPacketSource.cpp

+7 −0
Original line number Diff line number Diff line
@@ -221,9 +221,16 @@ void AnotherPacketSource::queueAccessUnit(const sp<ABuffer> &buffer) { 
        mLatestEnqueuedMeta = buffer->meta()->dup();

    } else {

        int64_t latestTimeUs = 0;

        int64_t frameDeltaUs = 0;

        CHECK(mLatestEnqueuedMeta->findInt64("timeUs", &latestTimeUs));

        if (lastQueuedTimeUs > latestTimeUs) {

            mLatestEnqueuedMeta = buffer->meta()->dup();

            frameDeltaUs = lastQueuedTimeUs - latestTimeUs;

            mLatestEnqueuedMeta->setInt64("durationUs", frameDeltaUs);

        } else if (!mLatestEnqueuedMeta->findInt64("durationUs", &frameDeltaUs)) {

            // For B frames

            frameDeltaUs = latestTimeUs - lastQueuedTimeUs;

            mLatestEnqueuedMeta->setInt64("durationUs", frameDeltaUs);

        }

    }

}