Merge "Fix isssue 2548710: Native AudioTrack resources never freed."

Jean-Baptiste Queru · Android Code Review · commit a3e764551413 · 2010-05-19T08:35:21.000-07:00
diff --git a/libs/audioflinger/AudioFlinger.cpp b/libs/audioflinger/AudioFlinger.cpp
@@ -1344,7 +1344,7 @@ uint32_t AudioFlinger::MixerThread::prepareTracks_l(const SortedVector< wp<Track
         // for all its buffers to be filled before processing it
         mAudioMixer->setActiveTrack(track->name());
         if (cblk->framesReady() && (track->isReady() || track->isStopped()) &&
-                !track->isPaused())
+                !track->isPaused() && !track->isTerminated())
         {
             //LOGV("track %d u=%08x, s=%08x [OK] on thread %p", track->name(), cblk->user, cblk->server, this);
 

Original file line number	Diff line number	Diff line change
`@@ -1344,7 +1344,7 @@ uint32_t AudioFlinger::MixerThread::prepareTracks_l(const SortedVector< wp<Track`
`1344`	`1344`	`// for all its buffers to be filled before processing it`
`1345`	`1345`	`mAudioMixer->setActiveTrack(track->name());`
`1346`	`1346`	`if (cblk->framesReady() && (track->isReady() \|\| track->isStopped()) &&`
`1347`		`- !track->isPaused())`
	`1347`	`+ !track->isPaused() && !track->isTerminated())`
`1348`	`1348`	`{`
`1349`	`1349`	`//LOGV("track %d u=%08x, s=%08x [OK] on thread %p", track->name(), cblk->user, cblk->server, this);`
`1350`	`1350`