summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/Tracks.cpp
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2014-10-01 02:26:46 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-01 02:26:46 +0000
commita2dda4fcb3ab34a58c5218bb3a8a156cf04651b2 (patch)
tree15e55894c0fd8ce2b70486b82275a1da4244a7fb /services/audioflinger/Tracks.cpp
parent0643f8d84c2bdbf6c29136a5c484c8f31ce2f83d (diff)
parente0270e79066825bb232ef5f271ac9ef84ce91b0f (diff)
downloadframeworks_av-a2dda4fcb3ab34a58c5218bb3a8a156cf04651b2.zip
frameworks_av-a2dda4fcb3ab34a58c5218bb3a8a156cf04651b2.tar.gz
frameworks_av-a2dda4fcb3ab34a58c5218bb3a8a156cf04651b2.tar.bz2
am e0270e79: am f71224ce: Merge "audioflinger: forward flush to direct output streams" into lmp-dev
* commit 'e0270e79066825bb232ef5f271ac9ef84ce91b0f': audioflinger: forward flush to direct output streams
Diffstat (limited to 'services/audioflinger/Tracks.cpp')
-rw-r--r--services/audioflinger/Tracks.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp
index d6ed910..8793f4a 100644
--- a/services/audioflinger/Tracks.cpp
+++ b/services/audioflinger/Tracks.cpp
@@ -824,6 +824,10 @@ void AudioFlinger::PlaybackThread::Track::flush()
// remove from active track list, reset(), and trigger presentation complete
if (playbackThread->mActiveTracks.indexOf(this) < 0) {
reset();
+ if (thread->type() == ThreadBase::DIRECT) {
+ DirectOutputThread *t = (DirectOutputThread *)playbackThread;
+ t->flushHw_l();
+ }
}
}
// Prevent flush being lost if the track is flushed and then resumed