From d80ac2fd2df4e7fb8a28acfa512bb11472b5cc99 Mon Sep 17 00:00:00 2001
From: liugz18 <57401541+liugz18@users.noreply.github.com>
Date: 星期四, 18 七月 2024 21:34:55 +0800
Subject: [PATCH] Rename 'res' in line 514 to avoid with naming conflict with line 365
---
runtime/websocket/bin/funasr-wss-client-2pass.cpp | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/runtime/websocket/bin/funasr-wss-client-2pass.cpp b/runtime/websocket/bin/funasr-wss-client-2pass.cpp
index ec3da35..6c3a4dd 100644
--- a/runtime/websocket/bin/funasr-wss-client-2pass.cpp
+++ b/runtime/websocket/bin/funasr-wss-client-2pass.cpp
@@ -193,7 +193,8 @@
int32_t sampling_rate = audio_fs;
std::string wav_format = "pcm";
if (funasr::IsTargetFile(wav_path.c_str(), "wav")) {
- if (!audio.LoadWav(wav_path.c_str(), &sampling_rate, false)) return;
+ if (!audio.LoadWav(wav_path.c_str(), &sampling_rate, false))
+ return;
} else if (funasr::IsTargetFile(wav_path.c_str(), "pcm")) {
if (!audio.LoadPcmwav(wav_path.c_str(), &sampling_rate, false)) return;
} else {
@@ -448,6 +449,7 @@
m_client.get_alog().write(websocketpp::log::alevel::app,
"Send Error: " + ec.message());
}
+ delete[] iArray;
Pa_Sleep(20); // sleep for 20ms
}
@@ -475,7 +477,8 @@
int main(int argc, char* argv[]) {
#ifdef _WIN32
- SetConsoleOutputCP(65001);
+ #include <windows.h>
+ SetConsoleOutputCP(65001);
#endif
google::InitGoogleLogging(argv[0]);
FLAGS_logtostderr = true;
--
Gitblit v1.9.1