commit 1bf0eecd2ec6a3b3e29ad2c91bcefda76abef2fe
author Glenn Kasten <gkasten@android.com> Wed Jan 29 17:48:44 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 29 17:48:44 2014 +0000
tree 41b83ec660ace65ac60b2d6061327ce9c7f33309
parent 06da69d57d90e180e1165905e6c703227a06f041
parent 7e79cd2d3067cdb7b9daf639cf772d4dd149c934

Merge "AudioMixer: Remove tracks from enabledTracks after reseting outTemp"

services/audioflinger/AudioMixer.cpp

diff --git a/services/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp
index df4e029..07dc6dd 100644
--- a/services/audioflinger/AudioMixer.cpp
+++ b/services/audioflinger/AudioMixer.cpp
@@ -1122,10 +1122,6 @@
         t.bufferProvider->getNextBuffer(&t.buffer, pts);
         t.frameCount = t.buffer.frameCount;
         t.in = t.buffer.raw;
-        // t.in == NULL can happen if the track was flushed just after having
-        // been enabled for mixing.
-        if (t.in == NULL)
-            enabledTracks &= ~(1<<i);
     }
 
     e0 = enabledTracks;
@@ -1161,6 +1157,13 @@
                     aux = t.auxBuffer + numFrames;
                 }
                 while (outFrames) {
+                    // t.in == NULL can happen if the track was flushed just after having
+                    // been enabled for mixing.
+                   if (t.in == NULL) {
+                        enabledTracks &= ~(1<<i);
+                        e1 &= ~(1<<i);
+                        break;
+                    }
                     size_t inFrames = (t.frameCount > outFrames)?outFrames:t.frameCount;
                     if (inFrames) {
                         t.hook(&t, outTemp + (BLOCKSIZE-outFrames)*MAX_NUM_CHANNELS, inFrames,