From 900e0d095442d7111e77a2f2e9467a39b164bb73 Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Thu, 18 Mar 2010 11:07:45 -0700 Subject: Update TTS plugin interface to receive engine configuration data coming from the plugin helper code (handling config and preferences). Change-Id: Ibc1d229463f11f8977552d74d1fd2aa6a6cab88e --- packages/TtsService/jni/android_tts_SynthProxy.cpp | 35 ++++++++++++++++++++-- .../TtsService/src/android/tts/SynthProxy.java | 11 ++++--- 2 files changed, 39 insertions(+), 7 deletions(-) (limited to 'packages/TtsService') diff --git a/packages/TtsService/jni/android_tts_SynthProxy.cpp b/packages/TtsService/jni/android_tts_SynthProxy.cpp index b7acd96..1d69361 100644 --- a/packages/TtsService/jni/android_tts_SynthProxy.cpp +++ b/packages/TtsService/jni/android_tts_SynthProxy.cpp @@ -383,7 +383,7 @@ android_tts_SynthProxy_setLowShelf(JNIEnv *env, jobject thiz, jboolean applyFilt // ---------------------------------------------------------------------------- static int android_tts_SynthProxy_native_setup(JNIEnv *env, jobject thiz, - jobject weak_this, jstring nativeSoLib) + jobject weak_this, jstring nativeSoLib, jstring engConfig) { int result = TTS_FAILURE; @@ -395,6 +395,7 @@ android_tts_SynthProxy_native_setup(JNIEnv *env, jobject thiz, DEFAULT_TTS_STREAM_TYPE, DEFAULT_TTS_RATE, DEFAULT_TTS_FORMAT, DEFAULT_TTS_NB_CHANNELS); const char *nativeSoLibNativeString = env->GetStringUTFChars(nativeSoLib, 0); + const char *engConfigString = env->GetStringUTFChars(engConfig, 0); void *engine_lib_handle = dlopen(nativeSoLibNativeString, RTLD_NOW | RTLD_LOCAL); @@ -409,7 +410,7 @@ android_tts_SynthProxy_native_setup(JNIEnv *env, jobject thiz, if (pJniStorage->mNativeSynthInterface) { Mutex::Autolock l(engineMutex); - pJniStorage->mNativeSynthInterface->init(ttsSynthDoneCB); + pJniStorage->mNativeSynthInterface->init(ttsSynthDoneCB, engConfigString); } result = TTS_SUCCESS; @@ -422,6 +423,7 @@ android_tts_SynthProxy_native_setup(JNIEnv *env, jobject thiz, env->SetIntField(thiz, javaTTSFields.synthProxyFieldJniData, (int)pJniStorage); env->ReleaseStringUTFChars(nativeSoLib, nativeSoLibNativeString); + env->ReleaseStringUTFChars(engConfig, engConfigString); return result; } @@ -482,6 +484,29 @@ android_tts_SynthProxy_isLanguageAvailable(JNIEnv *env, jobject thiz, jint jniDa return result; } +static int +android_tts_SynthProxy_setConfig(JNIEnv *env, jobject thiz, jint jniData, jstring engineConfig) +{ + int result = TTS_FAILURE; + + if (jniData == 0) { + LOGE("android_tts_SynthProxy_setConfig(): invalid JNI data"); + return result; + } + + Mutex::Autolock l(engineMutex); + + SynthProxyJniStorage* pSynthData = (SynthProxyJniStorage*)jniData; + const char *engineConfigNativeString = env->GetStringUTFChars(engineConfig, 0); + + if (pSynthData->mNativeSynthInterface) { + result = pSynthData->mNativeSynthInterface->setProperty(ANDROID_TTS_ENGINE_PROPERTY_CONFIG, + engineConfigNativeString, strlen(engineConfigNativeString)); + } + env->ReleaseStringUTFChars(engineConfig, engineConfigNativeString); + + return result; +} static int android_tts_SynthProxy_setLanguage(JNIEnv *env, jobject thiz, jint jniData, @@ -867,6 +892,10 @@ static JNINativeMethod gMethods[] = { "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)I", (void*)android_tts_SynthProxy_isLanguageAvailable }, + { "native_setConfig", + "(ILjava/lang/String;)I", + (void*)android_tts_SynthProxy_setConfig + }, { "native_setLanguage", "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)I", (void*)android_tts_SynthProxy_setLanguage @@ -896,7 +925,7 @@ static JNINativeMethod gMethods[] = { (void*)android_tts_SynthProxy_shutdown }, { "native_setup", - "(Ljava/lang/Object;Ljava/lang/String;)I", + "(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;)I", (void*)android_tts_SynthProxy_native_setup }, { "native_setLowShelf", diff --git a/packages/TtsService/src/android/tts/SynthProxy.java b/packages/TtsService/src/android/tts/SynthProxy.java index 5f283e1..2a0bbeb 100755 --- a/packages/TtsService/src/android/tts/SynthProxy.java +++ b/packages/TtsService/src/android/tts/SynthProxy.java @@ -51,7 +51,7 @@ public class SynthProxy { public SynthProxy(String nativeSoLib, String engineConfig) { boolean applyFilter = nativeSoLib.toLowerCase().contains("pico"); Log.v(TtsService.SERVICE_TAG, "About to load "+ nativeSoLib + ", applyFilter="+applyFilter); - native_setup(new WeakReference(this), nativeSoLib); + native_setup(new WeakReference(this), nativeSoLib, engineConfig); native_setLowShelf(applyFilter, PICO_FILTER_GAIN, PICO_FILTER_LOWSHELF_ATTENUATION, PICO_FILTER_TRANSITION_FREQ, PICO_FILTER_SHELF_SLOPE); } @@ -105,10 +105,10 @@ public class SynthProxy { } /** - * Sets the engine configuration. + * Updates the engine configuration. */ public int setConfig(String engineConfig) { - return android.speech.tts.TextToSpeech.SUCCESS; + return native_setConfig(engineConfig); } /** @@ -180,7 +180,8 @@ public class SynthProxy { */ private int mJniData = 0; - private native final int native_setup(Object weak_this, String nativeSoLib); + private native final int native_setup(Object weak_this, String nativeSoLib, + String engineConfig); private native final int native_setLowShelf(boolean applyFilter, float filterGain, float attenuationInDb, float freqInHz, float slope); @@ -204,6 +205,8 @@ public class SynthProxy { private native final int native_loadLanguage(int jniData, String language, String country, String variant); + private native final int native_setConfig(String engineConfig); + private native final int native_setSpeechRate(int jniData, int speechRate); private native final int native_setPitch(int jniData, int speechRate); -- cgit v1.1