From f03a604204bbe0c79e53b01237a37e88683938c6 Mon Sep 17 00:00:00 2001
From: zhifu gao <zhifu.gzf@alibaba-inc.com>
Date: 星期六, 13 五月 2023 00:17:32 +0800
Subject: [PATCH] Merge pull request #505 from zhaomingwork/cpp-python-websocket-compatible
---
funasr/runtime/python/websocket/ws_client.py | 56 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 13 deletions(-)
diff --git a/funasr/runtime/python/websocket/ws_client.py b/funasr/runtime/python/websocket/ws_client.py
index a4a6d9f..7ae44df 100644
--- a/funasr/runtime/python/websocket/ws_client.py
+++ b/funasr/runtime/python/websocket/ws_client.py
@@ -84,18 +84,20 @@
rate=RATE,
input=True,
frames_per_buffer=CHUNK)
+
+ message = json.dumps({"chunk_size": args.chunk_size, "chunk_interval": args.chunk_interval, "wav_name": wav_name,"is_speaking": True})
+ voices.put(message)
is_speaking = True
while True:
data = stream.read(CHUNK)
- data = data.decode('ISO-8859-1')
- message = json.dumps({"chunk_size": args.chunk_size, "chunk_interval": args.chunk_interval, "audio": data, "is_speaking": is_speaking, "is_finished": is_finished})
+ message = data
voices.put(message)
await asyncio.sleep(0.005)
-async def record_from_scp():
+async def record_from_scp(chunk_begin,chunk_size):
import wave
global voices
is_finished = False
@@ -104,6 +106,8 @@
wavs = f_scp.readlines()
else:
wavs = [args.audio_in]
+ if chunk_size>0:
+ wavs=wavs[chunk_begin:chunk_begin+chunk_size]
for wav in wavs:
wav_splits = wav.strip().split()
wav_name = wav_splits[0] if len(wav_splits) > 1 else "demo"
@@ -122,15 +126,21 @@
stride = int(60*args.chunk_size[1]/args.chunk_interval/1000*16000*2)
chunk_num = (len(audio_bytes)-1)//stride + 1
# print(stride)
+
+ # send first time
+ message = json.dumps({"chunk_size": args.chunk_size, "chunk_interval": args.chunk_interval, "wav_name": wav_name,"is_speaking": True})
+ voices.put(message)
is_speaking = True
for i in range(chunk_num):
- if i == chunk_num-1:
- is_speaking = False
+
beg = i*stride
data = audio_bytes[beg:beg+stride]
- data = data.decode('ISO-8859-1')
- message = json.dumps({"chunk_size": args.chunk_size, "chunk_interval": args.chunk_interval, "is_speaking": is_speaking, "audio": data, "is_finished": is_finished, "wav_name": wav_name})
+ message = data
voices.put(message)
+ if i == chunk_num-1:
+ is_speaking = False
+ message = json.dumps({"is_speaking": is_speaking})
+ voices.put(message)
# print("data_chunk: ", len(data_chunk))
# print(voices.qsize())
sleep_duration = 0.001 if args.send_without_sleep else 60*args.chunk_size[1]/args.chunk_interval/1000
@@ -213,27 +223,47 @@
traceback.print_exc()
exit(0)
-async def ws_client(id):
+async def ws_client(id,chunk_begin,chunk_size):
global websocket
uri = "ws://{}:{}".format(args.host, args.port)
async for websocket in websockets.connect(uri, subprotocols=["binary"], ping_interval=None):
if args.audio_in is not None:
- task = asyncio.create_task(record_from_scp())
+ task = asyncio.create_task(record_from_scp(chunk_begin,chunk_size))
else:
task = asyncio.create_task(record_microphone())
task2 = asyncio.create_task(ws_send())
task3 = asyncio.create_task(message(id))
await asyncio.gather(task, task2, task3)
-def one_thread(id):
- asyncio.get_event_loop().run_until_complete(ws_client(id))
+def one_thread(id,chunk_begin,chunk_size):
+ asyncio.get_event_loop().run_until_complete(ws_client(id,chunk_begin,chunk_size))
asyncio.get_event_loop().run_forever()
if __name__ == '__main__':
+ # calculate the number of wavs for each preocess
+ if args.audio_in.endswith(".scp"):
+ f_scp = open(args.audio_in)
+ wavs = f_scp.readlines()
+ else:
+ wavs = [args.audio_in]
+ total_len=len(wavs)
+ if total_len>=args.test_thread_num:
+ chunk_size=int((total_len)/args.test_thread_num)
+ remain_wavs=total_len-chunk_size*args.test_thread_num
+ else:
+ chunk_size=0
+
process_list = []
- for i in range(args.test_thread_num):
- p = Process(target=one_thread,args=(i,))
+ chunk_begin=0
+ for i in range(args.test_thread_num):
+ now_chunk_size= chunk_size
+ if remain_wavs>0:
+ now_chunk_size=chunk_size+1
+ remain_wavs=remain_wavs-1
+ # process i handle wavs at chunk_begin and size of now_chunk_size
+ p = Process(target=one_thread,args=(i,chunk_begin,now_chunk_size))
+ chunk_begin=chunk_begin+now_chunk_size
p.start()
process_list.append(p)
--
Gitblit v1.9.1