From 2a66366be4c2715870e4859fd5a5db6e8a9dc00a Mon Sep 17 00:00:00 2001
From: chenmengzheAAA <123789350+chenmengzheAAA@users.noreply.github.com>
Date: 星期四, 14 九月 2023 19:00:17 +0800
Subject: [PATCH] Merge pull request #956 from alibaba-damo-academy/chenmengzheAAA-patch-4
---
funasr/runtime/html5/static/main.js | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 163 insertions(+), 10 deletions(-)
diff --git a/funasr/runtime/html5/static/main.js b/funasr/runtime/html5/static/main.js
index 04d22a9..38811cd 100644
--- a/funasr/runtime/html5/static/main.js
+++ b/funasr/runtime/html5/static/main.js
@@ -31,6 +31,9 @@
btnConnect= document.getElementById('btnConnect');
btnConnect.onclick = start;
+
+var awsslink= document.getElementById('wsslink');
+
var rec_text=""; // for online rec asr result
var offline_text=""; // for offline rec asr result
@@ -41,9 +44,33 @@
var isfilemode=false; // if it is in file mode
+var file_ext="";
+var file_sample_rate=16000; //for wav file sample rate
var file_data_array; // array to save file data
var totalsend=0;
+
+
+var now_ipaddress=window.location.href;
+now_ipaddress=now_ipaddress.replace("https://","wss://");
+now_ipaddress=now_ipaddress.replace("static/index.html","");
+var localport=window.location.port;
+now_ipaddress=now_ipaddress.replace(localport,"10095");
+document.getElementById('wssip').value=now_ipaddress;
+addresschange();
+function addresschange()
+{
+
+ var Uri = document.getElementById('wssip').value;
+ document.getElementById('info_wslink').innerHTML="鐐规澶勬墜宸ユ巿鏉冿紙IOS鎵嬫満锛�";
+ Uri=Uri.replace(/wss/g,"https");
+ console.log("addresschange uri=",Uri);
+
+ awsslink.onclick=function(){
+ window.open(Uri, '_blank');
+ }
+
+}
upfile.onclick=function()
{
@@ -52,23 +79,108 @@
btnConnect.disabled=false;
}
+
+// from https://github.com/xiangyuecn/Recorder/tree/master
+var readWavInfo=function(bytes){
+ //璇诲彇wav鏂囦欢澶达紝缁熶竴鎴�44瀛楄妭鐨勫ご
+ if(bytes.byteLength<44){
+ return null;
+ };
+ var wavView=bytes;
+ var eq=function(p,s){
+ for(var i=0;i<s.length;i++){
+ if(wavView[p+i]!=s.charCodeAt(i)){
+ return false;
+ };
+ };
+ return true;
+ };
+
+ if(eq(0,"RIFF")&&eq(8,"WAVEfmt ")){
+
+ var numCh=wavView[22];
+ if(wavView[20]==1 && (numCh==1||numCh==2)){//raw pcm 鍗曟垨鍙屽０閬�
+ var sampleRate=wavView[24]+(wavView[25]<<8)+(wavView[26]<<16)+(wavView[27]<<24);
+ var bitRate=wavView[34]+(wavView[35]<<8);
+ var heads=[wavView.subarray(0,12)],headSize=12;//head鍙繚鐣欏繀瑕佺殑鍧�
+ //鎼滅储data鍧楃殑浣嶇疆
+ var dataPos=0; // 44 鎴栨湁鏇村鍧�
+ for(var i=12,iL=wavView.length-8;i<iL;){
+ if(wavView[i]==100&&wavView[i+1]==97&&wavView[i+2]==116&&wavView[i+3]==97){//eq(i,"data")
+ heads.push(wavView.subarray(i,i+8));
+ headSize+=8;
+ dataPos=i+8;break;
+ }
+ var i0=i;
+ i+=4;
+ i+=4+wavView[i]+(wavView[i+1]<<8)+(wavView[i+2]<<16)+(wavView[i+3]<<24);
+ if(i0==12){//fmt
+ heads.push(wavView.subarray(i0,i));
+ headSize+=i-i0;
+ }
+ }
+ if(dataPos){
+ var wavHead=new Uint8Array(headSize);
+ for(var i=0,n=0;i<heads.length;i++){
+ wavHead.set(heads[i],n);n+=heads[i].length;
+ }
+ return {
+ sampleRate:sampleRate
+ ,bitRate:bitRate
+ ,numChannels:numCh
+ ,wavHead44:wavHead
+ ,dataPos:dataPos
+ };
+ };
+ };
+ };
+ return null;
+};
+
upfile.onchange = function () {
銆�銆�銆�銆�銆�銆�var len = this.files.length;
for(let i = 0; i < len; i++) {
+
let fileAudio = new FileReader();
fileAudio.readAsArrayBuffer(this.files[i]);
+
+ file_ext=this.files[i].name.split('.').pop().toLowerCase();
+ var audioblob;
fileAudio.onload = function() {
- var audioblob= fileAudio.result;
+ audioblob = fileAudio.result;
+
+
file_data_array=audioblob;
- console.log(audioblob);
+
info_div.innerHTML='璇风偣鍑昏繛鎺ヨ繘琛岃瘑鍒�';
-
+
}
+
銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�fileAudio.onerror = function(e) {
銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�console.log('error' + e);
銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�}
}
+ // for wav file, we get the sample rate
+ if(file_ext=="wav")
+ for(let i = 0; i < len; i++) {
+
+ let fileAudio = new FileReader();
+ fileAudio.readAsArrayBuffer(this.files[i]);
+ fileAudio.onload = function() {
+ audioblob = new Uint8Array(fileAudio.result);
+
+ // for wav file, we can get the sample rate
+ var info=readWavInfo(audioblob);
+ console.log(info);
+ file_sample_rate=info.sampleRate;
+
+
+ }
+
+銆�銆�銆�銆�銆�銆�
+ }
+
}
function play_file()
@@ -77,11 +189,11 @@
var audio_record = document.getElementById('audio_record');
audio_record.src = (window.URL||webkitURL).createObjectURL(audioblob);
audio_record.controls=true;
- audio_record.play();
+ //audio_record.play(); //not auto play
}
function start_file_send()
{
- sampleBuf=new Int16Array( file_data_array );
+ sampleBuf=new Uint8Array( file_data_array );
var chunk_size=960; // for asr chunk_size [5, 10, 5]
@@ -143,6 +255,17 @@
}
}
+function getHotwords(){
+ var obj = document.getElementById("varHot");
+
+ if(typeof(obj) == 'undefined' || obj==null || obj.value.length<=0){
+ return "";
+ }
+ let val = obj.value.toString();
+ console.log("hotwords="+val);
+ return val;
+
+}
function getAsrMode(){
var item = null;
@@ -164,16 +287,46 @@
return item;
}
+function handleWithTimestamp(tmptext,tmptime)
+{
+ console.log( "tmptext: " + tmptext);
+ console.log( "tmptime: " + tmptime);
+ if(tmptime==null || tmptime=="undefined" || tmptext.length<=0)
+ {
+ return tmptext;
+ }
+ tmptext=tmptext.replace(/銆�/g, ","); // in case there are a lot of "銆�"
+ var words=tmptext.split(",");
+ var jsontime=JSON.parse(tmptime); //JSON.parse(tmptime.replace(/\]\]\[\[/g, "],[")); // in case there are a lot segments by VAD
+ var char_index=0;
+ var text_withtime="";
+ for(var i=0;i<words.length;i++)
+ {
+ if(words[i]=="undefined" || words[i].length<=0)
+ {
+ continue;
+ }
+ console.log("words===",words[i]);
+ console.log( "words: " + words[i]+",time="+jsontime[char_index][0]/1000);
+ text_withtime=text_withtime+jsontime[char_index][0]/1000+":"+words[i]+"\n";
+ char_index=char_index+words[i].length;
+ }
+ return text_withtime;
+
+}
// 璇煶璇嗗埆缁撴灉; 瀵筳sonMsg鏁版嵁瑙ｆ瀽,灏嗚瘑鍒粨鏋滈檮鍔犲埌缂栬緫妗嗕腑
function getJsonMessage( jsonMsg ) {
//console.log(jsonMsg);
console.log( "message: " + JSON.parse(jsonMsg.data)['text'] );
var rectxt=""+JSON.parse(jsonMsg.data)['text'];
var asrmodel=JSON.parse(jsonMsg.data)['mode'];
- if(asrmodel=="2pass-offline")
+ var is_final=JSON.parse(jsonMsg.data)['is_final'];
+ var timestamp=JSON.parse(jsonMsg.data)['timestamp'];
+ if(asrmodel=="2pass-offline" || asrmodel=="offline")
{
- offline_text=offline_text+rectxt; //.replace(/ +/g,"");
+
+ offline_text=offline_text+handleWithTimestamp(rectxt,timestamp); //rectxt; //.replace(/ +/g,"");
rec_text=offline_text;
}
else
@@ -185,7 +338,7 @@
varArea.value=rec_text;
console.log( "offline_text: " + asrmodel+","+offline_text);
console.log( "rec_text: " + rec_text);
- if (isfilemode==true){
+ if (isfilemode==true && is_final==false){
console.log("call stop ws!");
play_file();
wsconnecter.wsStop();
@@ -223,7 +376,7 @@
stop();
console.log( 'connecttion error' );
- alert("杩炴帴鍦板潃"+document.getElementById('wssip').value+"澶辫触,璇锋鏌sr鍦板潃鍜岀鍙ｏ紝骞剁‘淇漢5鏈嶅姟鍜宎sr鏈嶅姟鍦ㄥ悓涓�涓煙鍐呫�傛垨鎹釜娴忚鍣ㄨ瘯璇曘��");
+ alert("杩炴帴鍦板潃"+document.getElementById('wssip').value+"澶辫触,璇锋鏌sr鍦板潃鍜岀鍙ｃ�傛垨璇曡瘯鐣岄潰涓婃墜鍔ㄦ巿鏉冿紝鍐嶈繛鎺ャ��");
btnStart.disabled = true;
btnStop.disabled = true;
btnConnect.disabled=false;
@@ -329,7 +482,7 @@
var audio_record = document.getElementById('audio_record');
audio_record.src = (window.URL||webkitURL).createObjectURL(theblob);
audio_record.controls=true;
- audio_record.play();
+ //audio_record.play();
} ,function(msg){
--
Gitblit v1.9.1