Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd9aa793 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 5593 into donut 

* changes:
  Add in TTS engine interface the methods to query the availability for a language, to set the synthesis audio format, to query the current language, country and variant setting.
parents c25dbf88 287148b8

include/tts/TtsEngine.h

+20 −10
Original line number Original line Diff line number Diff line
@@ -133,16 +133,26 @@ public: 
    // @return TTS_SUCCESS, or TTS_FAILURE

    // @return TTS_SUCCESS, or TTS_FAILURE

    virtual tts_result setLanguage(const char *lang, const char *country, const char *variant);

    virtual tts_result setLanguage(const char *lang, const char *country, const char *variant);





    // Retrieve the currently set language, or an empty "value" if no language

    // Retrieve the currently set language, country and variant, or empty strings if none of

    // has been set.

    // parameters have been set. Language and country are represented by their 3-letter ISO code

    // @param[out]   value pointer to the retrieved language value

    // @param[out]   pointer to the retrieved 3-letter code language value

    // @param[inout] iosize in: stores the size available to store the language

    // @param[out]   pointer to the retrieved 3-letter code country value

    //                         value in *value

    // @param[out]   pointer to the retrieved variant value

    //                      out: stores the size required to hold the language

    // @return TTS_SUCCESS, or TTS_FAILURE

    //                         value if  getLanguage() returned

    virtual tts_result getLanguage(char *language, char *country, char *variant);

    //                         TTS_PROPERTY_SIZE_TOO_SMALL, unchanged otherwise.



    // @return TTS_SUCCESS, or TTS_PROPERTY_SIZE_TOO_SMALL, or TTS_FAILURE

    // Notifies the engine what audio parameters should be used for the synthesis.

    virtual tts_result getLanguage(char *value, size_t *iosize);

    // This is meant to be used as a hint, the engine implementation will set the output values

    // to those of the synthesis format, based on a given hint.

    // @param[inout] encoding in: the desired audio sample format

    //                         out: the format used by the TTS engine

    // @param[inout] rate in: the desired audio sample rate

    //                         out: the sample rate used by the TTS engine

    // @param[inout] channels in: the desired number of audio channels

    //                         out: the number of channels used by the TTS engine

    // @return TTS_SUCCESS, or TTS_FAILURE

    virtual tts_result setAudioFormat(AudioSystem::audio_format& encoding, uint32_t& rate,

            int& channels);





    // Set a property for the the TTS engine

    // Set a property for the the TTS engine

    // "size" is the maximum size of "value" for properties "property"

    // "size" is the maximum size of "value" for properties "property"

packages/TtsService/jni/android_tts_SynthProxy.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -547,7 +547,8 @@ android_tts_SynthProxy_getLanguage(JNIEnv *env, jobject thiz, jint jniData) 
    memset(buf, 0, bufSize);

    memset(buf, 0, bufSize);

    // TODO check return codes

    // TODO check return codes

    if (pSynthData->mNativeSynthInterface) {

    if (pSynthData->mNativeSynthInterface) {

        pSynthData->mNativeSynthInterface->getLanguage(buf, &bufSize);

        // TODO use the correct getLanguage()

        //pSynthData->mNativeSynthInterface->getLanguage(buf, &bufSize);

    }

    }

    return env->NewStringUTF(buf);

    return env->NewStringUTF(buf);

}

}