From 8912e0696af069de47646fdb8a9d9c4e086e88b3 Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期日, 14 一月 2024 23:42:11 +0800
Subject: [PATCH] Resolve merge conflict
---
runtime/onnxruntime/src/paraformer.h | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/runtime/onnxruntime/src/paraformer.h b/runtime/onnxruntime/src/paraformer.h
index b5bc46d..5bb9477 100644
--- a/runtime/onnxruntime/src/paraformer.h
+++ b/runtime/onnxruntime/src/paraformer.h
@@ -20,6 +20,7 @@
*/
private:
Vocab* vocab = nullptr;
+ Vocab* lm_vocab = nullptr;
SegDict* seg_dict = nullptr;
PhoneSet* phone_set_ = nullptr;
//const float scale = 22.6274169979695;
@@ -57,14 +58,15 @@
string Rescoring();
string GetLang(){return language;};
-
+ int GetAsrSampleRate() { return asr_sample_rate; };
void StartUtterance();
void EndUtterance();
- void InitLm(const std::string &lm_file, const std::string &lm_cfg_file);
+ void InitLm(const std::string &lm_file, const std::string &lm_cfg_file, const std::string &lex_file);
string BeamSearch(WfstDecoder* &wfst_decoder, float* in, int n_len, int64_t token_nums);
string FinalizeDecode(WfstDecoder* &wfst_decoder,
bool is_stamp=false, std::vector<float> us_alphas={0}, std::vector<float> us_cif_peak={0});
Vocab* GetVocab();
+ Vocab* GetLmVocab();
PhoneSet* GetPhoneSet();
knf::FbankOptions fbank_opts_;
@@ -107,8 +109,7 @@
int fsmn_dims = 512;
float cif_threshold = 1.0;
float tail_alphas = 0.45;
-
-
+ int asr_sample_rate = MODEL_SAMPLE_RATE;
};
} // namespace funasr
--
Gitblit v1.9.1