Browse Source

fix the issue of hotwords_embedding potentially being a null pointer

雾聪 2 years ago
parent
commit
74cf8b65b2

+ 0 - 8
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"

+ 0 - 6
runtime/websocket/bin/funasr-wss-server.cpp

@@ -4,12 +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.h"
 #ifdef _WIN32
 #include "win_func.h"

+ 5 - 3
runtime/websocket/bin/websocket-server-2pass.cpp

@@ -452,7 +452,9 @@ void WebSocketServer::on_message(websocketpp::connection_hdl hdl,
       LOG(INFO) << "jsonresult=" << jsonresult
                 << ", msg_data->msg=" << msg_data->msg;
       if ((jsonresult["is_speaking"] == false ||
-          jsonresult["is_finished"] == true) && msg_data->msg["is_eof"] != true) {
+          jsonresult["is_finished"] == true) && 
+          msg_data->msg["is_eof"] != true &&
+          msg_data->hotwords_embedding != NULL) {
         LOG(INFO) << "client done";
 
         // if it is in final message, post the sample_data to decode
@@ -503,9 +505,9 @@ void WebSocketServer::on_message(websocketpp::connection_hdl hdl,
 
           try{
             // post to decode
-            if (msg_data->msg["is_eof"] != true) {
+            if (msg_data->msg["is_eof"] != true && msg_data->hotwords_embedding != NULL) {
               std::vector<std::vector<float>> hotwords_embedding_(*(msg_data->hotwords_embedding));
-              msg_data->strand_->post( 
+              msg_data->strand_->post(
                         std::bind(&WebSocketServer::do_decoder, this,
                                   std::move(subvector), std::move(hdl),
                                   std::ref(msg_data->msg),

+ 3 - 1
runtime/websocket/bin/websocket-server.cpp

@@ -343,7 +343,9 @@ void WebSocketServer::on_message(websocketpp::connection_hdl hdl,
         msg_data->msg["itn"] = jsonresult["itn"];
       }
       if ((jsonresult["is_speaking"] == false ||
-          jsonresult["is_finished"] == true) && msg_data->msg["is_eof"] != true) {
+          jsonresult["is_finished"] == true) && 
+          msg_data->msg["is_eof"] != true && 
+          msg_data->hotwords_embedding != NULL) {
         LOG(INFO) << "client done";
         // for offline, send all receive data to decoder engine
         std::vector<std::vector<float>> hotwords_embedding_(*(msg_data->hotwords_embedding));