summaryrefslogtreecommitdiffstats
path: root/pico
Commit message (Collapse)AuthorAgeFilesLines
* PicoTTS: Set mNativeSynth prior to TextToSpeechService#onCreateHEADreplicant-4.2-0004replicant-4.2Jorge Ruesga2012-12-211-1/+7
| | | | | | | | | | The variable mNativeSynth is used by TextToSpeechService#onCreate so it must be set prior to that call. Otherwise, the method TextToSpeech#onIsLanguageAvailable will return TextToSpeech.ERROR because the synthesizer is not ready. AOSP Change: https://android-review.googlesource.com/#/c/42781 Change-Id: I86fbfa7d928e5206b8fe88ec209f6a54fee4ffa0
* use LOCAL_PATH properlyJoe Onorato2012-07-214-125/+110
| | | | Change-Id: I5a177116b976be159042cab51c297861f275daa2
* am 3c5c83b8: Merge "Restore initialisation of vec38"Andrew Hsieh2012-05-121-0/+1
|\ | | | | | | | | * commit '3c5c83b8cf83ebbdf1103656036f3931b3c69f25': Restore initialisation of vec38
| * Restore initialisation of vec38Chris Dearman2012-01-311-0/+1
| | | | | | | | | | | | It was removed by both a3a82fd2d5be286128ade9007b1861da1d6d0a59 e0faec180004afb9a68ffe7dffce591f0dec305f
* | Add libmedia_nativeGlenn Kasten2012-03-162-1/+3
| | | | | | | | Change-Id: I0a3dcd2f6e983b09e93eabb529b56c3de5a9c0f7
* | Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE"Steve Block2012-01-093-103/+103
|\ \
| * | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-063-103/+103
| | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: I24cb51849561ed5ebe3d8f87bd62deb034b86244
* | | Merge "Fix onLoadLanguage, should actually load the language."Narayan Kamath2012-01-091-1/+4
|\ \ \ | |/ / |/| |
| * | Fix onLoadLanguage, should actually load the language.Narayan Kamath2012-01-061-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Would still work earlier because onSynthesizeText would load the right language, but getLanguage() would return the wrong language. Change-Id: Ic0e65ca3725aa1c06bf6eed88eaf823671477932
* | | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-042-9/+9
|/ / | | | | | | | | | | | | See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: I2de8398913d131042541e344c3f8fa6db44f37aa
* | Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGESteve Block2011-10-251-5/+5
|/ | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: Ia9892afbd743662a2272882bcdda7f23ae9d3b6d
* Remove the simulator target from all makefiles.Jeff Brown2011-07-112-11/+1
| | | | | | Bug: 5010576 Change-Id: Ia539a6a831a7d500d0c5336438e0bc0ff5854bf0
* Merge "Fix a pico bug."Narayan Kamath2011-06-281-2/+1
|\
| * Fix a pico bug.Narayan Kamath2011-06-271-2/+1
| | | | | | | | | | | | | | | | | | | | | | This is one of 10 million errors (really) reported by valgrind. I verified that some of them are OK, but it's probably not worth going through the rest. I expect most of those are just optimized code and fancy bit trickery. Change-Id: I3b8675ec8267691a5e6127a8e03239547107053e
* | Use the new settings API for pico.Narayan Kamath2011-06-272-0/+18
|/ | | | Change-Id: I852d0619d0f5bcb7218d3ab266ae86d117bc95e7
* libttspico should be optional, installed only when PicoTts is.Narayan Kamath2011-06-211-1/+3
| | | | Change-Id: I6b5b81dc2c18d8a2b96074080304bfbdbc479fdc
* Update pico to use the new TTS API.Narayan Kamath2011-06-083-12/+14
| | | | Change-Id: Ied389be15bfcd1a1c3ed289a0b1d6c7f7913629a
* Fix TTS breakageNarayan Kamath2011-05-231-2/+0
| | | | | bug:4476001 Change-Id: I14f4c5d803fc95bcaf11bc3ac182df4133083281
* Minor makefile refactoring.Narayan Kamath2011-05-191-4/+26
| | | | | | | | This allows folks to depend on libttspico_static and just call getTtsEngine() directly instead of all the dlopen() dlsym() business. Change-Id: I7b5b6c94d08b95ade9ba9c995e4bd2a862acdfb6
* Break dependency between pico and the audio system.Narayan Kamath2011-05-194-13/+28
| | | | | | | | | The TTS engine should use only TTS defined constants, and not constants from the audiosystem. This happened to work because PCM_16_BIT in native was the same as DEFAULT in java, which happened to be PCM_16_BIT. Change-Id: I0f43a46afff8c45d1eb18c1beaab62dce87b8055
* update for new audio.h header locationDima Zavin2011-05-111-1/+1
| | | | | Change-Id: I3bf2e6b3a0434f525dc1994f080f027482142ffd Signed-off-by: Dima Zavin <dima@android.com>
* svox: convert to use new audio.hDima Zavin2011-04-192-7/+8
| | | | | Change-Id: Id8e69601a0812a6a0034774adde672bb70662c6a Signed-off-by: Dima Zavin <dima@android.com>
* Clean JNI data pointer in shutdown()Bjorn Bringert2011-04-191-1/+2
| | | | | | | | Before, finalize() after shutdown() could segfault since shutdown() kept the pointer to the deleted SynthProxyJniStorage. Change-Id: I338c19758733425be2e3b0d9e66176d11d27e8f6
* Use new SynthesisRequest.error()Bjorn Bringert2011-04-191-6/+15
| | | | Change-Id: Ia634e6c84870ad6c2d1665da796adcd9cdc4ec8f
* Add external storage perm to PicoBjorn Bringert2011-04-181-1/+2
| | | | | | | | | | The TTS engine now needs to have its own permissions set, since it is running in its own process. Also removes the minSdkVersion=2 to let the build system set it automatically. Change-Id: I7aea73ee5a415179f9b8b44e8f73c024b93f8983
* Add DEFAULT category to Pico TTS serviceBjorn Bringert2011-04-181-0/+1
| | | | Change-Id: I4d94d41d3e5e9d9bd2b266ac4637c065ef13810a
* Port Pico to new TTS engine APIBjorn Bringert2011-04-1511-3/+1679
| | | | | | | | | | | | | | | | | | Requires TTS engine API added in change I7614ff788e11f897e87052f684f1b4938d539fb7 The compatibility layer in pico/compat/src/com/android/tts/compat/SynthProxy.java pico/compat/jni/com_android_tts_compat_SynthProxy.cpp is based on these files removed from the old TTS engine framework: frameworks/base/packages/TtsService/src/android/tts/SynthProxy.java frameworks/base/packages/TtsService/jni/android_tts_SynthProxy.cpp Bug: 4150618 Change-Id: I7a2cca6b5cfbac6158a87fad69cc796140adb2f3
* external/svox: remove LOCAL_PRELINK_MODULEIliyan Malchev2011-03-141-1/+1
| | | | | Change-Id: I987cf0645cd1281e499426a29c82bdebd74f733b Signed-off-by: Iliyan Malchev <malchev@google.com>
* am baadee21: am 97a3fdf7: Merge "Remove duplicate item to avoid compiling error"David Turner2011-01-311-1/+0
|\ | | | | | | | | * commit 'baadee213d3350ab18fbd0c22a3ac3a65a853a4c': Remove duplicate item to avoid compiling error
| * Remove duplicate item to avoid compiling errorChih-Wei Huang2010-12-181-1/+0
| | | | | | | | | | | | | | | | | | The gcc 4.5 complains about the duplicate item: external/svox/pico/lib/picosig2.c: In function 'sigAllocate': external/svox/pico/lib/picosig2.c:75:26: error: operation on 'sig_inObj->int_vec38' may be undefined Change-Id: I4532b770ff02e058253ed01cbed50b0efb8a83ce
* | Don't log an error when SSML has no language.Jean-Michel Trivi2011-01-051-1/+1
| | | | | | | | Change-Id: I3ce4ce7c121f3f72b242a0edf33b5f6f16e7fdac
* | Fix bug 2782425 Use the current language if it matches that of the documentJean-Michel Trivi2011-01-041-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | If an utterance specifies its locale, the checkForLocale() function looks for the index of the supported language that matches it. If the exact locale is not supported, we look for language-only support. But there could already be a match with the currently loaded language. The fix consists in comparing the requested language with the one that is loaded (if any), so we don't load a new one uselessly, AND so the default language is used if it matches. Change-Id: I501d946459ea982466eb804b17e9c43a8203564a
* | Manual merge of c90f05adJean-Baptiste Queru2010-10-088-28/+36
|\ \ | |/ | | | | | | | | "Clean up makefiles for TTS data files." Change-Id: I45a8f9887159de4d051455fc3feb202c26b9b8ce
| * Clean up makefiles for TTS data files.Jean-Baptiste Queru2010-10-068-28/+36
| | | | | | | | | | | | | | | | | | | | | | | | This makes them look more like product definition files that can better fit in a product inheritance chain. Also, add a product definition file that includes all languages (amusingly, that's the only combination that's ever used). Bug: 3065214 Change-Id: I42ef6038b7bda5a045562505e4bb2308e36b09f7
* | Remove redundant initilization to get rid of gcc-4.5 warning:Jing Yu2010-05-241-1/+0
|/ | | | | | | | | | | | warning: operation on 'sig_inObj->int_vec38' may be undefined [-Wsequence-point] The source code has cyclic initilization: a = c = b = c. gcc-4.5 reports a warning that c may be undefined. The patch is simply removing the redundant "= c". Tested the patch with all gcc versions. Change-Id: I4a6e9ee22b41058a34b0a657fb60e78c4e8f3ebb
* For issue #2651381, allow library prelinking.Dan Bornstein2010-05-051-2/+0
| | | | Change-Id: I109b34edc12547c644f546c4aaabbc8536579d62
* Fix for bug 2579445 - fix to use the correct strings for the Intent extras.Charles Chen2010-04-072-7/+6
| | | | Change-Id: I26894c0029690bca05baeaee5198589242026130
* Add i18n'd strings for the Pico settings screen.Jean-Michel Trivi2010-03-1921-1/+460
| | | | Change-Id: I541f1721baf4dadef653268ab1bc206ad521f036
* Adding an EngineSettings screen to Pico that enables languagesCharles Chen2010-03-184-0/+135
| | | | | | to be installed individually. Change-Id: I29f98ff65a3c8c90747f635d0ad3887ab27a65d7
* Merge "Adding SettingsProvider to Pico so that the external storage path for ↵Charles Chen2010-03-182-0/+97
|\ | | | | | | the voice data is coming from Environment and is not hardcoded as /sdcard/"
| * Adding SettingsProvider to Pico so that the external storage pathCharles Chen2010-03-182-0/+97
| | | | | | | | | | | | | | for the voice data is coming from Environment and is not hardcoded as /sdcard/ Change-Id: Ic7b69b6e2839cea5a273efb85fc030a8689b6307
* | Update the Pico manager layer to use the engine configuration toJean-Michel Trivi2010-03-181-9/+24
|/ | | | | | figure out the alternative path for the lingware data. Change-Id: If83e5e55ee7a420a41747d97beb36612a0b5fa1e
* Update manager layer according to interface change to receiveJean-Michel Trivi2010-03-181-19/+1
| | | | | | engine config data and not support synthesis of IPA-only content. Change-Id: Ibf308a17fb477e72f68467508190ddd928fde6ac
* Fix bug 2449825 Patch from SVOXJean-Michel Trivi2010-03-171-13/+12
| | | | | | | | | | | | Prevent random utterances in Pico TTS when synthesizing an empty string. In same patch: Automatic volume raising tags in the Manager Layer are now removed NOTE : It is still possible to selectively raise the volume for portions of the input text, by embedding volume tags in the text itself. These tags will not be removed by the Manager Layer. Change-Id: I56fafcf6c1cff986a7394526027534308f227431
* Revert energy distribution update introduced in Pico engine 1.1.0.2Jean-Michel Trivi2010-03-141-41/+0
| | | | | | as it sounds more muffled, particularly with eng-USA Change-Id: I77c366afb1926f045ef931d0d66ce6a0bb377893
* Merge "Patch from SVOX: 1.1.0.2 Engine Release Issues fixed since 1.1.0.0: - ↵Jean-Michel Trivi2010-02-1018-72/+118
|\ | | | | | | closing tags not interpreted in some cases where enclosed text contains a smaller-then sign - Discontinuities in energy transformation - Lexicon Access: entry with empty phonetic transcription mistaken as :G2P in seldom cases"
| * Patch from SVOX: 1.1.0.2 Engine ReleaseJean-Michel Trivi2010-02-0918-72/+118
| | | | | | | | | | | | | | | | | | Issues fixed since 1.1.0.0: - closing tags not interpreted in some cases where enclosed text contains a smaller-then sign - Discontinuities in energy transformation - Lexicon Access: entry with empty phonetic transcription mistaken as :G2P in seldom cases
* | Merge "Adding support to check voice data and return lists of available and ↵Charles Chen2010-02-081-6/+57
|\ \ | | | | | | | | | unavailable voices."
| * | Adding support to check voice data and return lists ofCharles Chen2010-02-051-6/+57
| |/ | | | | | | available and unavailable voices.
* | Fix bug 2098375 patch from SVOX to correct string ending of camelCaseJean-Michel Trivi2010-02-041-5/+5
| | | | | | | | corrected strings for proper synthesis.