xuning / sherpaonnx

转到一个项目
Toggle navigation Toggle navigation pinning
Fangjun Kuang
Committed by GitHub
22c6f813 1 parent a2a70900

Fix VAD+ASR example for Dart API. (#1294) 

There is no need to invoke vad.isDetected().
内嵌 并排对比
正在显示 7 个修改的文件 包含 6 行增加 和 26 行删除
@@ -69,7 +69,6 @@ void main(List<String> arguments) async { @@ -69,7 +69,6 @@ void main(List<String> arguments) async {
69 vad.acceptWaveform(Float32List.sublistView( 69 vad.acceptWaveform(Float32List.sublistView(
70 waveData.samples, start, start + vadConfig.sileroVad.windowSize)); 70 waveData.samples, start, start + vadConfig.sileroVad.windowSize));
71 71
72 - if (vad.isDetected()) {  
73 while (!vad.isEmpty()) { 72 while (!vad.isEmpty()) {
74 final stream = recognizer.createStream(); 73 final stream = recognizer.createStream();
75 final segment = vad.front(); 74 final segment = vad.front();
@@ -91,7 +90,6 @@ void main(List<String> arguments) async { @@ -91,7 +90,6 @@ void main(List<String> arguments) async {
91 vad.pop(); 90 vad.pop();
92 } 91 }
93 } 92 }
94 - }  
95 93
96 vad.flush(); 94 vad.flush();
97 while (!vad.isEmpty()) { 95 while (!vad.isEmpty()) {
@@ -76,7 +76,6 @@ void main(List<String> arguments) async { @@ -76,7 +76,6 @@ void main(List<String> arguments) async {
76 vad.acceptWaveform(Float32List.sublistView( 76 vad.acceptWaveform(Float32List.sublistView(
77 waveData.samples, start, start + vadConfig.sileroVad.windowSize)); 77 waveData.samples, start, start + vadConfig.sileroVad.windowSize));
78 78
79 - if (vad.isDetected()) {  
80 while (!vad.isEmpty()) { 79 while (!vad.isEmpty()) {
81 final samples = vad.front().samples; 80 final samples = vad.front().samples;
82 final startTime = vad.front().start.toDouble() / waveData.sampleRate; 81 final startTime = vad.front().start.toDouble() / waveData.sampleRate;
@@ -84,8 +83,7 @@ void main(List<String> arguments) async { @@ -84,8 +83,7 @@ void main(List<String> arguments) async {
84 startTime + samples.length.toDouble() / waveData.sampleRate; 83 startTime + samples.length.toDouble() / waveData.sampleRate;
85 84
86 final stream = recognizer.createStream(); 85 final stream = recognizer.createStream();
87 - stream.acceptWaveform(  
88 - samples: samples, sampleRate: waveData.sampleRate); 86 + stream.acceptWaveform(samples: samples, sampleRate: waveData.sampleRate);
89 recognizer.decode(stream); 87 recognizer.decode(stream);
90 88
91 final result = recognizer.getResult(stream); 89 final result = recognizer.getResult(stream);
@@ -96,7 +94,6 @@ void main(List<String> arguments) async { @@ -96,7 +94,6 @@ void main(List<String> arguments) async {
96 vad.pop(); 94 vad.pop();
97 } 95 }
98 } 96 }
99 - }  
100 97
101 vad.flush(); 98 vad.flush();
102 99
@@ -84,7 +84,6 @@ void main(List<String> arguments) async { @@ -84,7 +84,6 @@ void main(List<String> arguments) async {
84 84
85 vad.acceptWaveform(samples); 85 vad.acceptWaveform(samples);
86 86
87 - if (vad.isDetected()) {  
88 while (!vad.isEmpty()) { 87 while (!vad.isEmpty()) {
89 final samples = vad.front().samples; 88 final samples = vad.front().samples;
90 final startTime = vad.front().start.toDouble() / waveData.sampleRate; 89 final startTime = vad.front().start.toDouble() / waveData.sampleRate;
@@ -92,8 +91,7 @@ void main(List<String> arguments) async { @@ -92,8 +91,7 @@ void main(List<String> arguments) async {
92 startTime + samples.length.toDouble() / waveData.sampleRate; 91 startTime + samples.length.toDouble() / waveData.sampleRate;
93 92
94 final stream = recognizer.createStream(); 93 final stream = recognizer.createStream();
95 - stream.acceptWaveform(  
96 - samples: samples, sampleRate: waveData.sampleRate); 94 + stream.acceptWaveform(samples: samples, sampleRate: waveData.sampleRate);
97 recognizer.decode(stream); 95 recognizer.decode(stream);
98 96
99 final result = recognizer.getResult(stream); 97 final result = recognizer.getResult(stream);
@@ -104,7 +102,6 @@ void main(List<String> arguments) async { @@ -104,7 +102,6 @@ void main(List<String> arguments) async {
104 vad.pop(); 102 vad.pop();
105 } 103 }
106 } 104 }
107 - }  
108 105
109 vad.flush(); 106 vad.flush();
110 107
@@ -81,7 +81,6 @@ void main(List<String> arguments) async { @@ -81,7 +81,6 @@ void main(List<String> arguments) async {
81 vad.acceptWaveform(Float32List.sublistView( 81 vad.acceptWaveform(Float32List.sublistView(
82 waveData.samples, start, start + vadConfig.sileroVad.windowSize)); 82 waveData.samples, start, start + vadConfig.sileroVad.windowSize));
83 83
84 - if (vad.isDetected()) {  
85 while (!vad.isEmpty()) { 84 while (!vad.isEmpty()) {
86 final samples = vad.front().samples; 85 final samples = vad.front().samples;
87 final startTime = vad.front().start.toDouble() / waveData.sampleRate; 86 final startTime = vad.front().start.toDouble() / waveData.sampleRate;
@@ -89,8 +88,7 @@ void main(List<String> arguments) async { @@ -89,8 +88,7 @@ void main(List<String> arguments) async {
89 startTime + samples.length.toDouble() / waveData.sampleRate; 88 startTime + samples.length.toDouble() / waveData.sampleRate;
90 89
91 final stream = recognizer.createStream(); 90 final stream = recognizer.createStream();
92 - stream.acceptWaveform(  
93 - samples: samples, sampleRate: waveData.sampleRate); 91 + stream.acceptWaveform(samples: samples, sampleRate: waveData.sampleRate);
94 recognizer.decode(stream); 92 recognizer.decode(stream);
95 93
96 final result = recognizer.getResult(stream); 94 final result = recognizer.getResult(stream);
@@ -101,7 +99,6 @@ void main(List<String> arguments) async { @@ -101,7 +99,6 @@ void main(List<String> arguments) async {
101 vad.pop(); 99 vad.pop();
102 } 100 }
103 } 101 }
104 - }  
105 102
106 vad.flush(); 103 vad.flush();
107 104
@@ -73,7 +73,6 @@ void main(List<String> arguments) async { @@ -73,7 +73,6 @@ void main(List<String> arguments) async {
73 vad.acceptWaveform(Float32List.sublistView( 73 vad.acceptWaveform(Float32List.sublistView(
74 waveData.samples, start, start + vadConfig.sileroVad.windowSize)); 74 waveData.samples, start, start + vadConfig.sileroVad.windowSize));
75 75
76 - if (vad.isDetected()) {  
77 while (!vad.isEmpty()) { 76 while (!vad.isEmpty()) {
78 final samples = vad.front().samples; 77 final samples = vad.front().samples;
79 final startTime = vad.front().start.toDouble() / waveData.sampleRate; 78 final startTime = vad.front().start.toDouble() / waveData.sampleRate;
@@ -81,8 +80,7 @@ void main(List<String> arguments) async { @@ -81,8 +80,7 @@ void main(List<String> arguments) async {
81 startTime + samples.length.toDouble() / waveData.sampleRate; 80 startTime + samples.length.toDouble() / waveData.sampleRate;
82 81
83 final stream = recognizer.createStream(); 82 final stream = recognizer.createStream();
84 - stream.acceptWaveform(  
85 - samples: samples, sampleRate: waveData.sampleRate); 83 + stream.acceptWaveform(samples: samples, sampleRate: waveData.sampleRate);
86 recognizer.decode(stream); 84 recognizer.decode(stream);
87 85
88 final result = recognizer.getResult(stream); 86 final result = recognizer.getResult(stream);
@@ -93,7 +91,6 @@ void main(List<String> arguments) async { @@ -93,7 +91,6 @@ void main(List<String> arguments) async {
93 vad.pop(); 91 vad.pop();
94 } 92 }
95 } 93 }
96 - }  
97 94
98 vad.flush(); 95 vad.flush();
99 96
@@ -80,7 +80,6 @@ void main(List<String> arguments) async { @@ -80,7 +80,6 @@ void main(List<String> arguments) async {
80 vad.acceptWaveform(Float32List.sublistView( 80 vad.acceptWaveform(Float32List.sublistView(
81 waveData.samples, start, start + vadConfig.sileroVad.windowSize)); 81 waveData.samples, start, start + vadConfig.sileroVad.windowSize));
82 82
83 - if (vad.isDetected()) {  
84 while (!vad.isEmpty()) { 83 while (!vad.isEmpty()) {
85 final samples = vad.front().samples; 84 final samples = vad.front().samples;
86 final startTime = vad.front().start.toDouble() / waveData.sampleRate; 85 final startTime = vad.front().start.toDouble() / waveData.sampleRate;
@@ -88,8 +87,7 @@ void main(List<String> arguments) async { @@ -88,8 +87,7 @@ void main(List<String> arguments) async {
88 startTime + samples.length.toDouble() / waveData.sampleRate; 87 startTime + samples.length.toDouble() / waveData.sampleRate;
89 88
90 final stream = recognizer.createStream(); 89 final stream = recognizer.createStream();
91 - stream.acceptWaveform(  
92 - samples: samples, sampleRate: waveData.sampleRate); 90 + stream.acceptWaveform(samples: samples, sampleRate: waveData.sampleRate);
93 recognizer.decode(stream); 91 recognizer.decode(stream);
94 92
95 final result = recognizer.getResult(stream); 93 final result = recognizer.getResult(stream);
@@ -100,7 +98,6 @@ void main(List<String> arguments) async { @@ -100,7 +98,6 @@ void main(List<String> arguments) async {
100 vad.pop(); 98 vad.pop();
101 } 99 }
102 } 100 }
103 - }  
104 101
105 vad.flush(); 102 vad.flush();
106 103
@@ -84,7 +84,6 @@ void main(List<String> arguments) async { @@ -84,7 +84,6 @@ void main(List<String> arguments) async {
84 vad.acceptWaveform(Float32List.sublistView( 84 vad.acceptWaveform(Float32List.sublistView(
85 waveData.samples, start, start + vadConfig.sileroVad.windowSize)); 85 waveData.samples, start, start + vadConfig.sileroVad.windowSize));
86 86
87 - if (vad.isDetected()) {  
88 while (!vad.isEmpty()) { 87 while (!vad.isEmpty()) {
89 final samples = vad.front().samples; 88 final samples = vad.front().samples;
90 final startTime = vad.front().start.toDouble() / waveData.sampleRate; 89 final startTime = vad.front().start.toDouble() / waveData.sampleRate;
@@ -92,8 +91,7 @@ void main(List<String> arguments) async { @@ -92,8 +91,7 @@ void main(List<String> arguments) async {
92 startTime + samples.length.toDouble() / waveData.sampleRate; 91 startTime + samples.length.toDouble() / waveData.sampleRate;
93 92
94 final stream = recognizer.createStream(); 93 final stream = recognizer.createStream();
95 - stream.acceptWaveform(  
96 - samples: samples, sampleRate: waveData.sampleRate); 94 + stream.acceptWaveform(samples: samples, sampleRate: waveData.sampleRate);
97 recognizer.decode(stream); 95 recognizer.decode(stream);
98 96
99 final result = recognizer.getResult(stream); 97 final result = recognizer.getResult(stream);
@@ -104,7 +102,6 @@ void main(List<String> arguments) async { @@ -104,7 +102,6 @@ void main(List<String> arguments) async {
104 vad.pop(); 102 vad.pop();
105 } 103 }
106 } 104 }
107 - }  
108 105
109 vad.flush(); 106 vad.flush();
110 107