From 6d09603442a351c2d4d2401308df59d118fd3340 Mon Sep 17 00:00:00 2001
From: veelion <veelion@gmail.com>
Date: 星期一, 27 三月 2023 09:02:33 +0800
Subject: [PATCH] Merge branch 'alibaba-damo-academy:main' into main
---
funasr/runtime/python/websocket/ASR_client.py | 65 +++++++++++++++++---------------
1 files changed, 35 insertions(+), 30 deletions(-)
diff --git a/funasr/runtime/python/websocket/ASR_client.py b/funasr/runtime/python/websocket/ASR_client.py
index 8010b18..fe67981 100644
--- a/funasr/runtime/python/websocket/ASR_client.py
+++ b/funasr/runtime/python/websocket/ASR_client.py
@@ -26,30 +26,13 @@
args = parser.parse_args()
voices = Queue()
-async def ws_client():
- global ws # 瀹氫箟涓�涓叏灞�鍙橀噺ws锛岀敤浜庝繚瀛榳ebsocket杩炴帴瀵硅薄
- # uri = "ws://11.167.134.197:8899"
- uri = "ws://{}:{}".format(args.host, args.port)
- ws = await websockets.connect(uri, subprotocols=["binary"]) # 鍒涘缓涓�涓暱杩炴帴
- ws.max_size = 1024 * 1024 * 20
- print("connected ws server")
+
+
-async def send(data):
- global ws # 寮曠敤鍏ㄥ眬鍙橀噺ws
- try:
- await ws.send(data) # 閫氳繃ws瀵硅薄鍙戦�佹暟鎹�
- except Exception as e:
- print('Exception occurred:', e)
-
-
-
-asyncio.get_event_loop().run_until_complete(ws_client()) # 鍚姩鍗忕▼
-
-
# 鍏朵粬鍑芥暟鍙互閫氳繃璋冪敤send(data)鏉ュ彂閫佹暟鎹紝渚嬪锛�
-async def test():
+async def record():
#print("2")
- global voices
+ global voices
FORMAT = pyaudio.paInt16
CHANNELS = 1
RATE = 16000
@@ -69,27 +52,49 @@
voices.put(data)
#print(voices.qsize())
+
await asyncio.sleep(0.01)
-
-
async def ws_send():
global voices
+ global websocket
print("started to sending data!")
while True:
while not voices.empty():
data = voices.get()
voices.task_done()
- await send(data)
+ try:
+ await websocket.send(data) # 閫氳繃ws瀵硅薄鍙戦�佹暟鎹�
+ except Exception as e:
+ print('Exception occurred:', e)
await asyncio.sleep(0.01)
await asyncio.sleep(0.01)
-async def main():
- task = asyncio.create_task(test()) # 鍒涘缓涓�涓悗鍙颁换鍔�
- task2 = asyncio.create_task(ws_send()) # 鍒涘缓涓�涓悗鍙颁换鍔�
-
- await asyncio.gather(task, task2)
-asyncio.run(main())
+
+async def message():
+ global websocket
+ while True:
+ try:
+ print(await websocket.recv())
+ except Exception as e:
+ print("Exception:", e)
+
+
+
+async def ws_client():
+ global websocket # 瀹氫箟涓�涓叏灞�鍙橀噺ws锛岀敤浜庝繚瀛榳ebsocket杩炴帴瀵硅薄
+ # uri = "ws://11.167.134.197:8899"
+ uri = "ws://{}:{}".format(args.host, args.port)
+ #ws = await websockets.connect(uri, subprotocols=["binary"]) # 鍒涘缓涓�涓暱杩炴帴
+ async for websocket in websockets.connect(uri, subprotocols=["binary"], ping_interval=None):
+ task = asyncio.create_task(record()) # 鍒涘缓涓�涓悗鍙颁换鍔″綍闊�
+ task2 = asyncio.create_task(ws_send()) # 鍒涘缓涓�涓悗鍙颁换鍔″彂閫�
+ task3 = asyncio.create_task(message()) # 鍒涘缓涓�涓悗鍙版帴鏀舵秷鎭殑浠诲姟
+ await asyncio.gather(task, task2, task3)
+
+
+asyncio.get_event_loop().run_until_complete(ws_client()) # 鍚姩鍗忕▼
+asyncio.get_event_loop().run_forever()
--
Gitblit v1.9.1