From 9fcb3cc06b4e324f0913d2f61b89becc2baeef1b Mon Sep 17 00:00:00 2001
From: hnluo <haoneng.lhn@alibaba-inc.com>
Date: 星期一, 11 九月 2023 17:40:03 +0800
Subject: [PATCH] Merge pull request #932 from alibaba-damo-academy/dev_lhn
---
funasr/runtime/html5/static/wsconnecter.js | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/funasr/runtime/html5/static/wsconnecter.js b/funasr/runtime/html5/static/wsconnecter.js
index b9098bb..ee0bcca 100644
--- a/funasr/runtime/html5/static/wsconnecter.js
+++ b/funasr/runtime/html5/static/wsconnecter.js
@@ -30,7 +30,7 @@
speechSokt.onopen = function(e){onOpen(e);}; // 瀹氫箟鍝嶅簲鍑芥暟
speechSokt.onclose = function(e){
console.log("onclose ws!");
- speechSokt.close();
+ //speechSokt.close();
onClose(e);
};
speechSokt.onmessage = function(e){onMessage(e);};
@@ -51,16 +51,13 @@
}
};
- this.wsSend = function ( oneData,stop ) {
+ this.wsSend = function ( oneData ) {
if(speechSokt == undefined) return;
if ( speechSokt.readyState === 1 ) { // 0:CONNECTING, 1:OPEN, 2:CLOSING, 3:CLOSED
speechSokt.send( oneData );
- if(stop){
- setTimeout(speechSokt.close(), 3000 );
- }
}
};
@@ -75,12 +72,27 @@
"is_speaking": true,
"chunk_interval":10,
"mode":getAsrMode(),
+
};
+ if(isfilemode)
+ {
+ request.wav_format=file_ext;
+ if(file_ext=="wav")
+ {
+ request.wav_format="PCM";
+ request.audio_fs=file_sample_rate;
+ }
+ }
+ var hotwords=getHotwords();
+ if(hotwords.length>0)
+ {
+ request.hotwords=hotwords;
+ }
console.log(request);
speechSokt.send( JSON.stringify(request) );
console.log("杩炴帴鎴愬姛");
stateHandle(0);
- isconnected=1;
+
}
function onClose( e ) {
@@ -93,7 +105,7 @@
}
function onError( e ) {
- isconnected=-1;
+
info_div.innerHTML="杩炴帴"+e;
console.log(e);
stateHandle(2);
--
Gitblit v1.9.1