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

Commit fcf044a9 authored by Chong Zhang's avatar Chong Zhang
Browse files

NuPlayer: pull more video buffers in advance in GenericSource 

pull 4 video buffers at a time, and start pulling when we're down
to 1 buffers to avoid starving the decoder.

bug: 22320866
Change-Id: I10914dc092f3830ecb6296e2d9ebf9064ff7a5dc
parent 54c0659b

media/libmediaplayerservice/nuplayer/GenericSource.cpp

+5 −1
Original line number Diff line number Diff line
@@ -1005,7 +1005,9 @@ status_t NuPlayer::GenericSource::dequeueAccessUnit( 


    status_t result = track->mPackets->dequeueAccessUnit(accessUnit);



    if (!track->mPackets->hasBufferAvailable(&finalResult)) {

    // start pulling in more buffers if we only have one (or no) buffer left

    // so that decoder has less chance of being starved

    if (track->mPackets->getAvailableBufferCount(&finalResult) < 2) {

        postReadBuffer(audio? MEDIA_TRACK_TYPE_AUDIO : MEDIA_TRACK_TYPE_VIDEO);

    }
@@ -1458,6 +1460,8 @@ void NuPlayer::GenericSource::readBuffer( 
            track = &mVideoTrack;

            if (mIsWidevine) {

                maxBuffers = 2;

            } else {

                maxBuffers = 4;

            }

            break;

        case MEDIA_TRACK_TYPE_AUDIO:

media/libstagefright/mpeg2ts/AnotherPacketSource.cpp

+14 −0
Original line number Diff line number Diff line
@@ -394,6 +394,20 @@ bool AnotherPacketSource::hasDataBufferAvailable(status_t *finalResult) { 
    return false;

}



size_t AnotherPacketSource::getAvailableBufferCount(status_t *finalResult) {

    Mutex::Autolock autoLock(mLock);



    *finalResult = OK;

    if (!mEnabled) {

        return 0;

    }

    if (!mBuffers.empty()) {

        return mBuffers.size();

    }

    *finalResult = mEOSResult;

    return 0;

}



int64_t AnotherPacketSource::getBufferedDurationUs(status_t *finalResult) {

    Mutex::Autolock autoLock(mLock);

    *finalResult = mEOSResult;

media/libstagefright/mpeg2ts/AnotherPacketSource.h

+4 −0
Original line number Diff line number Diff line
@@ -49,6 +49,10 @@ struct AnotherPacketSource : public MediaSource { 
    // Returns true if we have packets that's not discontinuities

    bool hasDataBufferAvailable(status_t *finalResult);



    // Returns the number of available buffers. finalResult is always OK

    // if this method returns non-0, or the final result if it returns 0.

    size_t getAvailableBufferCount(status_t *finalResult);



    // Returns the difference between the last and the first queued

    // presentation timestamps since the last discontinuity (if any).

    int64_t getBufferedDurationUs(status_t *finalResult);