Optimization: use compiled regular expressions in normalization

Do most regex matches via compiled regular expressions to stay reliably under 100ms for the normalization phase (on a Pixel 6 phone) Additionally: small optimizations and Logging level changes Signed-off-by: Daniel Schnell <[email protected]>
grammatek · Feb 3, 2024 · b7759d3 · b7759d3
1 parent 0c54f82
commit b7759d3
Show file tree

Hide file tree

Showing 8 changed files with 539 additions and 470 deletions.
diff --git a/app/src/main/java/com/grammatek/simaromur/TTSManager.java b/app/src/main/java/com/grammatek/simaromur/TTSManager.java
@@ -68,7 +68,7 @@ public void onCreate(Bundle savedInstanceState) {
      */
     @Override
     public void onInit(final int status) {
-        Log.v(LOG_TAG, "onInit: status: " + status);
+        Log.i(LOG_TAG, "onInit: status: " + status);
         if (status == TextToSpeech.SUCCESS) {
             mTtsClient.setLanguage(new Locale("isl", "ISL"));
         }

diff --git a/app/src/main/java/com/grammatek/simaromur/TTSService.java b/app/src/main/java/com/grammatek/simaromur/TTSService.java
@@ -49,6 +49,7 @@ public void onCreate() {
         // This calls onIsLanguageAvailable() and must run after Initialization
         super.onCreate();
         applyCachePolicy();
+        Log.i(LOG_TAG, "onCreate() finished");
     }
 
     private void applyCachePolicy() {
@@ -65,23 +66,23 @@ private void applyCachePolicy() {
     // mandatory
     @Override
     protected int onIsLanguageAvailable(String language, String country, String variant) {
-        Log.v(LOG_TAG, "onIsLanguageAvailable("+language+","+country+","+variant+")");
+        Log.i(LOG_TAG, "onIsLanguageAvailable("+language+","+country+","+variant+")");
         if (variant.endsWith(ApiDbUtil.NET_VOICE_SUFFIX)) {
             if (!ConnectionCheck.isTTSServiceReachable()) {
                 Log.v(LOG_TAG, "onIsLanguageAvailable: TTS API NOT reachable");
                 return TextToSpeech.LANG_MISSING_DATA;
             }
         }
         int rv = mRepository.isLanguageAvailable(language, country, variant);
-        Log.v(LOG_TAG, "onIsLanguageAvailable("+language+","+country+","+variant+"): " + rv);
+        Log.i(LOG_TAG, "onIsLanguageAvailable("+language+","+country+","+variant+"): " + rv);
         return rv;
     }
 
     // @todo: seems to be deprecated, but still it's mandatory to implement it ...
     @Override
     protected String[] onGetLanguage() {
         // @todo: return currently set language as selected from the settings menu
-        Log.e(LOG_TAG, "onGetLanguage()");
+        Log.i(LOG_TAG, "onGetLanguage()");
         return new String[] {"isl", "ISL", ""};
     }
 
@@ -141,7 +142,7 @@ protected void onSynthesizeText(SynthesisRequest request,
         } catch (Exception ex) {
             ex.printStackTrace();
         }
-        Log.v(LOG_TAG, "onSynthesizeText: " + text);
+        Log.i(LOG_TAG, "onSynthesizeText: " + text);
         Log.v(LOG_TAG, "onSynthesizeText: (" + language + "/" + country + "/" + variant
                 + "), callerUid: " + callerUid + " speed: " + speechrate + " pitch: " + pitch
                 + " bundle: " + params);
@@ -181,9 +182,9 @@ protected void onSynthesizeText(SynthesisRequest request,
             return;
         }
         if (text.isEmpty()) {
-            Log.i(LOG_TAG, "onSynthesizeText: End of TTS session");
-            playSilence(callback);
+            //playSilence(callback);
             mShouldPlayNetworkError = true;
+            Log.i(LOG_TAG, "onSynthesizeText: End of TTS session");
             return;
         }
         // if cache item for text already exists: retrieve it, otherwise create a new cache
@@ -228,7 +229,7 @@ protected void onSynthesizeText(SynthesisRequest request,
                 break;
         }
         handleProcessingResult(callback, item, ttsRequest, voice);
-        Log.v(LOG_TAG, "onSynthesizeText: finished (" + item.getUuid() + ")");
+        Log.i(LOG_TAG, "onSynthesizeText: finished (" + item.getUuid() + ")");
     }
 
     /**
@@ -475,6 +476,7 @@ private void playSilence(SynthesisCallback callback) {
         if (! callback.hasFinished() && callback.hasStarted()) {
             callback.done();
         }
+        Log.v(LOG_TAG, "playSilence() finished");
     }
 
     @Override
@@ -518,8 +520,8 @@ public List<Voice> onGetVoices()
             Voice ttsVoice = new Voice(voice.name, voice.getLocale(), quality, latency,
                     needsNetwork, features);
             announcedVoiceList.add(ttsVoice);
-            Log.v(LOG_TAG, "onGetVoices: " + ttsVoice);
         }
+        Log.i(LOG_TAG, "onGetVoices: " + announcedVoiceList);
         return announcedVoiceList;
     }
 
@@ -529,7 +531,7 @@ public int onIsValidVoiceName(String name)
         Log.i(LOG_TAG, "onIsValidVoiceName("+name+")");
         for (final com.grammatek.simaromur.db.Voice voice : mRepository.getCachedVoices()) {
             if (voice.name.equals(name)) {
-                Log.v(LOG_TAG, "voice name is valid");
+                Log.i(LOG_TAG, "onIsValidVoiceName: successful");
                 return TextToSpeech.SUCCESS;
             }
         }
@@ -550,7 +552,7 @@ public int onLoadVoice(String name)
         Log.i(LOG_TAG, "onLoadVoice("+name+")");
         if (onIsValidVoiceName(name) == TextToSpeech.SUCCESS) {
             if (TextToSpeech.SUCCESS == mRepository.loadVoice(name)) {
-                Log.v(LOG_TAG, "voice loading successful");
+                Log.i(LOG_TAG, "onLoadVoice successful");
                 return TextToSpeech.SUCCESS;
             }
         }

diff --git a/app/src/main/java/com/grammatek/simaromur/db/TimestampConverter.java b/app/src/main/java/com/grammatek/simaromur/db/TimestampConverter.java
@@ -24,7 +24,7 @@ public static Date fromTimestampString(String value) {
             try {
                 return df.parse(value);
             } catch (Exception e) {
-                e.printStackTrace();
+                // e.printStackTrace();
             }
         }
         // return current date, in case no valid date string has been provided

diff --git a/app/src/main/java/com/grammatek/simaromur/device/TTSEngineOnnx.java b/app/src/main/java/com/grammatek/simaromur/device/TTSEngineOnnx.java
@@ -277,6 +277,9 @@ public long[] convertToPhonemeIds(String ipaString) {
 
                 // add phoneme ids
                 for (String phoneme : phonemeList) {
+                    if (phoneme.isEmpty()) {
+                        continue;
+                    }
                     addPhonemeIdToList(phoneme, phonemeIdList);
                 }
                 if (!space_removed && !token.matches(PunctuationSymbols)) {