Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 7829 into donut

Browse Source 
* changes:
  Making sure that there are no calls made to the native TTS layer if the utterance is in the process of being canceled.
This commit is contained in:
Android (Google) Code Review
2009-07-17 21:39:26 -07:00
parent 39846e6919 b79370aad7
commit 4b897aa99b
1 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
packages/TtsService/src/android/tts/TtsService.java
View File

@@ -551,16 +551,16 @@ public class TtsService extends Service implements OnCompletionListener {
return; return;
} }
int streamType = DEFAULT_STREAM_TYPE; int streamType = DEFAULT_STREAM_TYPE;
String language = "";
String country = "";
String variant = "";
String speechRate = "";
if (speechItem.mParams != null){ if (speechItem.mParams != null){
String language = "";
String country = "";
String variant = "";
for (int i = 0; i < speechItem.mParams.size() - 1; i = i + 2){ for (int i = 0; i < speechItem.mParams.size() - 1; i = i + 2){
String param = speechItem.mParams.get(i); String param = speechItem.mParams.get(i);
if (param != null) { if (param != null) {
if (param.equals(TextToSpeech.Engine.TTS_KEY_PARAM_RATE)) { if (param.equals(TextToSpeech.Engine.TTS_KEY_PARAM_RATE)) {
setSpeechRate("", speechRate = speechItem.mParams.get(i+1);
Integer.parseInt(speechItem.mParams.get(i+1)));
} else if (param.equals(TextToSpeech.Engine.TTS_KEY_PARAM_LANGUAGE)){ } else if (param.equals(TextToSpeech.Engine.TTS_KEY_PARAM_LANGUAGE)){
language = speechItem.mParams.get(i+1); language = speechItem.mParams.get(i+1);
} else if (param.equals(TextToSpeech.Engine.TTS_KEY_PARAM_COUNTRY)){ } else if (param.equals(TextToSpeech.Engine.TTS_KEY_PARAM_COUNTRY)){
@@ -579,12 +579,15 @@ public class TtsService extends Service implements OnCompletionListener {
} }
} }
} }
}
// Only do the synthesis if it has not been killed by a subsequent utterance.
if (mKillList.get(speechItem) == null) {
if (language.length() > 0){ if (language.length() > 0){
setLanguage("", language, country, variant); setLanguage("", language, country, variant);
} }
} if (speechRate.length() > 0){
// Only do the synthesis if it has not been killed by a subsequent utterance. setSpeechRate("", Integer.parseInt(speechRate));
if (mKillList.get(speechItem) == null){ }
nativeSynth.speak(speechItem.mText, streamType); nativeSynth.speak(speechItem.mText, streamType);
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
@@ -624,16 +627,16 @@ public class TtsService extends Service implements OnCompletionListener {
synth.start(); synth.start();
return; return;
} }
String language = "";
String country = "";
String variant = "";
String speechRate = "";
if (speechItem.mParams != null){ if (speechItem.mParams != null){
String language = "";
String country = "";
String variant = "";
for (int i = 0; i < speechItem.mParams.size() - 1; i = i + 2){ for (int i = 0; i < speechItem.mParams.size() - 1; i = i + 2){
String param = speechItem.mParams.get(i); String param = speechItem.mParams.get(i);
if (param != null){ if (param != null) {
if (param.equals(TextToSpeech.Engine.TTS_KEY_PARAM_RATE)){ if (param.equals(TextToSpeech.Engine.TTS_KEY_PARAM_RATE)) {
setSpeechRate("", speechRate = speechItem.mParams.get(i+1);
Integer.parseInt(speechItem.mParams.get(i+1)));
} else if (param.equals(TextToSpeech.Engine.TTS_KEY_PARAM_LANGUAGE)){ } else if (param.equals(TextToSpeech.Engine.TTS_KEY_PARAM_LANGUAGE)){
language = speechItem.mParams.get(i+1); language = speechItem.mParams.get(i+1);
} else if (param.equals(TextToSpeech.Engine.TTS_KEY_PARAM_COUNTRY)){ } else if (param.equals(TextToSpeech.Engine.TTS_KEY_PARAM_COUNTRY)){
@@ -645,12 +648,15 @@ public class TtsService extends Service implements OnCompletionListener {
} }
} }
} }
if (language.length() > 0){
setLanguage("", language, country, variant);
}
} }
// Only do the synthesis if it has not been killed by a subsequent utterance. // Only do the synthesis if it has not been killed by a subsequent utterance.
if (mKillList.get(speechItem) == null){ if (mKillList.get(speechItem) == null){
if (language.length() > 0){
setLanguage("", language, country, variant);
}
if (speechRate.length() > 0){
setSpeechRate("", Integer.parseInt(speechRate));
}
nativeSynth.synthesizeToFile(speechItem.mText, speechItem.mFilename); nativeSynth.synthesizeToFile(speechItem.mText, speechItem.mFilename);
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {