commit a66d3899f7d13e69ee451f1071f0d999678803ce
author Mikhail Naganov <mnaganov@google.com> Wed May 03 16:50:56 2017 -0700
committer Mikhail Naganov <mnaganov@google.com> Thu May 04 11:25:59 2017 -0700
tree 542dcd3c8d5ad1c2963d8b8aba0156c52fac655f
parent f1e459c6400a774d99390227e853a30f58cee4a2

audioflinger: Do not report underruns for stopped or paused tracks

PlaybackThread::Track is missing checks for the track state
when reporting underruns. These checks present on other instances
when tallyUnderrunFrames is being called.

This eliminates fake underrun reportings when playing
multichannel tracks via deep buffer.

Bug: 36181621
Test: play multichannel track and check underrun count at the end
Change-Id: Ieff338b33807e66df91234d85b782ee383fe95b9

services/audioflinger/Tracks.cpp

diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp
index 5480513..8fefb36 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);