From 9dad49c3a1f2495384bab4cc3763e4f8a461da00 Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期六, 13 五月 2023 00:20:19 +0800
Subject: [PATCH] websocket new version for offline 2pass send bytes
---
funasr/runtime/python/websocket/ws_client.py | 58 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 13 deletions(-)
diff --git a/funasr/runtime/python/websocket/ws_client.py b/funasr/runtime/python/websocket/ws_client.py
index f8632ce..45c745a 100644
--- a/funasr/runtime/python/websocket/ws_client.py
+++ b/funasr/runtime/python/websocket/ws_client.py
@@ -84,9 +84,9 @@
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})
+
+ message = json.dumps({"chunk_size": args.chunk_size, "chunk_interval": args.chunk_interval, "wav_name": "microphone", "is_speaking": True})
voices.put(message)
- is_speaking = True
while True:
data = stream.read(CHUNK)
@@ -96,7 +96,7 @@
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
@@ -105,6 +105,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"
@@ -143,9 +145,6 @@
sleep_duration = 0.001 if args.send_without_sleep else 60*args.chunk_size[1]/args.chunk_interval/1000
await asyncio.sleep(sleep_duration)
- is_finished = True
- message = json.dumps({"is_finished": is_finished})
- voices.put(message)
async def ws_send():
global voices
@@ -220,27 +219,27 @@
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__':
process_list = []
- for i in range(args.test_thread_num):
- p = Process(target=one_thread,args=(i,))
+ for i in range(args.test_thread_num):
+ p = Process(target=one_thread,args=(i, 0, 0))
p.start()
process_list.append(p)
@@ -248,5 +247,38 @@
p.join()
print('end')
-
+
+#
+# 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 = []
+# 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)
+#
+# for i in process_list:
+# p.join()
+#
+# print('end')
+#
--
Gitblit v1.9.1