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

Commit ab37fbfc authored by Mikhail Naganov's avatar Mikhail Naganov Committed by android-build-merger
Browse files

Merge "audioflinger: Do not report underruns for stopped or paused tracks"... 

Merge "audioflinger: Do not report underruns for stopped or paused tracks" into oc-dev am: bc4040ef
am: 8c979662

Change-Id: I819e1361dd3245f35fe06691a4758fe43febc3d0
parents 9be44dcb 8c979662

services/audioflinger/Tracks.cpp

+3 −1
Original line number Diff line number Diff line
@@ -597,7 +597,9 @@ status_t AudioFlinger::PlaybackThread::Track::getNextBuffer( 
    status_t status = mServerProxy->obtainBuffer(&buf);

    buffer->frameCount = buf.mFrameCount;

    buffer->raw = buf.mRaw;

    if (buf.mFrameCount == 0) {

    if (buf.mFrameCount == 0 && !isStopping() && !isStopped() && !isPaused()) {

        ALOGV("underrun,  framesReady(%zu) < framesDesired(%zd), state: %d",

                buf.mFrameCount, desiredFrames, mState);

        mAudioTrackServerProxy->tallyUnderrunFrames(desiredFrames);

    } else {

        mAudioTrackServerProxy->tallyUnderrunFrames(0);