drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 7335 into donut

Browse Source 
* changes:
  Making sure that the audio buffers for speech are cleared so that there are no leftovers which could cause mangled output.
This commit is contained in:
Android (Google) Code Review
2009-07-14 18:22:15 -07:00
parent 211aef308b 4a3368ffe8
commit b197021e16
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/TtsService/jni/android_tts_SynthProxy.cpp
View File

@ -84,6 +84,7 @@ class SynthProxyJniStorage {
mNbChannels = DEFAULT_TTS_NB_CHANNELS; mNbChannels = DEFAULT_TTS_NB_CHANNELS;
mBufferSize = DEFAULT_TTS_BUFFERSIZE; mBufferSize = DEFAULT_TTS_BUFFERSIZE;
mBuffer = new int8_t[mBufferSize]; mBuffer = new int8_t[mBufferSize];
memset(mBuffer, 0, mBufferSize);
} }
~SynthProxyJniStorage() { ~SynthProxyJniStorage() {
@ -194,6 +195,7 @@ static tts_callback_status ttsSynthDoneCB(void *& userdata, uint32_t rate,
prepAudioTrack(pJniData, pForAfter->streamType, rate, format, channel); prepAudioTrack(pJniData, pForAfter->streamType, rate, format, channel);
if (pJniData->mAudioOut) { if (pJniData->mAudioOut) {
pJniData->mAudioOut->write(wav, bufferSize); pJniData->mAudioOut->write(wav, bufferSize);
memset(wav, 0, bufferSize);
//LOGV("AudioTrack wrote: %d bytes", bufferSize); //LOGV("AudioTrack wrote: %d bytes", bufferSize);
} else { } else {
LOGE("Can't play, null audiotrack"); LOGE("Can't play, null audiotrack");
@ -208,6 +210,7 @@ static tts_callback_status ttsSynthDoneCB(void *& userdata, uint32_t rate,
} }
if (bufferSize > 0){ if (bufferSize > 0){
fwrite(wav, 1, bufferSize, pForAfter->outputFile); fwrite(wav, 1, bufferSize, pForAfter->outputFile);
memset(wav, 0, bufferSize);
} }
} }
// Future update: // Future update:
@ -473,6 +476,7 @@ android_tts_SynthProxy_synthesizeToFile(JNIEnv *env, jobject thiz, jint jniData,
unsigned int unique_identifier; unsigned int unique_identifier;
memset(pSynthData->mBuffer, 0, pSynthData->mBufferSize);
result = pSynthData->mNativeSynthInterface->synthesizeText(textNativeString, result = pSynthData->mNativeSynthInterface->synthesizeText(textNativeString,
pSynthData->mBuffer, pSynthData->mBufferSize, (void *)pForAfter); pSynthData->mBuffer, pSynthData->mBufferSize, (void *)pForAfter);
@ -554,6 +558,7 @@ android_tts_SynthProxy_speak(JNIEnv *env, jobject thiz, jint jniData,
if (pSynthData->mNativeSynthInterface) { if (pSynthData->mNativeSynthInterface) {
const char *textNativeString = env->GetStringUTFChars(textJavaString, 0); const char *textNativeString = env->GetStringUTFChars(textJavaString, 0);
memset(pSynthData->mBuffer, 0, pSynthData->mBufferSize);
result = pSynthData->mNativeSynthInterface->synthesizeText(textNativeString, result = pSynthData->mNativeSynthInterface->synthesizeText(textNativeString,
pSynthData->mBuffer, pSynthData->mBufferSize, (void *)pForAfter); pSynthData->mBuffer, pSynthData->mBufferSize, (void *)pForAfter);
env->ReleaseStringUTFChars(textJavaString, textNativeString); env->ReleaseStringUTFChars(textJavaString, textNativeString);
@ -575,12 +580,12 @@ android_tts_SynthProxy_stop(JNIEnv *env, jobject thiz, jint jniData)
SynthProxyJniStorage* pSynthData = (SynthProxyJniStorage*)jniData; SynthProxyJniStorage* pSynthData = (SynthProxyJniStorage*)jniData;
if (pSynthData->mNativeSynthInterface) {
result = pSynthData->mNativeSynthInterface->stop();
}
if (pSynthData->mAudioOut) { if (pSynthData->mAudioOut) {
pSynthData->mAudioOut->stop(); pSynthData->mAudioOut->stop();
} }
if (pSynthData->mNativeSynthInterface) {
result = pSynthData->mNativeSynthInterface->stop();
}
return result; return result;
} }