-
-
Notifications
You must be signed in to change notification settings - Fork 78
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #227 from Stypox/stt-service-kt
Add RecognitionService, so Dicio appears under Voice Input
- Loading branch information
Showing
7 changed files
with
193 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
139 changes: 139 additions & 0 deletions
139
app/src/main/kotlin/org/stypox/dicio/io/input/stt_service/SttService.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| package org.stypox.dicio.io.input.stt_service | ||
|
|
||
| import android.content.Intent | ||
| import android.os.Build | ||
| import android.os.Bundle | ||
| import android.os.RemoteException | ||
| import android.speech.RecognitionService | ||
| import android.speech.RecognizerIntent | ||
| import android.speech.SpeechRecognizer | ||
| import android.util.Log | ||
| import dagger.hilt.android.AndroidEntryPoint | ||
| import org.stypox.dicio.di.LocaleManager | ||
| import org.stypox.dicio.di.SttInputDeviceWrapper | ||
| import org.stypox.dicio.io.input.InputEvent | ||
| import java.util.Locale | ||
| import javax.inject.Inject | ||
|
|
||
|
|
||
| // TODO this class is really simple at the moment, but many more things could be implemented, e.g.: | ||
| // - allowing an SttInputDevice to download/support multiple languages | ||
| // - handling more EXTRAs, e.g. EXTRA_LANGUAGE, EXTRA_LANGUAGE_PREFERENCE, | ||
| // EXTRA_ONLY_RETURN_LANGUAGE_PREFERENCE, EXTRA_LANGUAGE_MODEL, LANGUAGE_MODEL_FREE_FORM, | ||
| // LANGUAGE_MODEL_WEB_SEARCH, EXTRA_SEGMENTED_SESSION, | ||
| // EXTRA_SPEECH_INPUT_COMPLETE_SILENCE_LENGTH_MILLIS, | ||
| // EXTRA_SPEECH_INPUT_POSSIBLY_COMPLETE_SILENCE_LENGTH_MILLIS, | ||
| // EXTRA_SPEECH_INPUT_MINIMUM_LENGTH_MILLIS, EXTRA_AUDIO_SOURCE, EXTRA_AUDIO_SOURCE_CHANNEL_COUNT, | ||
| // EXTRA_AUDIO_SOURCE_ENCODING, EXTRA_AUDIO_SOURCE_SAMPLING_RATE, EXTRA_BIASING_STRINGS, | ||
| // EXTRA_ENABLE_BIASING_DEVICE_CONTEXT | ||
| // - if the SttInputDevice is already busy (e.g. another service is using it, or another part of | ||
| // Dicio is using it), that needs to be reported with ERROR_BUSY | ||
| @AndroidEntryPoint | ||
| class SttService : RecognitionService() { | ||
|
|
||
| @Inject | ||
| lateinit var sttInputDevice: SttInputDeviceWrapper | ||
|
|
||
| @Inject | ||
| lateinit var localeManager: LocaleManager | ||
|
|
||
| override fun onStartListening(recognizerIntent: Intent, listener: Callback) { | ||
| val wantedLanguageExtra = recognizerIntent.getStringExtra(RecognizerIntent.EXTRA_LANGUAGE) | ||
| // "und" is "Undetermined", see https://www.loc.gov/standards/iso639-2/php/code_list.php | ||
| if (wantedLanguageExtra != null && wantedLanguageExtra != "und") { | ||
| val appLanguage = localeManager.locale.value.language | ||
| val wantedLanguage = Locale(wantedLanguageExtra).language | ||
| if (appLanguage != wantedLanguage) { | ||
| Log.e(TAG, "Unsupported language: app=$appLanguage wanted=$wantedLanguageExtra") | ||
| // From the javadoc of ERROR_LANGUAGE_UNAVAILABLE: Requested language is supported, | ||
| // but not available currently (e.g. not downloaded yet). | ||
| logRemoteExceptions { listener.error(ERROR_LANGUAGE_UNAVAILABLE) } | ||
| return | ||
| } | ||
| } | ||
|
|
||
| var beginningOfSpeech = true | ||
| val willStartListening = sttInputDevice.tryLoad { inputEvent -> | ||
| when (inputEvent) { | ||
| is InputEvent.Error -> { | ||
| logRemoteExceptions { listener.error(SpeechRecognizer.ERROR_SERVER) } | ||
| } | ||
|
|
||
| is InputEvent.Final -> { | ||
| if (beginningOfSpeech) { | ||
| logRemoteExceptions { listener.beginningOfSpeech() } | ||
| beginningOfSpeech = false | ||
| } | ||
|
|
||
| val results = Bundle() | ||
| results.putStringArrayList( | ||
| SpeechRecognizer.RESULTS_RECOGNITION, | ||
| ArrayList(inputEvent.utterances.map { it.first }) | ||
| ) | ||
| results.putFloatArray( | ||
| SpeechRecognizer.CONFIDENCE_SCORES, | ||
| inputEvent.utterances.map { it.second }.toFloatArray() | ||
| ) | ||
|
|
||
| logRemoteExceptions { listener.results(results) } | ||
| logRemoteExceptions { listener.endOfSpeech() } | ||
| } | ||
|
|
||
| InputEvent.None -> { | ||
| logRemoteExceptions { listener.error(SpeechRecognizer.ERROR_SPEECH_TIMEOUT) } | ||
| logRemoteExceptions { listener.endOfSpeech() } | ||
| } | ||
|
|
||
| is InputEvent.Partial -> { | ||
| if (beginningOfSpeech) { | ||
| logRemoteExceptions { listener.beginningOfSpeech() } | ||
| beginningOfSpeech = false | ||
| } | ||
|
|
||
| val partResult = Bundle() | ||
| partResult.putStringArrayList( | ||
| SpeechRecognizer.RESULTS_RECOGNITION, | ||
| arrayListOf(inputEvent.utterance) | ||
| ) | ||
|
|
||
| logRemoteExceptions { listener.partialResults(partResult) } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (!willStartListening) { | ||
| Log.w(TAG, "Could not start STT recognizer") | ||
| logRemoteExceptions { listener.error(ERROR_LANGUAGE_UNAVAILABLE) } | ||
| } | ||
| } | ||
|
|
||
| override fun onCancel(listener: Callback) { | ||
| sttInputDevice.stopListening() | ||
| } | ||
|
|
||
| override fun onStopListening(listener: Callback) { | ||
| sttInputDevice.stopListening() | ||
| } | ||
|
|
||
| companion object { | ||
| val TAG = SttService::class.simpleName | ||
|
|
||
| /** | ||
| * From the javadoc of [SpeechRecognizer.ERROR_LANGUAGE_UNAVAILABLE]: Requested language is | ||
| * supported, but not available currently (e.g. not downloaded yet). | ||
| */ | ||
| val ERROR_LANGUAGE_UNAVAILABLE = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { | ||
| SpeechRecognizer.ERROR_LANGUAGE_UNAVAILABLE | ||
| } else { | ||
| SpeechRecognizer.ERROR_SERVER | ||
| } | ||
|
|
||
| fun logRemoteExceptions(f: () -> Unit) { | ||
| try { | ||
| return f() | ||
| } catch (e: RemoteException) { | ||
| Log.e(TAG, "Remote exception", e) | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- TODO actually set a proper settingsActivity --> | ||
| <recognition-service | ||
| xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:settingsActivity="org.stypox.dicio.MainActivity" /> |