From b63e73ae4f5df9d4ed9fb0bee12ac2cc09d7f523 Mon Sep 17 00:00:00 2001
From: zhaomingwork <zhaomingwork@qq.com>
Date: 星期五, 19 五月 2023 14:30:13 +0800
Subject: [PATCH] add asr wss address input to html
---
funasr/runtime/websocket/websocketsrv.h | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/funasr/runtime/websocket/websocketsrv.h b/funasr/runtime/websocket/websocketsrv.h
index e484724..82d717e 100644
--- a/funasr/runtime/websocket/websocketsrv.h
+++ b/funasr/runtime/websocket/websocketsrv.h
@@ -46,6 +46,11 @@
float snippet_time;
} FUNASR_RECOG_RESULT;
+typedef struct {
+ nlohmann::json msg;
+ std::shared_ptr<std::vector<char>> samples;
+} FUNASR_MESSAGE;
+
class WebSocketServer {
public:
WebSocketServer(asio::io_context& io_decoder, server* server_)
@@ -67,7 +72,7 @@
server_->clear_access_channels(websocketpp::log::alevel::all);
}
void do_decoder(const std::vector<char>& buffer,
- websocketpp::connection_hdl& hdl);
+ websocketpp::connection_hdl& hdl, const nlohmann::json& msg);
void initAsr(std::map<std::string, std::string>& model_path, int thread_num);
void on_message(websocketpp::connection_hdl hdl, message_ptr msg);
@@ -84,9 +89,10 @@
// use map to keep the received samples data from one connection in offline
// engine. if for online engline, a data struct is needed(TODO)
- std::map<websocketpp::connection_hdl, std::shared_ptr<std::vector<char>>,
+
+ std::map<websocketpp::connection_hdl, std::shared_ptr<FUNASR_MESSAGE>,
std::owner_less<websocketpp::connection_hdl>>
- sample_map;
+ data_map;
websocketpp::lib::mutex m_lock; // mutex for sample_map
};
--
Gitblit v1.9.1