Update to DeepSpeech v0.6 API

app/src/main/java/com/mozilla/speechapp/MainActivity.java

@@ -230,6 +230,13 @@ public class MainActivity extends AppCompatActivity implements ISpeechRecognitio
 
     public void maybeDownloadOrExtractModel(String aModelsPath, String aLang) {
         String zipFile   = aModelsPath + "/" + aLang + ".zip";
+        String aModelPath= aModelsPath + "/" + aLang + "/";
+
+        File aModelFolder = new File(aModelPath);
+        if (!aModelFolder.exists()) {
+            aModelFolder.mkdirs();
+        }
+
         Uri modelZipURL  = Uri.parse(mMozillaSpeechService.getModelDownloadURL());
         Uri modelZipFile = Uri.parse("file://" + zipFile);
 
@@ -251,7 +258,7 @@ public class MainActivity extends AppCompatActivity implements ISpeechRecognitio
                         if (DownloadManager.STATUS_SUCCESSFUL == c.getInt(columnIndex)) {
                             Log.d(TAG, "Download successfull");
 
-                            new AsyncUnzip().execute(zipFile, aModelsPath);
+                            new AsyncUnzip().execute(zipFile, aModelPath);
                         }
                     }
                 }

app/src/main/res/layout/activity_main.xml

@@ -94,7 +94,7 @@
             android:layout_marginBottom="-80dp"
             android:ems="10"
             android:inputType="textPersonName"
-            android:text="eng" />
+            android:text="en-us" />
     
     </RelativeLayout>
 </android.support.constraint.ConstraintLayout>

mozillaspeechlibrary/build.gradle

@@ -3,7 +3,7 @@ apply from: 'maven-push.gradle'
 
 def versionMajor = 1
 def versionMinor = 0
-def versionPatch = 7
+def versionPatch = 8
 
 android {
     compileSdkVersion 25
@@ -45,7 +45,7 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.loopj.android:android-async-http:1.4.9'
-    implementation 'org.mozilla.deepspeech:libdeepspeech:0.5.1@aar'
+    implementation 'org.mozilla.deepspeech:libdeepspeech:0.6.0-alpha.8@aar'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

mozillaspeechlibrary/src/main/java/com/mozilla/speechlibrary/LocalSpeechRecognition.java

@@ -34,8 +34,6 @@ class LocalDSInference implements Runnable {
 
     boolean stopStream;
 
-    final int N_CEP = 26;
-    final int N_CONTEXT = 9;
     final int BEAM_WIDTH = 250;
 
     final float LM_WEIGHT = 0.75f;
@@ -44,7 +42,7 @@ class LocalDSInference implements Runnable {
     static final String _tag = "LocalDSInference";
 
     static boolean keepClips  = false;
-    static boolean useDecoder = false;
+    static boolean useDecoder = true;
     static int clipNumber = 0;
     FileChannel clipDebug;
 
@@ -54,7 +52,7 @@ class LocalDSInference implements Runnable {
     String LM;
     String trie;
 
-    protected LocalDSInference(MozillaSpeechService aService, int aFrameSize, int aSampleRate) {
+    protected LocalDSInference(MozillaSpeechService aService, int aSampleRate) {
         Log.e(this._tag, "new LocalDSInference()");
 
         modelRoot = aService.getModelPath() + "/" + aService.getLanguageDir();
@@ -69,7 +67,7 @@ class LocalDSInference implements Runnable {
         this.clipNumber += 1;
 
         this.keepClips  = (new File(this.modelRoot + "/.keepClips")).exists();
-        this.useDecoder = (new File(this.modelRoot + "/.useDecoder")).exists();
+        this.useDecoder = !(new File(this.modelRoot + "/.noUseDecoder")).exists();
 
         Log.e(this._tag, "keepClips=" + this.keepClips);
         Log.e(this._tag, "useDecoder=" + this.useDecoder);
@@ -78,11 +76,11 @@ class LocalDSInference implements Runnable {
 
         if (this.mModel == null) {
             Log.e(this._tag, "new DeepSpeechModel(\"" + this.tfliteModel + "\")");
-            this.mModel = new DeepSpeechModel(this.tfliteModel, N_CEP, N_CONTEXT, this.alphabet, BEAM_WIDTH);
+            this.mModel = new DeepSpeechModel(this.tfliteModel, this.alphabet, BEAM_WIDTH);
         }
 
         if (this.useDecoder) {
-            this.mModel.enableDecoderWihLM(this.alphabet, this.LM, this.trie, LM_WEIGHT, VALID_WORD_COUNT_WEIGHT);
+            this.mModel.enableDecoderWihLM(this.LM, this.trie, LM_WEIGHT, VALID_WORD_COUNT_WEIGHT);
         }
 
         if (this.keepClips) {
@@ -92,7 +90,7 @@ class LocalDSInference implements Runnable {
             }
         }
 
-        this.mStreamingState = this.mModel.setupStream(aFrameSize * 2, aSampleRate);
+        this.mStreamingState = this.mModel.createStream(aSampleRate);
         this.stopStream      = false;
     }
 
@@ -105,7 +103,7 @@ class LocalDSInference implements Runnable {
 
         if (this.mModel != null) {
             Log.e(this._tag, "closeModel()");
-            this.mModel.destroyModel();
+            this.mModel.freeModel();
         }
 
         this.mStreamingState = null;
@@ -197,11 +195,11 @@ class LocalSpeechRecognition implements Runnable {
 
     private static Map<String,String> mLanguages = new HashMap<String, String>();
     static {
-        mLanguages.put("en-US", "eng");
-        mLanguages.put("fr-FR", "fra");
+        mLanguages.put("en-US", "en-us");
+        mLanguages.put("fr-FR", "fr-fr");
     }
 
-    private static String kBaseModelURL = "https://github.com/lissyx/DeepSpeech/releases/download/android-test/";
+    private static String kBaseModelURL = "https://github.com/lissyx/DeepSpeech/releases/download/v0.6.0-alpha.7/";
 
     protected LocalSpeechRecognition(int aSampleRate, int aChannels, Vad aVad,
                                 MozillaSpeechService aService) {
@@ -211,7 +209,7 @@ class LocalSpeechRecognition implements Runnable {
         this.mChannels = aChannels;
         this.mService = aService;
 
-        this.mInferer = new LocalDSInference(this.mService, FRAME_SIZE, this.mSampleRate);
+        this.mInferer = new LocalDSInference(this.mService, this.mSampleRate);
         this.mInferenceThread = new Thread(this.mInferer);
         this.mInferenceThread.start();
     }