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

am 2f437b4c: Merge change 5434 into donut

Browse Source 
Merge commit '2f437b4c56db1750cc6cb3d1ad549a79049b6370'

* commit '2f437b4c56db1750cc6cb3d1ad549a79049b6370':
  Adding splitting to the TTS to guard against extremely long strings.
This commit is contained in:
Android (Google) Code Review
2009-06-25 16:10:22 -07:00
committed by The Android Open Source Project
parent a2071618a0 2f437b4c56
commit 8bf2f6806d
1 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,6 +89,8 @@ public class TtsService extends Service implements OnCompletionListener {
}
}
private static final int MAX_SPEECH_ITEM_CHAR_LENGTH = 4000;
private static final String ACTION = "android.intent.action.USE_TTS";
private static final String CATEGORY = "android.intent.category.TTS";
private static final String PKGNAME = "android.tts";
@@ -108,7 +110,6 @@ public class TtsService extends Service implements OnCompletionListener {
private final ReentrantLock synthesizerLock = new ReentrantLock();
private SynthProxy nativeSynth;
@Override
public void onCreate() {
super.onCreate();
@@ -145,13 +146,11 @@ public class TtsService extends Service implements OnCompletionListener {
private void setDefaultSettings() {
// TODO handle default language
setLanguage("eng", "USA", "");
// speech rate
setSpeechRate(getDefaultRate());
}
@@ -445,6 +444,33 @@ public class TtsService extends Service implements OnCompletionListener {
Log.i("TTS callback", "dispatch completed to " + N);
}
private SpeechItem splitCurrentTextIfNeeded(SpeechItem currentSpeechItem){
if (currentSpeechItem.mText.length() < MAX_SPEECH_ITEM_CHAR_LENGTH){
return currentSpeechItem;
} else {
ArrayList<SpeechItem> splitItems = new ArrayList<SpeechItem>();
int start = 0;
int end = start + MAX_SPEECH_ITEM_CHAR_LENGTH - 1;
String splitText;
SpeechItem splitItem;
while (end < currentSpeechItem.mText.length()){
splitText = currentSpeechItem.mText.substring(start, end);
splitItem = new SpeechItem(splitText, null, SpeechItem.SPEECH);
splitItems.add(splitItem);
start = end;
end = start + MAX_SPEECH_ITEM_CHAR_LENGTH - 1;
}
splitText = currentSpeechItem.mText.substring(start);
splitItem = new SpeechItem(splitText, null, SpeechItem.SPEECH);
splitItems.add(splitItem);
mSpeechQueue.remove(0);
for (int i = splitItems.size() - 1; i >= 0; i--){
mSpeechQueue.add(0, splitItems.get(i));
}
return mSpeechQueue.get(0);
}
}
private void processSpeechQueue() {
boolean speechQueueAvailable = false;
try {
@@ -466,8 +492,7 @@ public class TtsService extends Service implements OnCompletionListener {
Log.i("TTS processing: ", currentSpeechItem.mText);
if (sr == null) {
if (currentSpeechItem.mType == SpeechItem.SPEECH) {
// TODO: Split text up into smaller chunks before accepting
// them for processing.
currentSpeechItem = splitCurrentTextIfNeeded(currentSpeechItem);
speakInternalOnly(currentSpeechItem.mText,
currentSpeechItem.mParams);
} else {