74 Commits

Author SHA1 Message Date
Charles Chen
1a2712ce2a Fix for bug 2564771 - pitch setting between apps can
interfere with one another.

Root cause was not caching all the params that were needed.
This change fixes that bug as well as related bugs for remembering
the default engine and for making sure that the right engine is
loaded when checking for language availability.

Change-Id: I2a76da8faec8112036e68d27539db444c53a1509
2010-04-01 17:39:15 -07:00
Charles Chen
42229259a6 Fix for bug 2548048 - it was impossible for applications to discover
if their TTS settings were being overridden by the user or not.

Change-Id: I28856a1b79c9455435671d13ed614a1ccb4e95ea
2010-03-29 18:35:30 -07:00
Charles Chen
def7185cf1 Cherry-picking this fix into Froyo.
This fix is part of addressing bug #2548048

Making it possible to determine which TTS engine is currently set
as the default by the user.

Change-Id: Ifa422f43a33498b94d96811078c0794d64668357
2010-03-26 16:14:10 -07:00
Jean-Michel Trivi
54a3dcdbef Fix bug where the setConfig method in SynthProxy has the wrong
signature.

Change-Id: If04b9a1d6de6384d7f53efac4e60f1cd4d659625
2010-03-18 14:50:06 -07:00
Jean-Michel Trivi
900e0d0954 Update TTS plugin interface to receive engine configuration data
coming from the plugin helper code (handling config and preferences).

Change-Id: Ibc1d229463f11f8977552d74d1fd2aa6a6cab88e
2010-03-18 11:52:41 -07:00
Charles Chen
726a40bc50 Enabling plugin engines to pass in their engine specific settings
via a ContentProvider to the TtsService so that the TtsService can
invoke their .so file with those settings.

Change-Id: Icd0e966971c36ebb4da191a50cda96d6f4525df5
2010-03-17 23:47:07 -07:00
Jean-Michel Trivi
76dd788a6e Support plugin parameter updates for TTS plugin settings.
Change-Id: Ia18a15b260a5eccb9ac55a8d526832c015224bca
2010-03-17 22:08:26 -07:00
Charles Chen
dd5b4e2150 Added a check to TtsService to make sure that the engine is enabled
before using it; if the engine is not enabled, TtsService will fall
back to using the default system engine.

Change-Id: I401f9c19cc1351c0ae6daf2b11069e5036febc51
2010-03-17 19:15:41 -07:00
Jean-Michel Trivi
1105f0f273 Revert TTS output filter tuning after reverting the Pico 1.1.0.2
energy distribution change in an attempt to fix bug 2449814.

Change-Id: I144649f599e066e7ec85c05f6b2a5fdda64ec7b5
2010-03-15 15:37:51 -07:00
Jean-Michel Trivi
f4743a869d Merge "Fix bug 2481825 When TTS is synthesizing to a file, return an error if the file cannot be created." 2010-03-09 10:31:30 -08:00
Jean-Michel Trivi
b21651c10c Fix bug 2481825
When TTS is synthesizing to a file, return an error if the file
cannot be created.
2010-03-08 16:45:00 -08:00
Jean-Michel Trivi
c6120193ef Fix typo in log message in TTS SynthProxy.
Change-Id: Ica7dbf6cb3db2e07958fadad476571b91bde2c24
2010-03-07 14:29:58 -08:00
Jean-Michel Trivi
796325b619 Fix bug 2449814
Reduced the amount of filtering and amplification at the output
 of the Pico TTS engine v1.1.0.2

Change-Id: I89f577b5e94e171b4ed892faffb863f19428cc1a
2010-03-07 14:02:31 -08:00
Charles Chen
6a8b73be57 Fixing a bug with TTS that caused TTS to ignore the default settings
unless the user had set the defaults to always override app settings.
2010-03-01 18:52:41 -08:00
Charles Chen
9b7cb792d0 Setting the synth busy flag inside a synchronized block for
thread safety.
2010-02-10 19:46:48 -08:00
Charles Chen
44afb7be73 Fixing a race condition in the TextToSpeech service that could be
triggered if many long utterances are started and interrupted in
rapid succession.
2010-02-08 14:11:45 -08:00
Charles Chen
f5c87b386c Fixing a bug with the TextToSpeech speech queue processing.
The queue processor should not be called for the next item
until synthesis has actually happened for the current item;
before it was being incorrectly called regardless of
whether or not the synthesizer had processed the current item.
2010-02-05 17:13:59 -08:00
Jean-Michel Trivi
0320f8bdfb Apply EQ on the output of the speech synthesis only when using the Pico
TTS engine.
2010-01-11 14:16:28 -08:00
Charles Chen
60dd360640 Enabling multiple apps to use different speech synthesis engines and not
interfere with one another.
2010-01-08 15:06:57 -08:00
Charles Chen
f524115e10 am 014085a8: am 4bc95d19: Merge change Iab089078 into eclair-mr2
Merge commit '014085a8727d7e10a4d39cba4a6d27826b66bc00'

