From 55c09aeaa25b4bb88a50e09ba68fa6ff00a6d676 Mon Sep 17 00:00:00 2001
From: shixian.shi <shixian.shi@alibaba-inc.com>
Date: 星期一, 15 一月 2024 20:10:39 +0800
Subject: [PATCH] update readme, fix seaco bug
---
runtime/websocket/bin/websocket-server.cpp | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/runtime/websocket/bin/websocket-server.cpp b/runtime/websocket/bin/websocket-server.cpp
index 6ba4537..026954f 100644
--- a/runtime/websocket/bin/websocket-server.cpp
+++ b/runtime/websocket/bin/websocket-server.cpp
@@ -68,24 +68,27 @@
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 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);
+ if (Result != NULL){
+ asr_result = FunASRGetResult(Result, 0); // get decode result
+ stamp_res = FunASRGetStamp(Result);
+ stamp_sents = FunASRGetStampSents(Result);
+ FunASRFreeResult(Result);
+ } else{
+ LOG(ERROR) << "FUNASR_RESULT is NULL.";
+ }
}catch (std::exception const& e) {
LOG(ERROR) << e.what();
- return;
}
websocketpp::lib::error_code ec;
@@ -95,6 +98,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 +143,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 +158,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 +241,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 +357,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