Calling this method means that at the given audio frame, the given range of the input is * about to be spoken. If this method is called the client will receive a callback on the - * listener ({@link UtteranceProgressListener#onUtteranceRangeStart}) at the moment that frame - * has been reached by the playback head. + * listener ({@link UtteranceProgressListener#onRangeStart}) at the moment that frame has been + * reached by the playback head. * *
The markerInFrames is a frame index into the audio for this synthesis request, i.e. into * the concatenation of the audio bytes sent to audioAvailable for this synthesis request. The diff --git a/core/java/android/speech/tts/SynthesisPlaybackQueueItem.java b/core/java/android/speech/tts/SynthesisPlaybackQueueItem.java index 491eabc910297..f52638b5a3fca 100644 --- a/core/java/android/speech/tts/SynthesisPlaybackQueueItem.java +++ b/core/java/android/speech/tts/SynthesisPlaybackQueueItem.java @@ -224,7 +224,7 @@ final class SynthesisPlaybackQueueItem extends PlaybackQueueItem return; } // Inform the client. - getDispatcher().dispatchOnUtteranceRangeStart(marker.start, marker.end); + getDispatcher().dispatchOnRangeStart(marker.start, marker.end, marker.frames); // Listen for the next marker. // It's ok if this marker is in the past, in that case onMarkerReached will be called again. updateMarker(); diff --git a/core/java/android/speech/tts/TextToSpeech.java b/core/java/android/speech/tts/TextToSpeech.java index 9a157b7c9b5df..763ea2ca3859e 100644 --- a/core/java/android/speech/tts/TextToSpeech.java +++ b/core/java/android/speech/tts/TextToSpeech.java @@ -2159,10 +2159,10 @@ public class TextToSpeech { } @Override - public void onUtteranceRangeStart(String utteranceId, int start, int end) { + public void onRangeStart(String utteranceId, int start, int end, int frame) { UtteranceProgressListener listener = mUtteranceProgressListener; if (listener != null) { - listener.onUtteranceRangeStart(utteranceId, start, end); + listener.onRangeStart(utteranceId, start, end, frame); } } }; diff --git a/core/java/android/speech/tts/TextToSpeechService.java b/core/java/android/speech/tts/TextToSpeechService.java index 08df64ff3b13d..c645f4057335a 100644 --- a/core/java/android/speech/tts/TextToSpeechService.java +++ b/core/java/android/speech/tts/TextToSpeechService.java @@ -668,7 +668,7 @@ public abstract class TextToSpeechService extends Service { void dispatchOnAudioAvailable(byte[] audio); - public void dispatchOnUtteranceRangeStart(int start, int end); + public void dispatchOnRangeStart(int start, int end, int frame); } /** Set of parameters affecting audio output. */ @@ -889,11 +889,11 @@ public abstract class TextToSpeechService extends Service { } @Override - public void dispatchOnUtteranceRangeStart(int start, int end) { + public void dispatchOnRangeStart(int start, int end, int frame) { final String utteranceId = getUtteranceId(); if (utteranceId != null) { - mCallbacks.dispatchOnUtteranceRangeStart( - getCallerIdentity(), utteranceId, start, end); + mCallbacks.dispatchOnRangeStart( + getCallerIdentity(), utteranceId, start, end, frame); } } @@ -1574,14 +1574,14 @@ public abstract class TextToSpeechService extends Service { } } - public void dispatchOnUtteranceRangeStart( - Object callerIdentity, String utteranceId, int start, int end) { + public void dispatchOnRangeStart( + Object callerIdentity, String utteranceId, int start, int end, int frame) { ITextToSpeechCallback cb = getCallbackFor(callerIdentity); if (cb == null) return; try { - cb.onUtteranceRangeStart(utteranceId, start, end); + cb.onRangeStart(utteranceId, start, end, frame); } catch (RemoteException e) { - Log.e(TAG, "Callback dispatchOnUtteranceRangeStart(String, int, int) failed: " + e); + Log.e(TAG, "Callback dispatchOnRangeStart(String, int, int, int) failed: " + e); } } diff --git a/core/java/android/speech/tts/UtteranceProgressListener.java b/core/java/android/speech/tts/UtteranceProgressListener.java index 0ee3769485388..e59ec080e2c02 100644 --- a/core/java/android/speech/tts/UtteranceProgressListener.java +++ b/core/java/android/speech/tts/UtteranceProgressListener.java @@ -135,8 +135,9 @@ public abstract class UtteranceProgressListener { * @param utteranceId Unique id identifying the synthesis request. * @param start The start index of the range in the utterance text. * @param end The end index of the range (exclusive) in the utterance text. + * @param frame The position in frames in the audio of the request where this range is spoken. */ - public void onUtteranceRangeStart(String utteranceId, int start, int end) {} + public void onRangeStart(String utteranceId, int start, int end, int frame) {} /** * Wraps an old deprecated OnUtteranceCompletedListener with a shiny new progress listener.