From 28ccfbfc51068a663a80764e14074df5edf2b5ba Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期五, 13 三月 2026 17:41:41 +0800
Subject: [PATCH] 提交
---
runtime/websocket/bin/websocket-server.cpp | 101 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 68 insertions(+), 33 deletions(-)
diff --git a/runtime/websocket/bin/websocket-server.cpp b/runtime/websocket/bin/websocket-server.cpp
index eeeafb7..74f1a2e 100644
--- a/runtime/websocket/bin/websocket-server.cpp
+++ b/runtime/websocket/bin/websocket-server.cpp
@@ -67,25 +67,32 @@
bool itn,
int audio_fs,
std::string wav_format,
- FUNASR_DEC_HANDLE& decoder_handle) {
- scoped_lock guard(thread_lock);
+ FUNASR_DEC_HANDLE& decoder_handle,
+ std::string svs_lang,
+ bool sys_itn) {
try {
int num_samples = buffer.size(); // the size of the buf
if (!buffer.empty() && hotwords_embedding.size() > 0) {
- std::string asr_result;
- std::string stamp_res;
+ std::string asr_result="";
+ std::string stamp_res="";
+ std::string stamp_sents="";
try{
FUNASR_RESULT Result = FunOfflineInferBuffer(
- asr_handle, buffer.data(), buffer.size(), RASR_NONE, NULL,
- hotwords_embedding, audio_fs, wav_format, itn, decoder_handle);
-
- asr_result = ((FUNASR_RECOG_RESULT*)Result)->msg; // get decode result
- stamp_res = ((FUNASR_RECOG_RESULT*)Result)->stamp;
- FunASRFreeResult(Result);
+ asr_handle, buffer.data(), buffer.size(), RASR_NONE, nullptr,
+ hotwords_embedding, audio_fs, wav_format, itn, decoder_handle,
+ svs_lang, sys_itn);
+ if (Result != nullptr){
+ asr_result = FunASRGetResult(Result, 0); // get decode result
+ stamp_res = FunASRGetStamp(Result);
+ stamp_sents = FunASRGetStampSents(Result);
+ FunASRFreeResult(Result);
+ } else{
+ std::this_thread::sleep_for(std::chrono::milliseconds(20));
+ LOG(ERROR) << "FUNASR_RESULT is nullptr.";
+ }
}catch (std::exception const& e) {
LOG(ERROR) << e.what();
- return;
}
websocketpp::lib::error_code ec;
@@ -95,6 +102,16 @@
jsonresult["is_final"] = false;
if(stamp_res != ""){
jsonresult["timestamp"] = stamp_res;
+ }
+ if(stamp_sents != ""){
+ try{
+ nlohmann::json json_stamp = nlohmann::json::parse(stamp_sents);
+ jsonresult["stamp_sents"] = json_stamp;
+ }catch (std::exception const &e)
+ {
+ LOG(ERROR)<<e.what();
+ jsonresult["stamp_sents"] = "";
+ }
}
jsonresult["wav_name"] = wav_name;
@@ -130,6 +147,7 @@
} catch (std::exception const& e) {
std::cerr << "Error: " << e.what() << std::endl;
}
+ scoped_lock guard(thread_lock);
msg["access_num"]=(int)msg["access_num"]-1;
}
@@ -144,8 +162,11 @@
data_msg->msg["wav_format"] = "pcm";
data_msg->msg["wav_name"] = "wav-default-id";
data_msg->msg["itn"] = true;
- data_msg->msg["audio_fs"] = 16000;
+ data_msg->msg["audio_fs"] = 16000; // default is 16k
data_msg->msg["access_num"] = 0; // the number of access for this object, when it is 0, we can free it saftly
+ data_msg->msg["is_eof"]=false;
+ data_msg->msg["svs_lang"]="auto";
+ data_msg->msg["svs_itn"]=true;
FUNASR_DEC_HANDLE decoder_handle =
FunASRWfstDecoderInit(asr_handle, ASR_OFFLINE, global_beam_, lattice_beam_, am_scale_);
data_msg->decoder_handle = decoder_handle;
@@ -226,7 +247,7 @@
data_msg->msg["is_eof"]=true;
guard_decoder.unlock();
to_remove.push_back(hdl);
- LOG(INFO)<<"connection is closed: "<<e.what();
+ LOG(INFO)<<"connection is closed.";
}
iter++;
@@ -250,6 +271,10 @@
auto it_data = data_map.find(hdl);
if (it_data != data_map.end()) {
msg_data = it_data->second;
+ if(msg_data->msg["is_eof"]){
+ lock.unlock();
+ return;
+ }
} else{
lock.unlock();
return;
@@ -274,7 +299,9 @@
}catch (std::exception const &e)
{
LOG(ERROR)<<e.what();
- break;
+ msg_data->msg["is_eof"]=true;
+ guard_decoder.unlock();
+ return;
}
if (jsonresult["wav_name"] != nullptr) {
@@ -285,7 +312,7 @@
}
// hotwords: fst/nn
- if(msg_data->hotwords_embedding == NULL){
+ if(msg_data->hotwords_embedding == nullptr){
std::unordered_map<std::string, int> merged_hws_map;
std::string nn_hotwords = "";
@@ -295,25 +322,22 @@
nlohmann::json json_fst_hws;
try{
json_fst_hws = nlohmann::json::parse(json_string);
+ if(json_fst_hws.type() == nlohmann::json::value_t::object){
+ // fst
+ try{
+ std::unordered_map<std::string, int> client_hws_map = json_fst_hws;
+ merged_hws_map.insert(client_hws_map.begin(), client_hws_map.end());
+ } catch (const std::exception& e) {
+ LOG(INFO) << e.what();
+ }
+ }
} catch (std::exception const &e)
{
LOG(ERROR)<<e.what();
- break;
- }
-
- if(json_fst_hws.type() == nlohmann::json::value_t::object){
- // fst
- try{
- std::unordered_map<std::string, int> client_hws_map = json_fst_hws;
- merged_hws_map.insert(client_hws_map.begin(), client_hws_map.end());
- } catch (const std::exception& e) {
- LOG(INFO) << e.what();
- }
- }else{
// nn
std::string client_nn_hws = jsonresult["hotwords"];
nn_hotwords += " " + client_nn_hws;
- LOG(INFO) << "nn hotwords: " << client_nn_hws;
+ // LOG(INFO) << "nn hotwords: " << client_nn_hws;
}
}
}
@@ -338,8 +362,16 @@
if (jsonresult.contains("itn")) {
msg_data->msg["itn"] = jsonresult["itn"];
}
- if (jsonresult["is_speaking"] == false ||
- jsonresult["is_finished"] == true) {
+ if (jsonresult.contains("svs_lang")) {
+ msg_data->msg["svs_lang"] = jsonresult["svs_lang"];
+ }
+ if (jsonresult.contains("svs_itn")) {
+ msg_data->msg["svs_itn"] = jsonresult["svs_itn"];
+ }
+ if ((jsonresult["is_speaking"] == false ||
+ jsonresult["is_finished"] == true) &&
+ msg_data->msg["is_eof"] != true &&
+ msg_data->hotwords_embedding != nullptr) {
LOG(INFO) << "client done";
// for offline, send all receive data to decoder engine
std::vector<std::vector<float>> hotwords_embedding_(*(msg_data->hotwords_embedding));
@@ -354,7 +386,9 @@
msg_data->msg["itn"],
msg_data->msg["audio_fs"],
msg_data->msg["wav_format"],
- std::ref(msg_data->decoder_handle)));
+ std::ref(msg_data->decoder_handle),
+ msg_data->msg["svs_lang"],
+ msg_data->msg["svs_itn"]));
msg_data->msg["access_num"]=(int)(msg_data->msg["access_num"])+1;
}
break;
@@ -376,15 +410,16 @@
default:
break;
}
+ guard_decoder.unlock();
}
// init asr model
void WebSocketServer::initAsr(std::map<std::string, std::string>& model_path,
- int thread_num) {
+ int thread_num, bool use_gpu, int batch_size) {
try {
// init model with api
- asr_handle = FunOfflineInit(model_path, thread_num);
+ asr_handle = FunOfflineInit(model_path, thread_num, use_gpu, batch_size);
LOG(INFO) << "model successfully inited";
LOG(INFO) << "initAsr run check_and_clean_connection";
--
Gitblit v1.9.1