diff --git a/runtime/android/app/src/main/assets/kws.ort b/runtime/android/app/src/main/assets/kws.ort new file mode 100644 index 0000000..a245084 Binary files /dev/null and b/runtime/android/app/src/main/assets/kws.ort differ diff --git a/runtime/android/app/src/main/cpp/wekws.cc b/runtime/android/app/src/main/cpp/wekws.cc index f50e622..d1dba2a 100644 --- a/runtime/android/app/src/main/cpp/wekws.cc +++ b/runtime/android/app/src/main/cpp/wekws.cc @@ -62,14 +62,12 @@ void spot_thread_func() { feature_pipeline->Read(80, &feats); std::vector> prob; spotter->Forward(feats, &prob); - - float max_hi_xiaowen = 0; - float max_nihao_wenwen = 0; + float max_prob = 0.0; for (int t = 0; t < prob.size(); t++) { - max_hi_xiaowen = std::max(prob[t][0], max_hi_xiaowen); - max_nihao_wenwen = std::max(prob[t][1], max_nihao_wenwen); + for (int j = 0; j < prob[t].size(); j++) { + max_prob = std::max(prob[t][j], max_prob); + } } - float max_prob = max_hi_xiaowen + max_nihao_wenwen; result = std::to_string(offset) + " prob: " + std::to_string(max_prob); offset += prob.size(); } diff --git a/runtime/android/app/src/main/java/cn/org/wenet/wekws/MainActivity.java b/runtime/android/app/src/main/java/cn/org/wenet/wekws/MainActivity.java index 1653cf9..c3dc31c 100644 --- a/runtime/android/app/src/main/java/cn/org/wenet/wekws/MainActivity.java +++ b/runtime/android/app/src/main/java/cn/org/wenet/wekws/MainActivity.java @@ -35,6 +35,7 @@ public class MainActivity extends AppCompatActivity { private static final int SAMPLE_RATE = 16000; // The sampling rate private static final int MAX_QUEUE_SIZE = 2500; // 100 seconds audio, 1 / 0.04 * 100 private static final List resource = Arrays.asList("kws.ort"); + private static final String HINTS = "say \"Hey Snips\" to wakeup"; private boolean startRecord = false; private AudioRecord record = null; @@ -91,7 +92,7 @@ public class MainActivity extends AppCompatActivity { } TextView textView = findViewById(R.id.textView); - textView.setText(""); + textView.setText(HINTS); Spot.init(getFilesDir().getPath()); Button button = findViewById(R.id.button); @@ -209,4 +210,4 @@ public class MainActivity extends AppCompatActivity { } }).start(); } -} \ No newline at end of file +} diff --git a/runtime/android/app/src/main/res/layout/activity_main.xml b/runtime/android/app/src/main/res/layout/activity_main.xml index c61b7d0..826bb54 100644 --- a/runtime/android/app/src/main/res/layout/activity_main.xml +++ b/runtime/android/app/src/main/res/layout/activity_main.xml @@ -1,27 +1,23 @@ + android:layout_marginTop="350dp" + android:textAlignment="center" + android:textSize="20sp" + VoiceRect:layout_constraintEnd_toEndOf="parent" + VoiceRect:layout_constraintStart_toStartOf="parent" + VoiceRect:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintStart_toStartOf="parent" />