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

Commit 80c57d57 authored by Wei Jia's avatar Wei Jia Committed by Android (Google) Code Review
Browse files

Merge "NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor time is changed... 

Merge "NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor time is changed to fix pause-seek-getCurrentPosition." into lmp-mr1-dev
parents 18265202 474d7c77

media/libmediaplayerservice/nuplayer/GenericSource.cpp

+13 −1
Original line number Diff line number Diff line
@@ -1198,6 +1198,7 @@ status_t NuPlayer::GenericSource::doSeek(int64_t seekTimeUs) { 
sp<ABuffer> NuPlayer::GenericSource::mediaBufferToABuffer(

        MediaBuffer* mb,

        media_track_type trackType,

        int64_t /* seekTimeUs */,

        int64_t *actualTimeUs) {

    bool audio = trackType == MEDIA_TRACK_TYPE_AUDIO;

    size_t outLength = mb->range_length();
@@ -1235,6 +1236,16 @@ sp<ABuffer> NuPlayer::GenericSource::mediaBufferToABuffer( 
    CHECK(mb->meta_data()->findInt64(kKeyTime, &timeUs));

    meta->setInt64("timeUs", timeUs);



#if 0

    // Temporarily disable pre-roll till we have a full solution to handle

    // both single seek and continous seek gracefully.

    if (seekTimeUs > timeUs) {

        sp<AMessage> extra = new AMessage;

        extra->setInt64("resume-at-mediaTimeUs", seekTimeUs);

        meta->setMessage("extra", extra);

    }

#endif



    if (trackType == MEDIA_TRACK_TYPE_TIMEDTEXT) {

        const char *mime;

        CHECK(mTimedTextTrack.mSource != NULL
@@ -1366,7 +1377,8 @@ void NuPlayer::GenericSource::readBuffer( 
                track->mPackets->queueDiscontinuity( type, NULL, true /* discard */);

            }



            sp<ABuffer> buffer = mediaBufferToABuffer(mbuf, trackType, actualTimeUs);

            sp<ABuffer> buffer = mediaBufferToABuffer(

                    mbuf, trackType, seekTimeUs, actualTimeUs);

            track->mPackets->queueAccessUnit(buffer);

            formatChange = false;

            seeking = false;

media/libmediaplayerservice/nuplayer/GenericSource.h

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ private: 
    sp<ABuffer> mediaBufferToABuffer(

            MediaBuffer *mbuf,

            media_track_type trackType,

            int64_t seekTimeUs,

            int64_t *actualTimeUs = NULL);



    void postReadBuffer(media_track_type trackType);

media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp

+1 −0
Original line number Diff line number Diff line
@@ -476,6 +476,7 @@ bool NuPlayer::Decoder::handleAnOutputBuffer() { 
    buffer->meta()->setInt64("timeUs", timeUs);

    if (flags & MediaCodec::BUFFER_FLAG_EOS) {

        buffer->meta()->setInt32("eos", true);

        notifyResumeCompleteIfNecessary();

    }

    // we do not expect CODECCONFIG or SYNCFRAME for decoder

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -771,6 +771,7 @@ void NuPlayer::Renderer::postDrainVideoQueue() { 


        if (mAnchorTimeMediaUs < 0) {

            setAnchorTime(mediaTimeUs, nowUs);

            mAnchorMaxMediaUs = mediaTimeUs;

            realTimeUs = nowUs;

        } else {

            realTimeUs = getRealTimeUs(mediaTimeUs, nowUs);