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 | 325 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 282 insertions(+), 43 deletions(-)
diff --git a/funasr/runtime/onnxruntime/src/funasrruntime.cpp b/funasr/runtime/onnxruntime/src/funasrruntime.cpp
index 69d9e96..a10e3ec 100644
--- a/funasr/runtime/onnxruntime/src/funasrruntime.cpp
+++ b/funasr/runtime/onnxruntime/src/funasrruntime.cpp
@@ -1,13 +1,20 @@
#include "precomp.h"
+#include <vector>
#ifdef __cplusplus
extern "C" {
#endif
// APIs for Init
- _FUNASRAPI FUNASR_HANDLE FunASRInit(std::map<std::string, std::string>& model_path, int thread_num)
+ _FUNASRAPI FUNASR_HANDLE FunASRInit(std::map<std::string, std::string>& model_path, int thread_num, ASR_TYPE type)
{
- funasr::Model* mm = funasr::CreateModel(model_path, thread_num);
+ funasr::Model* mm = funasr::CreateModel(model_path, thread_num, type);
+ return mm;
+ }
+
+ _FUNASRAPI FUNASR_HANDLE FunASROnlineInit(FUNASR_HANDLE asr_hanlde, std::vector<int> chunk_size)
+ {
+ funasr::Model* mm = funasr::CreateModel(asr_hanlde, chunk_size);
return mm;
}
@@ -23,9 +30,9 @@
return mm;
}
- _FUNASRAPI FUNASR_HANDLE CTTransformerInit(std::map<std::string, std::string>& model_path, int thread_num)
+ _FUNASRAPI FUNASR_HANDLE CTTransformerInit(std::map<std::string, std::string>& model_path, int thread_num, PUNC_TYPE type)
{
- funasr::PuncModel* mm = funasr::CreatePuncModel(model_path, thread_num);
+ funasr::PuncModel* mm = funasr::CreatePuncModel(model_path, thread_num, type);
return mm;
}
@@ -35,16 +42,32 @@
return mm;
}
+ _FUNASRAPI FUNASR_HANDLE FunTpassInit(std::map<std::string, std::string>& model_path, int thread_num)
+ {
+ funasr::TpassStream* mm = funasr::CreateTpassStream(model_path, thread_num);
+ return mm;
+ }
+
+ _FUNASRAPI FUNASR_HANDLE FunTpassOnlineInit(FUNASR_HANDLE tpass_handle, std::vector<int> chunk_size)
+ {
+ return funasr::CreateTpassOnlineStream(tpass_handle, chunk_size);
+ }
+
// APIs for ASR Infer
- _FUNASRAPI FUNASR_RESULT FunASRInferBuffer(FUNASR_HANDLE handle, const char* sz_buf, int n_len, FUNASR_MODE mode, QM_CALLBACK fn_callback, int sampling_rate)
+ _FUNASRAPI FUNASR_RESULT FunASRInferBuffer(FUNASR_HANDLE handle, const char* sz_buf, int n_len, FUNASR_MODE mode, QM_CALLBACK fn_callback, bool input_finished, int sampling_rate, std::string wav_format)
{
funasr::Model* recog_obj = (funasr::Model*)handle;
if (!recog_obj)
return nullptr;
funasr::Audio audio(1);
- if (!audio.LoadPcmwav(sz_buf, n_len, &sampling_rate))
- return nullptr;
+ if(wav_format == "pcm" || wav_format == "PCM"){
+ if (!audio.LoadPcmwav(sz_buf, n_len, &sampling_rate))
+ return nullptr;
+ }else{
+ if (!audio.FfmpegLoad(sz_buf, n_len))
+ return nullptr;
+ }
float* buff;
int len;
@@ -52,12 +75,12 @@
funasr::FUNASR_RECOG_RESULT* p_result = new funasr::FUNASR_RECOG_RESULT;
p_result->snippet_time = audio.GetTimeLen();
if(p_result->snippet_time == 0){
- return p_result;
- }
+ return p_result;
+ }
int n_step = 0;
int n_total = audio.GetQueueSize();
while (audio.Fetch(buff, len, flag) > 0) {
- string msg = recog_obj->Forward(buff, len, flag);
+ string msg = recog_obj->Forward(buff, len, input_finished);
p_result->msg += msg;
n_step++;
if (fn_callback)
@@ -82,8 +105,8 @@
if (!audio.LoadPcmwav(sz_filename, &sampling_rate))
return nullptr;
}else{
- LOG(ERROR)<<"Wrong wav extension";
- exit(-1);
+ if (!audio.FfmpegLoad(sz_filename))
+ return nullptr;
}
float* buff;
@@ -97,7 +120,7 @@
return p_result;
}
while (audio.Fetch(buff, len, flag) > 0) {
- string msg = recog_obj->Forward(buff, len, flag);
+ string msg = recog_obj->Forward(buff, len, true);
p_result->msg += msg;
n_step++;
if (fn_callback)
@@ -108,15 +131,20 @@
}
// APIs for VAD Infer
- _FUNASRAPI FUNASR_RESULT FsmnVadInferBuffer(FUNASR_HANDLE handle, const char* sz_buf, int n_len, QM_CALLBACK fn_callback, bool input_finished, int sampling_rate)
+ _FUNASRAPI FUNASR_RESULT FsmnVadInferBuffer(FUNASR_HANDLE handle, const char* sz_buf, int n_len, QM_CALLBACK fn_callback, bool input_finished, int sampling_rate, std::string wav_format)
{
funasr::VadModel* vad_obj = (funasr::VadModel*)handle;
if (!vad_obj)
return nullptr;
funasr::Audio audio(1);
- if (!audio.LoadPcmwav(sz_buf, n_len, &sampling_rate))
- return nullptr;
+ if(wav_format == "pcm" || wav_format == "PCM"){
+ if (!audio.LoadPcmwav(sz_buf, n_len, &sampling_rate))
+ return nullptr;
+ }else{
+ if (!audio.FfmpegLoad(sz_buf, n_len))
+ return nullptr;
+ }
funasr::FUNASR_VAD_RESULT* p_result = new funasr::FUNASR_VAD_RESULT;
p_result->snippet_time = audio.GetTimeLen();
@@ -146,8 +174,8 @@
if (!audio.LoadPcmwav(sz_filename, &sampling_rate))
return nullptr;
}else{
- LOG(ERROR)<<"Wrong wav extension";
- exit(-1);
+ if (!audio.FfmpegLoad(sz_filename))
+ return nullptr;
}
funasr::FUNASR_VAD_RESULT* p_result = new funasr::FUNASR_VAD_RESULT;
@@ -164,26 +192,51 @@
}
// APIs for PUNC Infer
- _FUNASRAPI const std::string CTTransformerInfer(FUNASR_HANDLE handle, const char* sz_sentence, FUNASR_MODE mode, QM_CALLBACK fn_callback)
+ _FUNASRAPI FUNASR_RESULT CTTransformerInfer(FUNASR_HANDLE handle, const char* sz_sentence, FUNASR_MODE mode, QM_CALLBACK fn_callback, PUNC_TYPE type, FUNASR_RESULT pre_result)
{
funasr::PuncModel* punc_obj = (funasr::PuncModel*)handle;
if (!punc_obj)
return nullptr;
+
+ FUNASR_RESULT p_result = nullptr;
+ if (type==PUNC_OFFLINE){
+ p_result = (FUNASR_RESULT)new funasr::FUNASR_PUNC_RESULT;
+ ((funasr::FUNASR_PUNC_RESULT*)p_result)->msg = punc_obj->AddPunc(sz_sentence);
+ }else if(type==PUNC_ONLINE){
+ if (!pre_result)
+ p_result = (FUNASR_RESULT)new funasr::FUNASR_PUNC_RESULT;
+ else
+ p_result = pre_result;
+ ((funasr::FUNASR_PUNC_RESULT*)p_result)->msg = punc_obj->AddPunc(sz_sentence, ((funasr::FUNASR_PUNC_RESULT*)p_result)->arr_cache);
+ }else{
+ LOG(ERROR) << "Wrong PUNC_TYPE";
+ exit(-1);
+ }
- string punc_res = punc_obj->AddPunc(sz_sentence);
- return punc_res;
+ return p_result;
}
// APIs for Offline-stream Infer
- _FUNASRAPI FUNASR_RESULT FunOfflineInferBuffer(FUNASR_HANDLE handle, const char* sz_buf, int n_len, FUNASR_MODE mode, QM_CALLBACK fn_callback, int sampling_rate)
+ _FUNASRAPI FUNASR_RESULT FunOfflineInferBuffer(FUNASR_HANDLE handle, const char* sz_buf, int n_len, FUNASR_MODE mode, QM_CALLBACK fn_callback, const std::vector<std::vector<float>> &hw_emb, int sampling_rate, std::string wav_format)
{
funasr::OfflineStream* offline_stream = (funasr::OfflineStream*)handle;
if (!offline_stream)
return nullptr;
funasr::Audio audio(1);
- if (!audio.LoadPcmwav(sz_buf, n_len, &sampling_rate))
- return nullptr;
+ if(wav_format == "pcm" || wav_format == "PCM"){
+ if (!audio.LoadPcmwav(sz_buf, n_len, &sampling_rate))
+ return nullptr;
+ }else{
+ if (!audio.FfmpegLoad(sz_buf, n_len))
+ return nullptr;
+ }
+
+ funasr::FUNASR_RECOG_RESULT* p_result = new funasr::FUNASR_RECOG_RESULT;
+ p_result->snippet_time = audio.GetTimeLen();
+ if(p_result->snippet_time == 0){
+ return p_result;
+ }
if(offline_stream->UseVad()){
audio.Split(offline_stream);
}
@@ -191,19 +244,34 @@
float* buff;
int len;
int flag = 0;
- funasr::FUNASR_RECOG_RESULT* p_result = new funasr::FUNASR_RECOG_RESULT;
- p_result->snippet_time = audio.GetTimeLen();
- if(p_result->snippet_time == 0){
- return p_result;
- }
+
int n_step = 0;
int n_total = audio.GetQueueSize();
- while (audio.Fetch(buff, len, flag) > 0) {
- string msg = (offline_stream->asr_handle)->Forward(buff, len, flag);
- p_result->msg += msg;
+ 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], ',');
+ 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))+"],";
+ }
+ }
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());
@@ -213,7 +281,7 @@
return p_result;
}
- _FUNASRAPI FUNASR_RESULT FunOfflineInfer(FUNASR_HANDLE handle, const char* sz_filename, FUNASR_MODE mode, QM_CALLBACK fn_callback, int sampling_rate)
+ _FUNASRAPI FUNASR_RESULT FunOfflineInfer(FUNASR_HANDLE handle, const char* sz_filename, FUNASR_MODE mode, QM_CALLBACK fn_callback, const std::vector<std::vector<float>> &hw_emb, int sampling_rate)
{
funasr::OfflineStream* offline_stream = (funasr::OfflineStream*)handle;
if (!offline_stream)
@@ -228,9 +296,14 @@
if (!audio.LoadPcmwav(sz_filename, &sampling_rate))
return nullptr;
}else{
- LOG(ERROR)<<"Wrong wav extension";
- exit(-1);
+ if (!audio.FfmpegLoad(sz_filename))
+ return nullptr;
}
+ funasr::FUNASR_RECOG_RESULT* p_result = new funasr::FUNASR_RECOG_RESULT;
+ p_result->snippet_time = audio.GetTimeLen();
+ if(p_result->snippet_time == 0){
+ return p_result;
+ }
if(offline_stream->UseVad()){
audio.Split(offline_stream);
}
@@ -240,23 +313,134 @@
int flag = 0;
int n_step = 0;
int n_total = audio.GetQueueSize();
- funasr::FUNASR_RECOG_RESULT* p_result = new funasr::FUNASR_RECOG_RESULT;
- p_result->snippet_time = audio.GetTimeLen();
- if(p_result->snippet_time == 0){
- return p_result;
- }
- while (audio.Fetch(buff, len, flag) > 0) {
- string msg = (offline_stream->asr_handle)->Forward(buff, len, flag);
- p_result->msg+= msg;
+ 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], ',');
+ 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))+"],";
+ }
+ }
+
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());
p_result->msg = punc_res;
}
+ return p_result;
+ }
+
+ _FUNASRAPI const std::vector<std::vector<float>> CompileHotwordEmbedding(FUNASR_HANDLE handle, std::string &hotwords) {
+ funasr::OfflineStream* offline_stream = (funasr::OfflineStream*)handle;
+ std::vector<std::vector<float>> emb;
+ if (!offline_stream)
+ return emb;
+ return (offline_stream->asr_handle)->CompileHotwordEmbedding(hotwords);
+ }
+
+ // APIs for 2pass-stream Infer
+ _FUNASRAPI FUNASR_RESULT FunTpassInferBuffer(FUNASR_HANDLE handle, FUNASR_HANDLE online_handle, const char* sz_buf, int n_len, std::vector<std::vector<std::string>> &punc_cache, bool input_finished, int sampling_rate, std::string wav_format, ASR_TYPE mode)
+ {
+ funasr::TpassStream* tpass_stream = (funasr::TpassStream*)handle;
+ funasr::TpassOnlineStream* tpass_online_stream = (funasr::TpassOnlineStream*)online_handle;
+ if (!tpass_stream || !tpass_online_stream)
+ return nullptr;
+
+ funasr::VadModel* vad_online_handle = (tpass_online_stream->vad_online_handle).get();
+ if (!vad_online_handle)
+ return nullptr;
+
+ funasr::Audio* audio = ((funasr::FsmnVadOnline*)vad_online_handle)->audio_handle.get();
+
+ funasr::Model* asr_online_handle = (tpass_online_stream->asr_online_handle).get();
+ if (!asr_online_handle)
+ return nullptr;
+ int chunk_len = ((funasr::ParaformerOnline*)asr_online_handle)->chunk_len;
+
+ funasr::Model* asr_handle = (tpass_stream->asr_handle).get();
+ if (!asr_handle)
+ return nullptr;
+
+ funasr::PuncModel* punc_online_handle = (tpass_stream->punc_online_handle).get();
+ if (!punc_online_handle)
+ return nullptr;
+
+ if(wav_format == "pcm" || wav_format == "PCM"){
+ if (!audio->LoadPcmwavOnline(sz_buf, n_len, &sampling_rate))
+ return nullptr;
+ }else{
+ // if (!audio->FfmpegLoad(sz_buf, n_len))
+ // return nullptr;
+ LOG(ERROR) <<"Wrong wav_format: " << wav_format ;
+ return nullptr;
+ }
+
+ funasr::FUNASR_RECOG_RESULT* p_result = new funasr::FUNASR_RECOG_RESULT;
+ p_result->snippet_time = audio->GetTimeLen();
+ // if(p_result->snippet_time == 0){
+ // return p_result;
+ // }
+
+ audio->Split(vad_online_handle, chunk_len, input_finished, mode);
+
+ funasr::AudioFrame* frame = NULL;
+ while(audio->FetchChunck(frame) > 0){
+ string msg = asr_online_handle->Forward(frame->data, frame->len, frame->is_final);
+ if(mode == ASR_ONLINE){
+ ((funasr::ParaformerOnline*)asr_online_handle)->online_res += msg;
+ if(frame->is_final){
+ string online_msg = ((funasr::ParaformerOnline*)asr_online_handle)->online_res;
+ string msg_punc = punc_online_handle->AddPunc(online_msg.c_str(), punc_cache[0]);
+ p_result->tpass_msg = msg_punc;
+ ((funasr::ParaformerOnline*)asr_online_handle)->online_res = "";
+ p_result->msg += msg;
+ }else{
+ p_result->msg += msg;
+ }
+ }else if(mode == ASR_TWO_PASS){
+ p_result->msg += msg;
+ }
+ if(frame != NULL){
+ delete frame;
+ frame = NULL;
+ }
+ }
+
+ while(audio->FetchTpass(frame) > 0){
+ string msg = asr_handle->Forward(frame->data, frame->len, frame->is_final);
+ string msg_punc = punc_online_handle->AddPunc(msg.c_str(), punc_cache[1]);
+ if(input_finished){
+ msg_punc += "銆�";
+ }
+ p_result->tpass_msg = msg_punc;
+ if(frame != NULL){
+ delete frame;
+ frame = NULL;
+ }
+ }
+
+ if(input_finished){
+ audio->ResetIndex();
+ }
+
return p_result;
}
@@ -295,6 +479,33 @@
return p_result->msg.c_str();
}
+ _FUNASRAPI const char* FunASRGetStamp(FUNASR_RESULT result)
+ {
+ funasr::FUNASR_RECOG_RESULT * p_result = (funasr::FUNASR_RECOG_RESULT*)result;
+ if(!p_result)
+ return nullptr;
+
+ return p_result->stamp.c_str();
+ }
+
+ _FUNASRAPI const char* FunASRGetTpassResult(FUNASR_RESULT result,int n_index)
+ {
+ funasr::FUNASR_RECOG_RESULT * p_result = (funasr::FUNASR_RECOG_RESULT*)result;
+ if(!p_result)
+ return nullptr;
+
+ return p_result->tpass_msg.c_str();
+ }
+
+ _FUNASRAPI const char* CTTransformerGetResult(FUNASR_RESULT result,int n_index)
+ {
+ funasr::FUNASR_PUNC_RESULT * p_result = (funasr::FUNASR_PUNC_RESULT*)result;
+ if(!p_result)
+ return nullptr;
+
+ return p_result->msg.c_str();
+ }
+
_FUNASRAPI vector<std::vector<int>>* FsmnVadGetResult(FUNASR_RESULT result,int n_index)
{
funasr::FUNASR_VAD_RESULT * p_result = (funasr::FUNASR_VAD_RESULT*)result;
@@ -310,6 +521,14 @@
if (result)
{
delete (funasr::FUNASR_RECOG_RESULT*)result;
+ }
+ }
+
+ _FUNASRAPI void CTTransformerFreeResult(FUNASR_RESULT result)
+ {
+ if (result)
+ {
+ delete (funasr::FUNASR_PUNC_RESULT*)result;
}
}
@@ -366,6 +585,26 @@
delete offline_stream;
}
+ _FUNASRAPI void FunTpassUninit(FUNASR_HANDLE handle)
+ {
+ funasr::TpassStream* tpass_stream = (funasr::TpassStream*)handle;
+
+ if (!tpass_stream)
+ return;
+
+ delete tpass_stream;
+ }
+
+ _FUNASRAPI void FunTpassOnlineUninit(FUNASR_HANDLE handle)
+ {
+ funasr::TpassOnlineStream* tpass_online_stream = (funasr::TpassOnlineStream*)handle;
+
+ if (!tpass_online_stream)
+ return;
+
+ delete tpass_online_stream;
+ }
+
#ifdef __cplusplus
}
--
Gitblit v1.9.1