From 3f366d6ed4a92919d02b9501fad655d7268dd6b2 Mon Sep 17 00:00:00 2001
From: 雾聪 <wucong.lyb@alibaba-inc.com>
Date: 星期六, 30 十二月 2023 21:47:49 +0800
Subject: [PATCH] update funasr-wss-client
---
runtime/websocket/bin/websocket-server.cpp | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/runtime/websocket/bin/websocket-server.cpp b/runtime/websocket/bin/websocket-server.cpp
index 6ba4537..42bc60a 100644
--- a/runtime/websocket/bin/websocket-server.cpp
+++ b/runtime/websocket/bin/websocket-server.cpp
@@ -68,13 +68,13 @@
int audio_fs,
std::string wav_format,
FUNASR_DEC_HANDLE& decoder_handle) {
- scoped_lock guard(thread_lock);
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 stamp_sents;
try{
FUNASR_RESULT Result = FunOfflineInferBuffer(
asr_handle, buffer.data(), buffer.size(), RASR_NONE, NULL,
@@ -82,6 +82,7 @@
asr_result = ((FUNASR_RECOG_RESULT*)Result)->msg; // get decode result
stamp_res = ((FUNASR_RECOG_RESULT*)Result)->stamp;
+ stamp_sents = ((FUNASR_RECOG_RESULT*)Result)->stamp_sents;
FunASRFreeResult(Result);
}catch (std::exception const& e) {
LOG(ERROR) << e.what();
@@ -95,6 +96,9 @@
jsonresult["is_final"] = false;
if(stamp_res != ""){
jsonresult["timestamp"] = stamp_res;
+ }
+ if(stamp_sents != ""){
+ jsonresult["stamp_sents"] = stamp_sents;
}
jsonresult["wav_name"] = wav_name;
@@ -130,6 +134,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,7 +149,7 @@
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;
FUNASR_DEC_HANDLE decoder_handle =
@@ -227,7 +232,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++;
@@ -343,7 +348,9 @@
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));
--
Gitblit v1.9.1