From 4f8bce944e273e317cb84c7046ea514b9d958b4b Mon Sep 17 00:00:00 2001
From: zhuzizyf <42790740+zhuzizyf@users.noreply.github.com>
Date: 星期六, 22 四月 2023 14:54:49 +0800
Subject: [PATCH] Update FsmnVad.cc

---
 funasr/runtime/onnxruntime/src/paraformer_onnx.h |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/funasr/runtime/onnxruntime/src/paraformer_onnx.h b/funasr/runtime/onnxruntime/src/paraformer_onnx.h
index 8946ae1..b0712b4 100644
--- a/funasr/runtime/onnxruntime/src/paraformer_onnx.h
+++ b/funasr/runtime/onnxruntime/src/paraformer_onnx.h
@@ -4,27 +4,31 @@
 #ifndef PARAFORMER_MODELIMP_H
 #define PARAFORMER_MODELIMP_H
 
+#include "precomp.h"
+
 namespace paraformer {
 
     class ModelImp : public Model {
     private:
-        int fft_size=512;
-        float *fft_input;
-        fftwf_complex *fft_out;
-        fftwf_plan plan;
+        //std::unique_ptr<knf::OnlineFbank> fbank_;
+        knf::FbankOptions fbank_opts;
+
+        std::unique_ptr<FsmnVad> vadHandle;
 
         Vocab* vocab;
         vector<float> means_list;
         vector<float> vars_list;
         const float scale = 22.6274169979695;
+        int32_t lfr_window_size = 7;
+        int32_t lfr_window_shift = 6;
 
-        void apply_lfr(Tensor<float>*& din);
-        void apply_cmvn(Tensor<float>* din);
         void load_cmvn(const char *filename);
+        vector<float> ApplyLFR(const vector<float> &in);
+        void ApplyCMVN(vector<float> *v);
 
         string greedy_search( float* in, int nLen);
 
-        std::unique_ptr<Ort::Session> m_session;
+        std::shared_ptr<Ort::Session> m_session;
         Ort::Env env_;
         Ort::SessionOptions sessionOptions;
 
@@ -33,12 +37,14 @@
         vector<const char*> m_szOutputNames;
 
     public:
-        ModelImp(const char* path, int nNumThread=0, bool quantize=false);
+        ModelImp(const char* path, int nNumThread=0, bool quantize=false, bool use_vad=false);
         ~ModelImp();
         void reset();
+        vector<float> FbankKaldi(float sample_rate, const float* waves, int len);
         string forward_chunk(float* din, int len, int flag);
         string forward(float* din, int len, int flag);
         string rescoring();
+        std::vector<std::vector<int>> vad_seg(std::vector<float>& pcm_data);
 
     };
 

--
Gitblit v1.9.1