From 4798614e683e94c1b8ed7b514fbc47381f6465ba Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期四, 23 三月 2023 15:41:57 +0800
Subject: [PATCH] websocket

---
 funasr/runtime/python/websocket/ASR_server.py |   68 +++++++++++++++++++---------------
 1 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/funasr/runtime/python/websocket/ASR_server.py b/funasr/runtime/python/websocket/ASR_server.py
index 0af5208..0aed2b4 100644
--- a/funasr/runtime/python/websocket/ASR_server.py
+++ b/funasr/runtime/python/websocket/ASR_server.py
@@ -85,10 +85,15 @@
     #print(type(data))
     segments_result = vad_pipline(audio_in=data)
     #print(segments_result)
-    if len(segments_result) == 0:
+    speech_start = False
+    speech_end = False
+    if len(segments_result) == 0 or len(segments_result["text"] > 1):
         return False
-    else:
-        return True
+    elif segments_result["text"][0][0] != -1:
+        speech_start = True
+    elif segments_result["text"][0][1] != -1:
+        speech_end = True
+    return speech_start, speech_end
 
 def asr():  # 鎺ㄧ悊
     global inference_pipeline2
@@ -106,11 +111,12 @@
 def main():  # 鎺ㄧ悊
     frames = []  # 瀛樺偍鎵�鏈夌殑甯ф暟鎹�
     buffer = []  # 瀛樺偍缂撳瓨涓殑甯ф暟鎹紙鏈�澶氫袱涓墖娈碉級
-    silence_count = 0  # 缁熻杩炵画闈欓煶鐨勬鏁�
-    speech_detected = False  # 鏍囪鏄惁妫�娴嬪埌璇煶
+    # silence_count = 0  # 缁熻杩炵画闈欓煶鐨勬鏁�
+    # speech_detected = False  # 鏍囪鏄惁妫�娴嬪埌璇煶
     RECORD_NUM = 0
     global voices 
     global speek
+    speech_start, speech_end = False, False
     while True:
         while not voices.empty():
             
@@ -121,32 +127,34 @@
             if len(buffer) > 2:
                 buffer.pop(0)  # 濡傛灉缂撳瓨瓒呰繃涓や釜鐗囨锛屽垯鍒犻櫎鏈�鏃╃殑涓�涓�
             
-            if speech_detected:
+            if speech_start:
                 frames.append(data)
-                RECORD_NUM += 1    
-            
-            if vad(data):
-                if not speech_detected:
-                    print("妫�娴嬪埌浜哄0...")
-                    speech_detected = True  # 鏍囪涓烘娴嬪埌璇煶
-                    frames = []
-                    frames.extend(buffer)  # 鎶婁箣鍓�2涓闊虫暟鎹揩鍔犲叆
-                silence_count = 0  # 閲嶇疆闈欓煶娆℃暟
-            else:
-                silence_count += 1  # 澧炲姞闈欓煶娆℃暟
-
-                if speech_detected and (silence_count > 4 or RECORD_NUM > 50): #杩欓噷 50 鍙牴鎹渶姹傛敼涓哄悎閫傜殑鏁版嵁蹇暟閲�
-                    print("璇磋瘽缁撴潫鎴栬�呰秴杩囪缃渶闀挎椂闂�...")
-                    audio_in = b"".join(frames)
-                    #asrt = threading.Thread(target=asr,args=(audio_in,))
-                    #asrt.start()
-                    speek.put(audio_in)
-                    #rec_result = inference_pipeline2(audio_in=audio_in)  # ASR 妯″瀷閲岃窇涓�璺�
-                    frames = []  # 娓呯┖鎵�鏈夌殑甯ф暟鎹�
-                    buffer = []  # 娓呯┖缂撳瓨涓殑甯ф暟鎹紙鏈�澶氫袱涓墖娈碉級
-                    silence_count = 0  # 缁熻杩炵画闈欓煶鐨勬鏁版竻闆�
-                    speech_detected = False  # 鏍囪鏄惁妫�娴嬪埌璇煶
-                    RECORD_NUM = 0
+                RECORD_NUM += 1
+            speech_start_i, speech_end_i = vad(data)
+            if speech_start_i:
+                speech_start = speech_start_i
+                # if not speech_detected:
+                print("妫�娴嬪埌浜哄0...")
+                # speech_detected = True  # 鏍囪涓烘娴嬪埌璇煶
+                frames = []
+                frames.extend(buffer)  # 鎶婁箣鍓�2涓闊虫暟鎹揩鍔犲叆
+                # silence_count = 0  # 閲嶇疆闈欓煶娆℃暟
+            elif speech_end_i or RECORD_NUM > 300:
+                # silence_count += 1  # 澧炲姞闈欓煶娆℃暟
+                # speech_end = speech_end_i
+                speech_start = False
+                # if RECORD_NUM > 300: #杩欓噷 50 鍙牴鎹渶姹傛敼涓哄悎閫傜殑鏁版嵁蹇暟閲�
+                print("璇磋瘽缁撴潫鎴栬�呰秴杩囪缃渶闀挎椂闂�...")
+                audio_in = b"".join(frames)
+                #asrt = threading.Thread(target=asr,args=(audio_in,))
+                #asrt.start()
+                speek.put(audio_in)
+                #rec_result = inference_pipeline2(audio_in=audio_in)  # ASR 妯″瀷閲岃窇涓�璺�
+                frames = []  # 娓呯┖鎵�鏈夌殑甯ф暟鎹�
+                buffer = []  # 娓呯┖缂撳瓨涓殑甯ф暟鎹紙鏈�澶氫袱涓墖娈碉級
+                # silence_count = 0  # 缁熻杩炵画闈欓煶鐨勬鏁版竻闆�
+                # speech_detected = False  # 鏍囪鏄惁妫�娴嬪埌璇煶
+                RECORD_NUM = 0
             time.sleep(0.01)
         time.sleep(0.01)
             

--
Gitblit v1.9.1