From 963719869967cc257e666809aeb9bff3f25117ed Mon Sep 17 00:00:00 2001 From: Narayan Kamath Date: Tue, 5 Jul 2011 15:31:07 +0100 Subject: Minor changes to AudioTrack handling Based on a discussion with the media folks. Change-Id: I290cec062fcb53fccae1fd92387439448a54e81c --- core/java/android/speech/tts/AudioPlaybackHandler.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/core/java/android/speech/tts/AudioPlaybackHandler.java b/core/java/android/speech/tts/AudioPlaybackHandler.java index a3686b77d1b7..c7603ee2b5f5 100644 --- a/core/java/android/speech/tts/AudioPlaybackHandler.java +++ b/core/java/android/speech/tts/AudioPlaybackHandler.java @@ -74,6 +74,12 @@ class AudioPlaybackHandler { removeMessages(token); if (token.getType() == MessageParams.TYPE_SYNTHESIS) { + AudioTrack current = ((SynthesisMessageParams) token).getAudioTrack(); + if (current != null) { + // Stop the current audio track if it's still playing. + // The audio track is thread safe in this regard. + current.stop(); + } mQueue.add(new ListEntry(SYNTHESIS_DONE, token, HIGH_PRIORITY)); } else { final MessageParams current = getCurrentParams(); @@ -393,9 +399,10 @@ class AudioPlaybackHandler { try { if (audioTrack != null) { - audioTrack.flush(); - audioTrack.stop(); if (DBG) Log.d(TAG, "Releasing audio track [" + audioTrack.hashCode() + "]"); + // The last call to AudioTrack.write( ) will return only after + // all data from the audioTrack has been sent to the mixer, so + // it's safe to release at this point. audioTrack.release(); } } finally { -- cgit v1.2.3-59-g8ed1b