diff options
author | Jean-Michel Trivi <jmtrivi@google.com> | 2010-01-08 15:21:39 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-08 15:21:39 -0800 |
commit | 2a6c63b678e83956dc363762a4bf39fa42c78143 (patch) | |
tree | 81bb9142e27a9c095ae77810d70c23a1829bc9ff /packages | |
parent | 0a0289420227fee51406cf4cc508f09d8ecdd2f4 (diff) | |
parent | ddc63ad04b58b8a883b4984a7af2aea2fdbff337 (diff) | |
download | frameworks_base-2a6c63b678e83956dc363762a4bf39fa42c78143.zip frameworks_base-2a6c63b678e83956dc363762a4bf39fa42c78143.tar.gz frameworks_base-2a6c63b678e83956dc363762a4bf39fa42c78143.tar.bz2 |
Merge "Remove useless start of AudioTrack for TTS and improper volume setting. The AudioTrack that plays the synthesized audio data should only be started when the first synthesis request is sent, not after the initialization of the engine. The track volume should be initialized to it nominal level. Volumes above 1 do not provide amplification, so setting the volume to 2 is not necessary."
Diffstat (limited to 'packages')
-rw-r--r-- | packages/TtsService/jni/android_tts_SynthProxy.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/packages/TtsService/jni/android_tts_SynthProxy.cpp b/packages/TtsService/jni/android_tts_SynthProxy.cpp index 17ece04..d114ea9 100644 --- a/packages/TtsService/jni/android_tts_SynthProxy.cpp +++ b/packages/TtsService/jni/android_tts_SynthProxy.cpp @@ -230,9 +230,8 @@ class SynthProxyJniStorage { mAudioOut = NULL; } else { //LOGI("AudioTrack OK"); - mAudioOut->setVolume(2.0f, 2.0f); - mAudioOut->start(); - LOGV("AudioTrack started"); + mAudioOut->setVolume(1.0f, 1.0f); + LOGV("AudioTrack ready"); } } }; |