| commit | a6854ee410c9935564f4beaf900fb61f76f518c3 | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Tue Jun 23 01:14:29 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 23 01:14:29 2020 +0000 |
| tree | 8dc3a8630b4376e77fef047c0d515500252fec28 | |
| parent | 757ba90f97637068f5162c85833f30127d3df2ea [diff] | |
| parent | d7828092ec2ed8dbb1955a76d1ca2757548b9ec7 [diff] |
Merge "AudioFlinger: Fix spurious underrun logging" into rvc-dev am: 54cc1e3c43 am: 43fd672bd7 am: 19fa75e682 am: d7828092ec Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11956760 Change-Id: I622266bee6697fa359ecc77125abcd277852e063
diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp index abd5eb8..d366bb7 100644 --- a/services/audioflinger/Tracks.cpp +++ b/services/audioflinger/Tracks.cpp
@@ -805,7 +805,7 @@ status_t status = mServerProxy->obtainBuffer(&buf); buffer->frameCount = buf.mFrameCount; 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", __func__, mId, buf.mFrameCount, desiredFrames, mState); mAudioTrackServerProxy->tallyUnderrunFrames(desiredFrames);