From 948b68774cebf2b9a2994b7b9b8102f9637a98f3 Mon Sep 17 00:00:00 2001 From: Shi Xian <40013335+R1ckShi@users.noreply.github.com> Date: 星期二, 16 一月 2024 11:03:55 +0800 Subject: [PATCH] Merge pull request #1249 from alibaba-damo-academy/main --- runtime/websocket/bin/websocket-server-2pass.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/runtime/websocket/bin/websocket-server-2pass.h b/runtime/websocket/bin/websocket-server-2pass.h index 6b2ba32..7938f88 100644 --- a/runtime/websocket/bin/websocket-server-2pass.h +++ b/runtime/websocket/bin/websocket-server-2pass.h @@ -55,13 +55,13 @@ nlohmann::json msg; std::shared_ptr<std::vector<char>> samples; std::shared_ptr<std::vector<std::vector<std::string>>> punc_cache; - std::shared_ptr<std::vector<std::vector<float>>> hotwords_embedding=NULL; + std::shared_ptr<std::vector<std::vector<float>>> hotwords_embedding=nullptr; std::shared_ptr<websocketpp::lib::mutex> thread_lock; // lock for each connection - FUNASR_HANDLE tpass_online_handle=NULL; + FUNASR_HANDLE tpass_online_handle=nullptr; std::string online_res = ""; std::string tpass_res = ""; std::shared_ptr<asio::io_context::strand> strand_; // for data execute in order - FUNASR_DEC_HANDLE decoder_handle=NULL; + FUNASR_DEC_HANDLE decoder_handle=nullptr; } FUNASR_MESSAGE; // See https://wiki.mozilla.org/Security/Server_Side_TLS for more details about @@ -139,7 +139,7 @@ asio::io_context& io_decoder_; // threads for asr decoder // std::ofstream fout; // FUNASR_HANDLE asr_handle; // asr engine handle - FUNASR_HANDLE tpass_handle=NULL; + FUNASR_HANDLE tpass_handle=nullptr; bool isonline = true; // online or offline engine, now only support offline bool is_ssl = true; server* server_; // websocket server -- Gitblit v1.9.1