From f3b25b07545d9967718a771bf6dd991c15babda3 Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期三, 15 二月 2023 20:08:52 +0800
Subject: [PATCH] onnx

---
 funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/utils/frontend.py  |    2 +-
 funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/paraformer_onnx.py |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/paraformer_onnx.py b/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/paraformer_onnx.py
index e520008..621b903 100644
--- a/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/paraformer_onnx.py
+++ b/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/paraformer_onnx.py
@@ -41,8 +41,8 @@
         self.ort_infer = OrtInferSession(model_file, device_id)
         self.batch_size = batch_size
 
-    def __call__(self, wav_content: Union[str, np.ndarray, List[str]]) -> List:
-        waveform_list = self.load_data(wav_content)
+    def __call__(self, wav_content: Union[str, np.ndarray, List[str]], fs: int = None) -> List:
+        waveform_list = self.load_data(wav_content, fs)
         waveform_nums = len(waveform_list)
 
         asr_res = []
@@ -63,9 +63,9 @@
         return asr_res
 
     def load_data(self,
-                  wav_content: Union[str, np.ndarray, List[str]]) -> List:
+                  wav_content: Union[str, np.ndarray, List[str]], fs: int = None) -> List:
         def load_wav(path: str) -> np.ndarray:
-            waveform, _ = librosa.load(path, sr=None)
+            waveform, _ = librosa.load(path, sr=fs)
             return waveform
 
         if isinstance(wav_content, np.ndarray):
diff --git a/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/utils/frontend.py b/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/utils/frontend.py
index 9f0c535..eb8a7c8 100644
--- a/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/utils/frontend.py
+++ b/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/utils/frontend.py
@@ -21,7 +21,7 @@
             fs: int = 16000,
             window: str = 'hamming',
             n_mels: int = 80,
-            frame_length: int = 25.0,
+            frame_length: int = 25,
             frame_shift: int = 10,
             filter_length_min: int = -1,
             filter_length_max: float = -1,

--
Gitblit v1.9.1