From d7f4fe61ff73d6578720e96258d470fcba7e16f6 Mon Sep 17 00:00:00 2001
From: 雾聪 <wucong.lyb@alibaba-inc.com>
Date: 星期四, 30 十一月 2023 10:43:52 +0800
Subject: [PATCH] Revert "update CMakeLists.txt"
---
runtime/websocket/bin/funasr-wss-server-2pass.cpp | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/runtime/websocket/bin/funasr-wss-server-2pass.cpp b/runtime/websocket/bin/funasr-wss-server-2pass.cpp
index 2ad20a4..f0a4251 100644
--- a/runtime/websocket/bin/funasr-wss-server-2pass.cpp
+++ b/runtime/websocket/bin/funasr-wss-server-2pass.cpp
@@ -4,14 +4,6 @@
*/
/* 2022-2023 by zhaomingwork */
-// io server
-// Usage:funasr-wss-server [--model_thread_num <int>] [--decoder_thread_num
-// <int>]
-// [--io_thread_num <int>] [--port <int>] [--listen_ip
-// <string>] [--punc-quant <string>] [--punc-dir <string>]
-// [--vad-quant <string>] [--vad-dir <string>] [--quantize
-// <string>] --model-dir <string> [--] [--version] [-h]
-
#include "websocket-server-2pass.h"
#ifdef _WIN32
#include "win_func.h"
@@ -36,8 +28,11 @@
try {
google::InitGoogleLogging(argv[0]);
FLAGS_logtostderr = true;
-
- TCLAP::CmdLine cmd("funasr-wss-server", ' ', "1.0");
+ std::string tpass_version = "";
+#ifdef _WIN32
+ tpass_version = "0.1.0";
+#endif
+ TCLAP::CmdLine cmd("funasr-wss-server", ' ', tpass_version);
TCLAP::ValueArg<std::string> download_model_dir(
"", "download-model-dir",
"Download model from Modelscope to download_model_dir", false,
@@ -447,7 +442,7 @@
funasr::ExtractHws(hotword_path, hws_map_);
bool is_ssl = false;
- if (!s_certfile.empty()) {
+ if (!s_certfile.empty() && access(s_certfile.c_str(), F_OK) == 0) {
is_ssl = true;
}
@@ -462,6 +457,8 @@
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 +467,7 @@
// 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 +477,15 @@
// 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;
--
Gitblit v1.9.1