updated project;

igorsitdikov · Apr 3, 2021 · 363c21a · 363c21a
1 parent c3da931
commit 363c21a
Show file tree

Hide file tree

Showing 39 changed files with 458 additions and 490 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,10 +3,14 @@
 vosk_wrap.cc
 *.so
 *.o
-resources
 *_wrap.cc
 *.a
 target
 *.class
 *.dll
-*.lib
+*.lib
+build
+.gradle
+env
+*.tar.xz
+*.whl
diff --git a/build.gradle b/build.gradle
@@ -10,6 +10,8 @@ repositories {
 }
 
 dependencies {
+    compile group: 'net.java.dev.jna', name: 'jna', version: '5.7.0'
+
     // https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
     compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.0.1'
 

diff --git a/lid-107/final.ext.raw b/lid-107/final.ext.raw
diff --git a/lid-107/mean.vec b/lid-107/mean.vec
diff --git a/lid-107/mfcc.conf b/lid-107/mfcc.conf
diff --git a/lid-107/num_utts.ark b/lid-107/num_utts.ark
diff --git a/lid-107/plda_adapt.smooth0.1 b/lid-107/plda_adapt.smooth0.1
diff --git a/lid-107/transform.mat b/lid-107/transform.mat
diff --git a/lid-107/vad.conf b/lid-107/vad.conf
diff --git a/lid-107/xvector.final.train.scp b/lid-107/xvector.final.train.scp
diff --git a/native/l2m.i b/native/l2m.i
diff --git a/pom.xml b/pom.xml
@@ -26,6 +26,12 @@
             <version>1.18.12</version>
             <scope>provided</scope>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/net.java.dev.jna/jna -->
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna</artifactId>
+            <version>5.8.0</version>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/python/example/test_simple.py b/python/example/test_simple.py
@@ -4,15 +4,19 @@
 import sys
 import os
 import wave
+import json
 
 wf = wave.open(sys.argv[1], "rb")
 if wf.getnchannels() != 1 or wf.getsampwidth() != 2 or wf.getcomptype() != "NONE":
     print ("Audio file must be WAV format mono PCM.")
     exit (1)
 
-model = Model("lid-107")
+model = Model("lid-model")
 rec = KaldiRecognizer(model, wf.getframerate())
 data = wf.readframes(-1)
 rec.AcceptWaveform(data)
-print(rec.Result())
 
+results = rec.Result()
+result = max(json.loads(results), key=lambda ev: ev['score'])
+# print(json.loads(results))
+print("identified language: ", result['language'])
diff --git a/python/setup.py b/python/setup.py
@@ -44,7 +44,7 @@ def get_tag(self):
 
 setuptools.setup(
     name="lid",
-    version="0.0.1",
+    version="1.0.1",
     author="Igor Sitdikov",
     author_email="ihar.sitdzikau@yandex.ru",
     description="Spoken Language Identification",

diff --git a/src/main/java/l2m/recognition/language/EmbeddedLibraryTools.java b/src/main/java/l2m/recognition/language/EmbeddedLibraryTools.java