From f9115a7bc7495e8b00810a164bb93162c13e23c9 Mon Sep 17 00:00:00 2001
From: lyblsgo <lyblsgo@163.com>
Date: 星期二, 11 四月 2023 20:20:16 +0800
Subject: [PATCH] fix some variables
---
funasr/runtime/onnxruntime/src/FeatureExtract.cpp | 8 ++------
funasr/runtime/onnxruntime/src/FeatureExtract.h | 3 +++
funasr/runtime/onnxruntime/src/paraformer_onnx.h | 1 +
funasr/runtime/onnxruntime/src/paraformer_onnx.cpp | 1 -
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/funasr/runtime/onnxruntime/src/FeatureExtract.cpp b/funasr/runtime/onnxruntime/src/FeatureExtract.cpp
index e8bfc8e..6d2826a 100644
--- a/funasr/runtime/onnxruntime/src/FeatureExtract.cpp
+++ b/funasr/runtime/onnxruntime/src/FeatureExtract.cpp
@@ -24,7 +24,6 @@
void FeatureExtract::insert(fftwf_plan plan, float *din, int len, int flag)
{
- int fft_size = 512;
float* fft_input = (float *)fftwf_malloc(sizeof(float) * fft_size);
fftwf_complex* fft_out = (fftwf_complex *)fftwf_malloc(sizeof(fftwf_complex) * fft_size);
memset(fft_input, 0, sizeof(float) * fft_size);
@@ -33,18 +32,15 @@
if (mode == 3)
window = (const float *)&window_hamm_hex;
- int window_size = 400;
- int window_shift = 160;
-
speech.load(din, len);
int i, j;
float tmp_feature[80];
if (mode == 0 || mode == 2 || mode == 3) {
- int ll = (speech.size() - 400) / 160 + 1;
+ int ll = (speech.size() - window_size) / window_shift + 1;
fqueue.reinit(ll);
}
- for (i = 0; i <= speech.size() - 400; i = i + window_shift) {
+ for (i = 0; i <= speech.size() - window_size; i = i + window_shift) {
float tmp_mean = 0;
for (j = 0; j < window_size; j++) {
tmp_mean += speech[i + j];
diff --git a/funasr/runtime/onnxruntime/src/FeatureExtract.h b/funasr/runtime/onnxruntime/src/FeatureExtract.h
index c5931d0..8296253 100644
--- a/funasr/runtime/onnxruntime/src/FeatureExtract.h
+++ b/funasr/runtime/onnxruntime/src/FeatureExtract.h
@@ -14,6 +14,9 @@
SpeechWrap speech;
FeatureQueue fqueue;
int mode;
+ int fft_size = 512;
+ int window_size = 400;
+ int window_shift = 160;
//void fftw_init();
void melspect(float *din, float *dout);
diff --git a/funasr/runtime/onnxruntime/src/paraformer_onnx.cpp b/funasr/runtime/onnxruntime/src/paraformer_onnx.cpp
index f940167..678cdf6 100644
--- a/funasr/runtime/onnxruntime/src/paraformer_onnx.cpp
+++ b/funasr/runtime/onnxruntime/src/paraformer_onnx.cpp
@@ -18,7 +18,6 @@
cmvn_path = pathAppend(path, "am.mvn");
config_path = pathAppend(path, "config.yaml");
- int fft_size = 512;
fft_input = (float *)fftwf_malloc(sizeof(float) * fft_size);
fft_out = (fftwf_complex *)fftwf_malloc(sizeof(fftwf_complex) * fft_size);
memset(fft_input, 0, sizeof(float) * fft_size);
diff --git a/funasr/runtime/onnxruntime/src/paraformer_onnx.h b/funasr/runtime/onnxruntime/src/paraformer_onnx.h
index 99b6856..e763be2 100644
--- a/funasr/runtime/onnxruntime/src/paraformer_onnx.h
+++ b/funasr/runtime/onnxruntime/src/paraformer_onnx.h
@@ -8,6 +8,7 @@
class ModelImp : public Model {
private:
+ int fft_size=512;
float *fft_input;
fftwf_complex *fft_out;
fftwf_plan plan;
--
Gitblit v1.9.1