* commit '014085a8727d7e10a4d39cba4a6d27826b66bc00':
  Fix for a race condition that can occur if an utterance
2009-12-29 20:11:10 -08:00
Charles Chen
ab089078b1 Fix for a race condition that can occur if an utterance
is stopped right when it completes.
2009-12-11 13:54:11 -08:00
Charles Chen
b4fbe768f8 Adding the ability to specify the speech synthesis
engine to use for text-to-speech.
2009-11-19 12:02:55 -08:00
Charles Chen
998207c821 Adding support for plugins. 2009-10-20 11:11:22 -07:00
Jean-Michel Trivi
b009418048 Clean TTS logs: use a common TAG in the TTS service, don't show
an error when loading the native synth lib.
2009-08-31 14:46:18 -07:00
Jean-Michel Trivi
09f8db7ad3 Add a synchronous stop method to TTS synth engine so that upon its destruction,
if it was synthesing to a file, the latter can be deleted without
still being written to.
Clear the hashmap of SpeechItem to be stopped (mKillList) when the speech
queue is empty.
2009-08-31 11:39:20 -07:00
Jean-Michel Trivi
ab6ed2c2b9 Launch synthesis thread at max priority to prevent hicups in playback.
Return and log an error when an operation cannot be completed because
the speech queue is locked longer than the timeout period.
Log cleanup.
2009-08-28 09:25:11 -07:00
Jean-Michel Trivi
a3046b6f7f Implement clean killing of the TTS service.
If files were being synthesized to while the service was being killed,
it would have left partially written files (with no header). This CL
checks if the service is rendering to a file at the time the service
is destroyed: if it is, it will stop the rendering and deletes the file.
2009-08-26 17:06:52 -07:00
Jean-Michel Trivi
69e67a3e2e Fix bug 2043140.
A race condition is encountered when an application invokes shutdown()
on its TextToSpeech object while is has speak() requests still running.
Since the TTS service destructor releases the synthesizer resources and
sets the corresponding synth reference to null, an NPE was observed.
The fix consists in catching NPEs whenever the sNativeSynth object is
accessed, and return the matching error for the call.
This change is a "low risk" version of the fix for bug 2025765i (same
issue) which was reverted because it was higher risk than this CL:
it affected the logic of each call to sNativeSynth. This CL only sets
an error code when an NPE is fired because sNativeSynth is null.
2009-08-11 15:09:45 -07:00
Jean-Michel Trivi
fbe89ec640 Revert "Fix bug 2025765."
This reverts commit 9ebb59b8aa75cab1e5bb53983893b579abb63edd.
2009-08-04 09:23:18 -07:00
Jean-Michel Trivi
9ebb59b8aa Fix bug 2025765.
Talkback produced a null pointer exception when being enabled and disabled
repeatedly due to a race condition between the onDestroy() of the service,
and the use of the service itself. The error occurs when one Talkback
thread initiates the destruction of the service (call to onDestroy()) when
it invokes shutdown() on its TextToSpeech instance (the client of the
service). At the same time, Talkback tries to say that "Accessibility" is
unchecked from another thread. During onDestroy(), the reference to the
TTS engine (sNativeSynth) is reset to null, which is used in the service
in speakInternalOnly(), and setLanguage().
The fix consists in the addition of a static variable that signals that
the service has entered onDestroy(). Once this flag is set, all method
invocations on sNativeSynth will be dismissed. Note that access to the
native resources used by sNativeSynth are synchronized at the native
layer, therefore preventing sNativeSynth.shutdown() to interfere with
a sNativeSynth.speak() call already underway.
2009-08-03 11:07:46 -07:00
Jean-Michel Trivi
ed06578edd Fix bug 2017664
Removed the TTS_ prefix in the TextToSpeech class to follow the standard naming convention.
Moved the TTS-related intents from the Intent class to TextToSpeech and TextToSpeech.Engine.
Renamed the TextToSpeech.Engine constants that are used as extras for the
  ACTION_TTS_CHECK_TTS_DATA intent to prefix them with EXTRA_.
