From 3f366d6ed4a92919d02b9501fad655d7268dd6b2 Mon Sep 17 00:00:00 2001
From: 雾聪 <wucong.lyb@alibaba-inc.com>
Date: 星期六, 30 十二月 2023 21:47:49 +0800
Subject: [PATCH] update funasr-wss-client
---
runtime/websocket/bin/funasr-wss-client.cpp | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/runtime/websocket/bin/funasr-wss-client.cpp b/runtime/websocket/bin/funasr-wss-client.cpp
index c4d933c..1dc9e3e 100644
--- a/runtime/websocket/bin/funasr-wss-client.cpp
+++ b/runtime/websocket/bin/funasr-wss-client.cpp
@@ -98,11 +98,12 @@
switch (msg->get_opcode()) {
case websocketpp::frame::opcode::text:
total_recv=total_recv+1;
- LOG(INFO)<< "Thread: " << this_thread::get_id() <<", on_message = " << payload;
- LOG(INFO)<< "Thread: " << this_thread::get_id() << ", total_recv=" << total_recv << " total_send=" <<total_send;
- if(total_recv==total_send)
+ LOG(INFO)<< "Thread: " << this_thread::get_id() << ", total_recv=" << total_recv <<", on_message = " << payload;
+ std::unique_lock<std::mutex> lock(msg_lock);
+ cv.notify_one();
+ if(close_client)
{
- LOG(INFO)<< "Thread: " << this_thread::get_id() << ", close client";
+ LOG(INFO)<< "Thread: " << this_thread::get_id() << ", close client thread";
websocketpp::lib::error_code ec;
m_client.close(m_hdl, websocketpp::close::status::going_away, "", ec);
if (ec){
@@ -141,14 +142,17 @@
if (i >= wav_list.size()) {
break;
}
+ if (total_send !=0){
+ std::unique_lock<std::mutex> lock(msg_lock);
+ cv.wait(lock);
+ }
total_send += 1;
send_wav_data(wav_list[i], wav_ids[i], audio_fs, hws_map, send_hotword, use_itn);
if(send_hotword){
send_hotword = false;
}
}
- WaitABit();
-
+ close_client = true;
asio_thread.join();
}
@@ -334,8 +338,11 @@
private:
websocketpp::connection_hdl m_hdl;
websocketpp::lib::mutex m_lock;
+ websocketpp::lib::mutex msg_lock;
+ websocketpp::lib::condition_variable cv;
bool m_open;
bool m_done;
+ bool close_client=false;
int total_send=0;
int total_recv=0;
};
--
Gitblit v1.9.1