commit ab37fbfcdc197429d59f6926ba970b3e68bbbadf
author Mikhail Naganov <mnaganov@google.com> Thu May 04 23:03:00 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 04 23:03:00 2017 +0000
tree b996f5b97e90646a4a44244874cca7a5e1b57d74
parent 9be44dcb02e01e26cccd8334223f75174fbb3f26
parent 8c9796628b8aa19adb3787dae7de0989b5b5ef4c

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

Change-Id: I819e1361dd3245f35fe06691a4758fe43febc3d0

services/audioflinger/Tracks.cpp

diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp
index dcbbe66..4c48e8b 100644
--- a/services/audioflinger/Tracks.cpp
+++ b/services/audioflinger/Tracks.cpp
@@ -597,7 +597,9 @@
     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);