From fd9f28aec0f6c83aa63ee69cd5fd2beb11903ddd Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期二, 08 八月 2023 14:50:48 +0800
Subject: [PATCH] Merge branch 'main' of github.com:alibaba-damo-academy/FunASR add
---
funasr/runtime/onnxruntime/src/funasrruntime.cpp | 3 +++
funasr/runtime/websocket/funasr-wss-server-2pass.cpp | 12 ++++++------
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/funasr/runtime/onnxruntime/src/funasrruntime.cpp b/funasr/runtime/onnxruntime/src/funasrruntime.cpp
index 2e6a079..0c79f3c 100644
--- a/funasr/runtime/onnxruntime/src/funasrruntime.cpp
+++ b/funasr/runtime/onnxruntime/src/funasrruntime.cpp
@@ -379,6 +379,9 @@
while(audio->FetchTpass(frame) > 0){
string msg = asr_handle->Forward(frame->data, frame->len, frame->is_final);
string msg_punc = punc_online_handle->AddPunc(msg.c_str(), punc_cache[1]);
+ if(input_finished){
+ msg_punc += "銆�";
+ }
p_result->tpass_msg = msg_punc;
if(frame != NULL){
delete frame;
diff --git a/funasr/runtime/websocket/funasr-wss-server-2pass.cpp b/funasr/runtime/websocket/funasr-wss-server-2pass.cpp
index 99497dc..22b4587 100644
--- a/funasr/runtime/websocket/funasr-wss-server-2pass.cpp
+++ b/funasr/runtime/websocket/funasr-wss-server-2pass.cpp
@@ -32,9 +32,9 @@
"/workspace/models", "string");
TCLAP::ValueArg<std::string> offline_model_dir(
"", OFFLINE_MODEL_DIR,
- "default: /workspace/models/offline_asr, the asr model path, which "
+ "default: damo/speech_paraformer-large_asr_nat-zh-cn-16k-common-vocab8404-onnx, the asr model path, which "
"contains model_quant.onnx, config.yaml, am.mvn",
- false, "/workspace/models/offline_asr", "string");
+ false, "damo/speech_paraformer-large_asr_nat-zh-cn-16k-common-vocab8404-onnx", "string");
TCLAP::ValueArg<std::string> online_model_dir(
"", ONLINE_MODEL_DIR,
"default: damo/speech_paraformer-large_asr_nat-zh-cn-16k-common-vocab8404-online-onnx, the asr model path, which "
@@ -57,9 +57,9 @@
false, "true", "string");
TCLAP::ValueArg<std::string> vad_dir(
"", VAD_DIR,
- "default: /workspace/models/vad, the vad model path, which contains "
+ "default: damo/speech_fsmn_vad_zh-cn-16k-common-onnx, the vad model path, which contains "
"model_quant.onnx, vad.yaml, vad.mvn",
- false, "/workspace/models/vad", "string");
+ false, "damo/speech_fsmn_vad_zh-cn-16k-common-onnx", "string");
TCLAP::ValueArg<std::string> vad_revision(
"", "vad-revision", "VAD model revision", false, "v1.2.0", "string");
TCLAP::ValueArg<std::string> vad_quant(
@@ -69,9 +69,9 @@
false, "true", "string");
TCLAP::ValueArg<std::string> punc_dir(
"", PUNC_DIR,
- "default: /workspace/models/punc, the punc model path, which contains "
+ "default: damo/punc_ct-transformer_zh-cn-common-vad_realtime-vocab272727-onnx, the punc model path, which contains "
"model_quant.onnx, punc.yaml",
- false, "/workspace/models/punc", "string");
+ false, "damo/punc_ct-transformer_zh-cn-common-vad_realtime-vocab272727-onnx", "string");
TCLAP::ValueArg<std::string> punc_revision(
"", "punc-revision", "PUNC model revision", false, "v1.0.2", "string");
TCLAP::ValueArg<std::string> punc_quant(
--
Gitblit v1.9.1