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 | 63 ++++++++++++++++++-------------
1 files changed, 36 insertions(+), 27 deletions(-)
diff --git a/funasr/runtime/python/websocket/ws_client.py b/funasr/runtime/python/websocket/ws_client.py
index 7ae44df..45c745a 100644
--- a/funasr/runtime/python/websocket/ws_client.py
+++ b/funasr/runtime/python/websocket/ws_client.py
@@ -85,9 +85,8 @@
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)
@@ -146,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
@@ -241,29 +237,9 @@
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 = Process(target=one_thread,args=(i, 0, 0))
p.start()
process_list.append(p)
@@ -271,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