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

Commit 005e9d03 authored by Andy Hung's avatar Andy Hung
Browse files

NuPlayer: Allow audio drain to fill buffer when paused 

If a pause lasts more than a few seconds, the audio device
enters standby.  When the audio device comes out of standby,
it typically requests a large amount of data to fill its buffers
(especially severe for deep buffer PCM mode).

To avoid a glitch, continue to fill the buffer (until no more data
can be written) when paused.

Also, we do not start the audio sink if we are paused to avoid
audio playback in video preview mode.

Bug: 19062223
Bug: 21198655
Change-Id: Ifb3f181d5e810283381b65f2af16a4c71df0b04f
parent 85e48142

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

+13 −5
Original line number Diff line number Diff line
@@ -623,8 +623,7 @@ void NuPlayer::Renderer::onMessageReceived(const sp<AMessage> &msg) { 
}



void NuPlayer::Renderer::postDrainAudioQueue_l(int64_t delayUs) {

    if (mDrainAudioQueuePending || mSyncQueues || mPaused

            || mUseAudioCallback) {

    if (mDrainAudioQueuePending || mSyncQueues || mUseAudioCallback) {

        return;

    }
@@ -800,6 +799,7 @@ bool NuPlayer::Renderer::onDrainAudioQueue() { 
    }

#endif



    uint32_t prevFramesWritten = mNumFramesWritten;

    while (!mAudioQueue.empty()) {

        QueueEntry *entry = &*mAudioQueue.begin();
@@ -898,7 +898,13 @@ bool NuPlayer::Renderer::onDrainAudioQueue() { 
    }

    mMediaClock->updateMaxTimeMedia(maxTimeMedia);



    return !mAudioQueue.empty();

    // calculate whether we need to reschedule another write.

    bool reschedule = !mAudioQueue.empty()

            && (!mPaused

                || prevFramesWritten != mNumFramesWritten); // permit pause to fill buffers

    //ALOGD("reschedule:%d  empty:%d  mPaused:%d  prevFramesWritten:%u  mNumFramesWritten:%u",

    //        reschedule, mAudioQueue.empty(), mPaused, prevFramesWritten, mNumFramesWritten);

    return reschedule;

}



int64_t NuPlayer::Renderer::getDurationUsIfPlayedAtSampleRate(uint32_t numFrames) {
@@ -1398,7 +1404,7 @@ void NuPlayer::Renderer::onPause() { 


    {

        Mutex::Autolock autoLock(mLock);

        ++mAudioDrainGeneration;

        // we do not increment audio drain generation so that we fill audio buffer during pause.

        ++mVideoDrainGeneration;

        prepareForMediaRenderingStart_l();

        mPaused = true;
@@ -1733,8 +1739,10 @@ status_t NuPlayer::Renderer::onOpenAudioSink( 
            return err;

        }

        mCurrentPcmInfo = info;

        if (!mPaused) { // for preview mode, don't start if paused

            mAudioSink->start();

        }

    }

    if (audioSinkChanged) {

        onAudioSinkChanged();

    }