summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/Tracks.cpp
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2014-09-30 14:56:11 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-30 14:56:11 +0000
commita5d419be9507c81af3b1f522cdc681708769f625 (patch)
tree4daee2ae255711668a4b810cbe1bc8e3dc6b7320 /services/audioflinger/Tracks.cpp
parent1f25ce3c3c4d34826cddbd1907e2b09f1cd735f6 (diff)
parentf71224ce266abb39f83ecba87783c2347631654a (diff)
downloadframeworks_av-a5d419be9507c81af3b1f522cdc681708769f625.zip
frameworks_av-a5d419be9507c81af3b1f522cdc681708769f625.tar.gz
frameworks_av-a5d419be9507c81af3b1f522cdc681708769f625.tar.bz2
am f71224ce: Merge "audioflinger: forward flush to direct output streams" into lmp-dev
* commit 'f71224ce266abb39f83ecba87783c2347631654a': 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 c0a75b9..75190f3 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