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

Commit 43fd672b authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "AudioFlinger: Fix spurious underrun logging" into rvc-dev am: 54cc1e3c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11956760

Change-Id: I8936e5fb2cbab3a81acc390067938c728fed9974
parents 20a0c405 54cc1e3c

services/audioflinger/Tracks.cpp

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

    status_t status = mServerProxy->obtainBuffer(&buf);

    buffer->frameCount = buf.mFrameCount;

    buffer->frameCount = buf.mFrameCount;

    buffer->raw = buf.mRaw;

    buffer->raw = buf.mRaw;

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

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

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

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

                __func__, mId, buf.mFrameCount, desiredFrames, mState);

                __func__, mId, buf.mFrameCount, desiredFrames, mState);

        mAudioTrackServerProxy->tallyUnderrunFrames(desiredFrames);

        mAudioTrackServerProxy->tallyUnderrunFrames(desiredFrames);