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/websocket/bin/funasr-wss-server.cpp | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/runtime/websocket/bin/funasr-wss-server.cpp b/runtime/websocket/bin/funasr-wss-server.cpp
index f54bc5b..8f2a7ab 100644
--- a/runtime/websocket/bin/funasr-wss-server.cpp
+++ b/runtime/websocket/bin/funasr-wss-server.cpp
@@ -26,6 +26,10 @@
}
int main(int argc, char* argv[]) {
+#ifdef _WIN32
+ #include <windows.h>
+ SetConsoleOutputCP(65001);
+#endif
try {
google::InitGoogleLogging(argv[0]);
@@ -111,7 +115,7 @@
TCLAP::ValueArg<std::string> lm_dir("", LM_DIR,
"the LM model path, which contains compiled models: TLG.fst, config.yaml ", false, "damo/speech_ngram_lm_zh-cn-ai-wesp-fst", "string");
TCLAP::ValueArg<std::string> lm_revision(
- "", "lm-revision", "LM model revision", false, "v1.0.1", "string");
+ "", "lm-revision", "LM model revision", false, "v1.0.2", "string");
TCLAP::ValueArg<std::string> hotword("", HOTWORD,
"the hotword file, one hotword perline, Format: Hotword Weight (could be: 闃块噷宸村反 20)",
false, "/workspace/resources/hotwords.txt", "string");
--
Gitblit v1.9.1