| commit | f536e7763325c8509589f477d33df39418a0c5ab | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Tue Jun 23 00:42:08 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 23 00:42:08 2020 +0000 |
| tree | 6785a188315c72876af44f7b27120084e6d67328 | |
| parent | 20501b9d6ac375c580b506e4510b0b613cd4d716 [diff] | |
| parent | 43fd672bd7cfd9eef13012c545ad4630d12e325c [diff] |
Merge "AudioFlinger: Fix spurious underrun logging" into rvc-dev am: 54cc1e3c43 am: 43fd672bd7 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11956760 Change-Id: Ifff763d9d7351da096702524e751fbd2f56d1832
diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp index be2f687..126015f 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);