From fe588bc508c0076bb007d6ed36c18ac8ecb341ac Mon Sep 17 00:00:00 2001
From: 王梦迪 <73778524+di-osc@users.noreply.github.com>
Date: 星期二, 20 五月 2025 16:10:59 +0800
Subject: [PATCH] Fsmn_vad支持多线程并发调用 (#2519)
---
runtime/websocket/bin/funasr-wss-server-2pass.cpp | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/runtime/websocket/bin/funasr-wss-server-2pass.cpp b/runtime/websocket/bin/funasr-wss-server-2pass.cpp
index 4bc413c..edf614a 100644
--- a/runtime/websocket/bin/funasr-wss-server-2pass.cpp
+++ b/runtime/websocket/bin/funasr-wss-server-2pass.cpp
@@ -55,11 +55,11 @@
TCLAP::ValueArg<std::string> offline_model_revision(
"", "offline-model-revision", "ASR offline model revision", false,
- "v1.2.1", "string");
+ "v2.0.5", "string");
TCLAP::ValueArg<std::string> online_model_revision(
"", "online-model-revision", "ASR online model revision", false,
- "v1.0.6", "string");
+ "v2.0.5", "string");
TCLAP::ValueArg<std::string> quantize(
"", QUANTIZE,
@@ -73,7 +73,7 @@
"model_quant.onnx, vad.yaml, vad.mvn",
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");
+ "", "vad-revision", "VAD model revision", false, "v2.0.4", "string");
TCLAP::ValueArg<std::string> vad_quant(
"", VAD_QUANT,
"true (Default), load the model of model_quant.onnx in vad_dir. If set "
@@ -85,7 +85,7 @@
"model_quant.onnx, punc.yaml",
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");
+ "", "punc-revision", "PUNC model revision", false, "v2.0.5", "string");
TCLAP::ValueArg<std::string> punc_quant(
"", PUNC_QUANT,
"true (Default), load the model of model_quant.onnx in punc_dir. If "
@@ -262,20 +262,26 @@
size_t found = s_offline_asr_path.find("speech_paraformer-large-vad-punc_asr_nat-zh-cn-16k-common-vocab8404");
if (found != std::string::npos) {
- model_path["offline-model-revision"]="v1.2.4";
+ model_path["offline-model-revision"]="v2.0.5";
}
found = s_offline_asr_path.find("speech_paraformer-large-contextual_asr_nat-zh-cn-16k-common-vocab8404");
if (found != std::string::npos) {
- model_path["offline-model-revision"]="v1.0.5";
+ model_path["offline-model-revision"]="v2.0.5";
}
found = s_offline_asr_path.find("speech_paraformer-large_asr_nat-en-16k-common-vocab10020");
if (found != std::string::npos) {
- model_path["model-revision"]="v1.0.0";
+ model_path["model-revision"]="v2.0.5";
s_itn_path="";
s_lm_path="";
}
+ found = s_offline_asr_path.find(MODEL_SVS);
+ if (found != std::string::npos) {
+ model_path["model-revision"]="v2.0.5";
+ s_lm_path="";
+ model_path[LM_DIR]="";
+ }
if (access(s_offline_asr_path.c_str(), F_OK) == 0) {
// local
--
Gitblit v1.9.1