Sfoglia il codice sorgente

update funasrruntime.cpp

雾聪 2 anni fa
parent
commit
e75ddf9dbb
1 ha cambiato i file con 12 aggiunte e 12 eliminazioni
  1. 12 12
      funasr/runtime/onnxruntime/src/funasrruntime.cpp

+ 12 - 12
funasr/runtime/onnxruntime/src/funasrruntime.cpp

@@ -248,6 +248,7 @@ extern "C" {
 		int n_step = 0;
 		int n_step = 0;
 		int n_total = audio.GetQueueSize();
 		int n_total = audio.GetQueueSize();
 		float start_time = 0.0;
 		float start_time = 0.0;
+		std::string cur_stamp = "[";
 		while (audio.Fetch(buff, len, flag, start_time) > 0) {
 		while (audio.Fetch(buff, len, flag, start_time) > 0) {
 			string msg = (offline_stream->asr_handle)->Forward(buff, len, true, hw_emb);
 			string msg = (offline_stream->asr_handle)->Forward(buff, len, true, hw_emb);
 			std::vector<std::string> msg_vec = funasr::split(msg, '|');
 			std::vector<std::string> msg_vec = funasr::split(msg, '|');
@@ -255,21 +256,20 @@ extern "C" {
 			//timestamp
 			//timestamp
 			if(msg_vec.size() > 1){
 			if(msg_vec.size() > 1){
 				std::vector<std::string> msg_stamp = funasr::split(msg_vec[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){
 				for(int i=0; i<msg_stamp.size()-1; i+=2){
 					float begin = std::stof(msg_stamp[i])+start_time;
 					float begin = std::stof(msg_stamp[i])+start_time;
 					float end = std::stof(msg_stamp[i+1])+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++;
 			n_step++;
 			if (fn_callback)
 			if (fn_callback)
 				fn_callback(n_step, n_total);
 				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()){
 		if(offline_stream->UsePunc()){
 			string punc_res = (offline_stream->punc_handle)->AddPunc((p_result->msg).c_str());
 			string punc_res = (offline_stream->punc_handle)->AddPunc((p_result->msg).c_str());
 			p_result->msg = punc_res;
 			p_result->msg = punc_res;
@@ -311,6 +311,7 @@ extern "C" {
 		int n_step = 0;
 		int n_step = 0;
 		int n_total = audio.GetQueueSize();
 		int n_total = audio.GetQueueSize();
 		float start_time = 0.0;
 		float start_time = 0.0;
+		std::string cur_stamp = "[";
 		while (audio.Fetch(buff, len, flag, start_time) > 0) {
 		while (audio.Fetch(buff, len, flag, start_time) > 0) {
 			string msg = (offline_stream->asr_handle)->Forward(buff, len, true, hw_emb);
 			string msg = (offline_stream->asr_handle)->Forward(buff, len, true, hw_emb);
 			std::vector<std::string> msg_vec = funasr::split(msg, '|');
 			std::vector<std::string> msg_vec = funasr::split(msg, '|');
@@ -318,22 +319,21 @@ extern "C" {
 			//timestamp
 			//timestamp
 			if(msg_vec.size() > 1){
 			if(msg_vec.size() > 1){
 				std::vector<std::string> msg_stamp = funasr::split(msg_vec[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){
 				for(int i=0; i<msg_stamp.size()-1; i+=2){
 					float begin = std::stof(msg_stamp[i])+start_time;
 					float begin = std::stof(msg_stamp[i])+start_time;
 					float end = std::stof(msg_stamp[i+1])+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++;
 			n_step++;
 			if (fn_callback)
 			if (fn_callback)
 				fn_callback(n_step, n_total);
 				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()){
 		if(offline_stream->UsePunc()){
 			string punc_res = (offline_stream->punc_handle)->AddPunc((p_result->msg).c_str());
 			string punc_res = (offline_stream->punc_handle)->AddPunc((p_result->msg).c_str());
 			p_result->msg = punc_res;
 			p_result->msg = punc_res;