Merge branch 'main' of github.com:alibaba-damo-academy/FunASR merge

游雁

2024-10-29 7edad6fba36a7527c1857a38b77a0277e8fde582

 runtime/onnxruntime/src/funasrruntime.cpp

@@ -482,7 +482,8 @@
   _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, 
                                     const std::vector<std::vector<float>> &hw_emb, bool itn, FUNASR_DEC_HANDLE dec_handle)
                                     const std::vector<std::vector<float>> &hw_emb, bool itn, FUNASR_DEC_HANDLE dec_handle,
                                     std::string svs_lang, bool svs_itn)
   {
      funasr::TpassStream* tpass_stream = (funasr::TpassStream*)handle;
      funasr::TpassOnlineStream* tpass_online_stream = (funasr::TpassOnlineStream*)online_handle;
@@ -525,7 +526,7 @@

      funasr::AudioFrame* frame = nullptr;
      while(audio->FetchChunck(frame) > 0){
         string msg = ((funasr::ParaformerOnline*)asr_online_handle)->Forward(frame->data, frame->len, frame->is_final);
         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){
@@ -567,7 +568,12 @@
           len = new int[1];
         buff[0] = frame->data;
         len[0] = frame->len;
         vector<string> msgs = ((funasr::Paraformer*)asr_handle)->Forward(buff, len, frame->is_final, hw_emb, dec_handle);
         vector<string> msgs;
         if(tpass_stream->GetModelType() == MODEL_SVS){
            msgs = (tpass_stream->asr_handle)->Forward(buff, len, true, svs_lang, svs_itn, 1);
         }else{
            msgs = (tpass_stream->asr_handle)->Forward(buff, len, true, hw_emb, dec_handle, 1);
         }
         string msg = msgs.size()>0?msgs[0]:"";
         std::vector<std::string> msg_vec = funasr::SplitStr(msg, " | ");  // split with timestamp
         if(msg_vec.size()==0){
@@ -589,24 +595,29 @@
            p_result->stamp += cur_stamp + "]";
         }

         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 !defined(__APPLE__)
         if(tpass_stream->UseITN() && itn){
            string msg_itn = tpass_stream->itn_handle->Normalize(msg_punc);
            // TimestampSmooth
            if(!(p_result->stamp).empty()){
               std::string new_stamp = funasr::TimestampSmooth(p_result->tpass_msg, msg_itn, p_result->stamp);
               if(!new_stamp.empty()){
                  p_result->stamp = new_stamp;
               }
         if (tpass_stream->GetModelType() == MODEL_PARA){
            string msg_punc = punc_online_handle->AddPunc(msg.c_str(), punc_cache[1]);
            if(input_finished){
               msg_punc += "。";
            }
            p_result->tpass_msg = msg_itn;
         }
            p_result->tpass_msg = msg_punc;

#if !defined(__APPLE__)
            if(tpass_stream->UseITN() && itn){
               string msg_itn = tpass_stream->itn_handle->Normalize(msg_punc);
               // TimestampSmooth
               if(!(p_result->stamp).empty()){
                  std::string new_stamp = funasr::TimestampSmooth(p_result->tpass_msg, msg_itn, p_result->stamp);
                  if(!new_stamp.empty()){
                     p_result->stamp = new_stamp;
                  }
               }
               p_result->tpass_msg = msg_itn;
            }
#endif
         }else{
            p_result->tpass_msg = msg;
         }
         if (!(p_result->stamp).empty()){
            p_result->stamp_sents = funasr::TimestampSentence(p_result->tpass_msg, p_result->stamp);
         }