Cleaned up the other TextToSpeech.Engine constant to remove superfluous mentions of
  "TTS" in the name.
2009-07-29 11:26:10 -07:00
Charles Chen
0dbc6a44bb Fixing bug #2008185 - problem with the TTS dropping
utterances under heavy load was caused by the speech
queue being locked. Switched to using a timeout with
tryLock so that the TTS service does not give up
immediately.
2009-07-27 14:09:58 -07:00
Jean-Michel Trivi
cee3bd4d68 Reset the speech synth singleton to null when the service is destroyed
so it can be recreated when the service is initialized.
In the interface with the native synthesizer library, close the lib
in the finalizer, delete the global ref to the SynthProxy java object.
2009-07-21 14:22:25 -07:00
Jean-Michel Trivi
a73d5cd055 Make sure the speech synthesizer proxy is a singleton in the TTS service. 2009-07-21 10:13:41 -07:00
Jean-Michel Trivi
5e11a6ad00 Prevent the setLanguage() method in TextToSpeech to change the language
for all current TextToSpeech instances by only caching the language
value so it is used with each subsequent utterance for this instance.
Synchronize calls to the engine around a global mutex since the engine
isn't thread-safe, except for the stop() call which is meant to interrupt
the synthesis loop.
2009-07-20 16:07:57 -07:00
Android (Google) Code Review
4b897aa99b Merge change 7829 into donut
* changes:
  Making sure that there are no calls made to the native TTS layer if the utterance is in the process of being canceled.
2009-07-17 21:39:26 -07:00
Charles Chen
b79370aad7 Making sure that there are no calls made to the native TTS
layer if the utterance is in the process of being canceled.
2009-07-17 20:57:21 -07:00
Jean-Michel Trivi
8b86da899a Remove obsolete playBuffer() method from the text-to-speech SynthProxy class. 2009-07-17 18:22:15 -07:00
Charles Chen
c231fd0fe7 Fixing a race condition that causes synthesis to not be aborted
even if stop is called.
2009-07-16 11:29:34 -07:00
Charles Chen
6f624239dc Fixing a bug in how stop works - keep stop from always stopping
the currently speaking item if that item does not belong to the
app that is trying to do the stop.

Also adds back the functionality of globally stopping speech that
was lost when utterance IDs were added (needed by screen reader).
2009-07-14 19:30:29 -07:00
Charles Chen
edb4fc3076 Cleaning up TtsService 2009-07-14 10:54:36 -07:00
Charles Chen
3ab2076d65 Implementing utterance ID callbacks for silence and pre-recorded files
(both generating and playing).
2009-07-13 21:21:01 -07:00
Charles Chen
78c9d0d2c5 Adding Utterance ID to the TtsService. 2009-07-13 17:46:19 -07:00
Jean-Michel Trivi
9440bce855 Propagate optional audio stream type to the creation of the audio resources
to enable the playback of TTS content on various stream types.
2009-07-13 11:34:30 -07:00
Charles Chen
630a8de44f Fixing TTS breakage. 2009-07-10 20:58:15 -07:00
Jean-Michel Trivi
d48ca22b9f Use the TTS queue constants in the TTS service as defined in the
TextToSpeech class.
2009-07-10 10:04:37 -07:00
Charles Chen
a9c5e4bf26 Adding tagging to utterances to track which app said what. 2009-07-10 09:43:03 -07:00
Charles Chen
be84e4134d Unbreaking the build. 2009-07-09 11:54:50 -07:00
Charles Chen
0a3d8744fe Adding a lock to stop so that stop will stop utterances
that are just starting up.
2009-07-09 09:51:33 -07:00
Charles Chen
b02ced7e45 Cleaning up logs.
Initializing SpeechItem.mText to "" instead of null to
prevent a null from accidentally being used when it is a
non-text utterance.
2009-07-07 14:57:16 -07:00