diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-25 17:35:59 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-25 17:35:59 -0700 |
commit | ee513b600efeb55040030a3dc9c8e7ef74b36149 (patch) | |
tree | 14109821b1fff572f40b7fb58e56989529bab3ea /packages/TtsService | |
parent | 5cb400bd72726c22f641f334951b35ce2ddcfeef (diff) | |
parent | 6c24f24b3ebce9107dfe8d7f0c5507a6d9c09f58 (diff) | |
download | frameworks_base-ee513b600efeb55040030a3dc9c8e7ef74b36149.zip frameworks_base-ee513b600efeb55040030a3dc9c8e7ef74b36149.tar.gz frameworks_base-ee513b600efeb55040030a3dc9c8e7ef74b36149.tar.bz2 |
Merge change 5444 into donut
* changes:
In the native layer for the TTS service, delete the data allocated for the callback after the signal for the end of the synthesis has been received.
Diffstat (limited to 'packages/TtsService')
-rw-r--r-- | packages/TtsService/jni/android_tts_SynthProxy.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/packages/TtsService/jni/android_tts_SynthProxy.cpp b/packages/TtsService/jni/android_tts_SynthProxy.cpp index 0dafcc1..c356acb 100644 --- a/packages/TtsService/jni/android_tts_SynthProxy.cpp +++ b/packages/TtsService/jni/android_tts_SynthProxy.cpp @@ -204,11 +204,19 @@ static tts_callback_status ttsSynthDoneCB(void *& userdata, uint32_t rate, fwrite(wav, 1, bufferSize, pForAfter->outputFile); } } - // TODO update to call back into the SynthProxy class through the + // Future update: + // For sync points in the speech, call back into the SynthProxy class through the // javaTTSFields.synthProxyMethodPost methode to notify - // playback has completed if the synthesis is done, i.e. - // if status == TTS_SYNTH_DONE - //delete pForAfter; + // playback has completed if the synthesis is done or if a marker has been reached. + + if (status == TTS_SYNTH_DONE) { + // this struct was allocated in the original android_tts_SynthProxy_speak call, + // all processing matching this call is now done. + LOGV("Speech synthesis done."); + delete pForAfter; + pForAfter = NULL; + return TTS_CALLBACK_HALT; + } // we don't update the wav (output) parameter as we'll let the next callback // write at the same location, we've consumed the data already, but we need |