From ec1f0f087fc3581defb6a3505d6e11e1bd81ca1d Mon Sep 17 00:00:00 2001
From: zhaomingwork <zhaomingwork@qq.com>
Date: 星期五, 12 五月 2023 15:00:06 +0800
Subject: [PATCH] Merge branch 'cpp-python-websocket-compatible' of github.com:zhaomingwork/FunASR into cpp-python-websocket-compatible
---
funasr/runtime/python/websocket/ws_client.py | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/funasr/runtime/python/websocket/ws_client.py b/funasr/runtime/python/websocket/ws_client.py
index 5ced688..f8632ce 100644
--- a/funasr/runtime/python/websocket/ws_client.py
+++ b/funasr/runtime/python/websocket/ws_client.py
@@ -84,12 +84,13 @@
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)
@@ -122,15 +123,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
@@ -189,7 +196,7 @@
text_print_2pass_online += " {}".format(text)
text_print = text_print_2pass_offline + text_print_2pass_online
else:
- text_print_2pass_online = " "
+ text_print_2pass_online = ""
text_print = text_print_2pass_offline + "{}".format(text)
text_print_2pass_offline += "{}".format(text)
text_print = text_print[-args.words_max_print:]
--
Gitblit v1.9.1