From c2e4e3c2e9be855277d9f4fa9cd0544892ff829a Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期三, 30 八月 2023 09:57:30 +0800
Subject: [PATCH] Merge branch 'main' of github.com:alibaba-damo-academy/FunASR add
---
funasr/runtime/onnxruntime/src/funasrruntime.cpp | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/funasr/runtime/onnxruntime/src/funasrruntime.cpp b/funasr/runtime/onnxruntime/src/funasrruntime.cpp
index 082d309..a10e3ec 100644
--- a/funasr/runtime/onnxruntime/src/funasrruntime.cpp
+++ b/funasr/runtime/onnxruntime/src/funasrruntime.cpp
@@ -248,27 +248,30 @@
int n_step = 0;
int n_total = audio.GetQueueSize();
float start_time = 0.0;
+ std::string cur_stamp = "[";
while (audio.Fetch(buff, len, flag, start_time) > 0) {
string msg = (offline_stream->asr_handle)->Forward(buff, len, true, hw_emb);
std::vector<std::string> msg_vec = funasr::split(msg, '|');
+ if(msg_vec.size()==0){
+ continue;
+ }
p_result->msg += msg_vec[0];
//timestamp
if(msg_vec.size() > 1){
std::vector<std::string> msg_stamp = funasr::split(msg_vec[1], ',');
- std::string cur_stamp = "[";
for(int i=0; i<msg_stamp.size()-1; i+=2){
float begin = std::stof(msg_stamp[i])+start_time;
float end = std::stof(msg_stamp[i+1])+start_time;
- cur_stamp += "["+std::to_string((int)(1000*begin))+","+std::to_string((int)(1000*end))+"]";
- if(i != msg_stamp.size()-2){
- cur_stamp +=",";
- }
+ cur_stamp += "["+std::to_string((int)(1000*begin))+","+std::to_string((int)(1000*end))+"],";
}
- p_result->stamp += cur_stamp + "]";
}
n_step++;
if (fn_callback)
fn_callback(n_step, n_total);
+ }
+ if(cur_stamp != "["){
+ cur_stamp.erase(cur_stamp.length() - 1);
+ p_result->stamp += cur_stamp + "]";
}
if(offline_stream->UsePunc()){
string punc_res = (offline_stream->punc_handle)->AddPunc((p_result->msg).c_str());
@@ -311,28 +314,31 @@
int n_step = 0;
int n_total = audio.GetQueueSize();
float start_time = 0.0;
+ std::string cur_stamp = "[";
while (audio.Fetch(buff, len, flag, start_time) > 0) {
string msg = (offline_stream->asr_handle)->Forward(buff, len, true, hw_emb);
std::vector<std::string> msg_vec = funasr::split(msg, '|');
+ if(msg_vec.size()==0){
+ continue;
+ }
p_result->msg += msg_vec[0];
//timestamp
if(msg_vec.size() > 1){
std::vector<std::string> msg_stamp = funasr::split(msg_vec[1], ',');
- std::string cur_stamp = "[";
for(int i=0; i<msg_stamp.size()-1; i+=2){
float begin = std::stof(msg_stamp[i])+start_time;
float end = std::stof(msg_stamp[i+1])+start_time;
- cur_stamp += "["+std::to_string((int)(1000*begin))+","+std::to_string((int)(1000*end))+"]";
- if(i != msg_stamp.size()-2){
- cur_stamp +=",";
- }
+ cur_stamp += "["+std::to_string((int)(1000*begin))+","+std::to_string((int)(1000*end))+"],";
}
- p_result->stamp += cur_stamp + "]";
}
n_step++;
if (fn_callback)
fn_callback(n_step, n_total);
+ }
+ if(cur_stamp != "["){
+ cur_stamp.erase(cur_stamp.length() - 1);
+ p_result->stamp += cur_stamp + "]";
}
if(offline_stream->UsePunc()){
string punc_res = (offline_stream->punc_handle)->AddPunc((p_result->msg).c_str());
@@ -384,7 +390,7 @@
// if (!audio->FfmpegLoad(sz_buf, n_len))
// return nullptr;
LOG(ERROR) <<"Wrong wav_format: " << wav_format ;
- exit(-1);
+ return nullptr;
}
funasr::FUNASR_RECOG_RESULT* p_result = new funasr::FUNASR_RECOG_RESULT;
--
Gitblit v1.9.1