speech_recognition/FunASR
1
0
Fork 0
mirror of https://github.com/modelscope/FunASR synced 2025-09-15 14:48:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix vc compatibility (#1091)

Browse Source
This commit is contained in:
cdevelop 2023-11-15 10:39:08 +08:00 committed by GitHub
parent fe3944d1ce
commit 397f4d4b7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
runtime/websocket/bin/funasr-wss-server-2pass.cpp
View File

@ -462,6 +462,8 @@ int main(int argc, char* argv[]) {
server server_; // server for websocket
wss_server wss_server_;
server* server = nullptr;
wss_server* wss_server = nullptr;
if (is_ssl) {
LOG(INFO)<< "SSL is opened!";
wss_server_.init_asio(&io_server); // init asio
@ -470,10 +472,7 @@ int main(int argc, char* argv[]) {
// list on port for accept
wss_server_.listen(asio::ip::address::from_string(s_listen_ip), s_port);
WebSocketServer websocket_srv(
io_decoder, is_ssl, nullptr, &wss_server_, s_certfile,
s_keyfile); // websocket server for asr engine
websocket_srv.initAsr(model_path, s_model_thread_num); // init asr model
wss_server = &wss_server_;
} else {
LOG(INFO)<< "SSL is closed!";
@ -483,12 +482,15 @@ int main(int argc, char* argv[]) {
// list on port for accept
server_.listen(asio::ip::address::from_string(s_listen_ip), s_port);
WebSocketServer websocket_srv(
io_decoder, is_ssl, &server_, nullptr, s_certfile,
s_keyfile); // websocket server for asr engine
websocket_srv.initAsr(model_path, s_model_thread_num); // init asr model
server = &server_;
}
WebSocketServer websocket_srv(
io_decoder, is_ssl, server, wss_server, s_certfile,
s_keyfile); // websocket server for asr engine
websocket_srv.initAsr(model_path, s_model_thread_num); // init asr model
LOG(INFO) << "decoder-thread-num: " << s_decoder_thread_num;
LOG(INFO) << "io-thread-num: " << s_io_thread_num;
LOG(INFO) << "model-thread-num: " << s_model_thread_num;

19
runtime/websocket/bin/funasr-wss-server.cpp
View File

@ -440,6 +440,8 @@ int main(int argc, char* argv[]) {
server server_; // server for websocket
wss_server wss_server_;
server* server = nullptr;
wss_server* wss_server = nullptr;
if (is_ssl) {
LOG(INFO)<< "SSL is opened!";
wss_server_.init_asio(&io_server); // init asio
@ -448,11 +450,7 @@ int main(int argc, char* argv[]) {
// list on port for accept
wss_server_.listen(asio::ip::address::from_string(s_listen_ip), s_port);
WebSocketServer websocket_srv(
io_decoder, is_ssl, nullptr, &wss_server_, s_certfile,
s_keyfile); // websocket server for asr engine
websocket_srv.initAsr(model_path, s_model_thread_num); // init asr model
wss_server = &wss_server_;
} else {
LOG(INFO)<< "SSL is closed!";
server_.init_asio(&io_server); // init asio
@ -461,12 +459,15 @@ int main(int argc, char* argv[]) {
// list on port for accept
server_.listen(asio::ip::address::from_string(s_listen_ip), s_port);
WebSocketServer websocket_srv(
io_decoder, is_ssl, &server_, nullptr, s_certfile,
s_keyfile); // websocket server for asr engine
websocket_srv.initAsr(model_path, s_model_thread_num); // init asr model
server = &server_;
}
WebSocketServer websocket_srv(
io_decoder, is_ssl, server, wss_server, s_certfile,
s_keyfile); // websocket server for asr engine
websocket_srv.initAsr(model_path, s_model_thread_num); // init asr model
LOG(INFO) << "decoder-thread-num: " << s_decoder_thread_num;
LOG(INFO) << "io-thread-num: " << s_io_thread_num;
LOG(INFO) << "model-thread-num: " << s_model_thread_num;