remove the wavfile parsing for clients

雾聪

2023-12-19 d3c96905686604aecac5df92f543786174b840f8

 runtime/onnxruntime/src/funasrruntime.cpp

@@ -57,7 +57,7 @@
      if (!recog_obj)
         return nullptr;

      funasr::Audio audio(1);
      funasr::Audio audio(recog_obj->GetAsrSampleRate(),1);
      if(wav_format == "pcm" || wav_format == "PCM"){
         if (!audio.LoadPcmwav(sz_buf, n_len, &sampling_rate))
            return nullptr;
@@ -93,7 +93,7 @@
      if (!recog_obj)
         return nullptr;

      funasr::Audio audio(1);
      funasr::Audio audio(recog_obj->GetAsrSampleRate(),1);
      if(funasr::is_target_file(sz_filename, "wav")){
         int32_t sampling_rate_ = -1;
         if(!audio.LoadWav(sz_filename, &sampling_rate_))
@@ -134,7 +134,7 @@
      if (!vad_obj)
         return nullptr;

      funasr::Audio audio(1);
      funasr::Audio audio(vad_obj->GetVadSampleRate(),1);
      if(wav_format == "pcm" || wav_format == "PCM"){
         if (!audio.LoadPcmwav(sz_buf, n_len, &sampling_rate))
            return nullptr;
@@ -162,7 +162,7 @@
      if (!vad_obj)
         return nullptr;

      funasr::Audio audio(1);
      funasr::Audio audio(vad_obj->GetVadSampleRate(),1);
      if(funasr::is_target_file(sz_filename, "wav")){
         int32_t sampling_rate_ = -1;
         if(!audio.LoadWav(sz_filename, &sampling_rate_))
@@ -222,7 +222,7 @@
      if (!offline_stream)
         return nullptr;

      funasr::Audio audio(1);
      funasr::Audio audio(offline_stream->asr_handle->GetAsrSampleRate(),1);
      try{
         if(wav_format == "pcm" || wav_format == "PCM"){
            if (!audio.LoadPcmwav(sz_buf, n_len, &sampling_rate))
@@ -266,7 +266,7 @@
         if(msg_vec.size()==0){
            continue;
         }
         if(lang == "en-bpe" and p_result->msg != ""){
         if(lang == "en-bpe" && p_result->msg != ""){
            p_result->msg += " ";
         }
         p_result->msg += msg_vec[0];
@@ -294,10 +294,18 @@
#if !defined(__APPLE__)
      if(offline_stream->UseITN() && itn){
         string msg_itn = offline_stream->itn_handle->Normalize(p_result->msg);
         if(!(p_result->stamp).empty()){
            std::string new_stamp = funasr::TimestampSmooth(p_result->msg, msg_itn, p_result->stamp);
            if(!new_stamp.empty()){
               p_result->stamp = new_stamp;
            }
         }			
         p_result->msg = msg_itn;
      }
#endif

      if (!(p_result->stamp).empty()){
         p_result->stamp_sents = funasr::TimestampSentence(p_result->msg, p_result->stamp);
      }
      return p_result;
   }

@@ -308,7 +316,7 @@
      if (!offline_stream)
         return nullptr;
      
      funasr::Audio audio(1);
      funasr::Audio audio((offline_stream->asr_handle)->GetAsrSampleRate(),1);
      try{
         if(funasr::is_target_file(sz_filename, "wav")){
            int32_t sampling_rate_ = -1;
@@ -355,7 +363,7 @@
         if(msg_vec.size()==0){
            continue;
         }
         if(lang == "en-bpe" and p_result->msg != ""){
         if(lang == "en-bpe" && p_result->msg != ""){
            p_result->msg += " ";
         }
         p_result->msg += msg_vec[0];
@@ -384,9 +392,18 @@
#if !defined(__APPLE__)
      if(offline_stream->UseITN() && itn){
         string msg_itn = offline_stream->itn_handle->Normalize(p_result->msg);
         if(!(p_result->stamp).empty()){
            std::string new_stamp = funasr::TimestampSmooth(p_result->msg, msg_itn, p_result->stamp);
            if(!new_stamp.empty()){
               p_result->stamp = new_stamp;
            }
         }
         p_result->msg = msg_itn;
      }
#endif
      if (!(p_result->stamp).empty()){
         p_result->stamp_sents = funasr::TimestampSentence(p_result->msg, p_result->stamp);
      }
      return p_result;
   }

@@ -524,10 +541,19 @@
#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

         if (!(p_result->stamp).empty()){
            p_result->stamp_sents = funasr::TimestampSentence(p_result->tpass_msg, p_result->stamp);
         }
         if(frame != NULL){
            delete frame;
            frame = NULL;
@@ -584,6 +610,15 @@
      return p_result->stamp.c_str();
   }

      _FUNASRAPI const char* FunASRGetStampSents(FUNASR_RESULT result)
   {
      funasr::FUNASR_RECOG_RESULT * p_result = (funasr::FUNASR_RECOG_RESULT*)result;
      if(!p_result)
         return nullptr;

      return p_result->stamp_sents.c_str();
   }

   _FUNASRAPI const char* FunASRGetTpassResult(FUNASR_RESULT result,int n_index)
   {
      funasr::FUNASR_RECOG_RESULT * p_result = (funasr::FUNASR_RECOG_RESULT*)result;