From d3c96905686604aecac5df92f543786174b840f8 Mon Sep 17 00:00:00 2001
From: 雾聪 <wucong.lyb@alibaba-inc.com>
Date: 星期二, 19 十二月 2023 20:15:08 +0800
Subject: [PATCH] remove the wavfile parsing for clients
---
runtime/websocket/bin/funasr-wss-client-2pass.cpp | 4 +---
runtime/websocket/bin/funasr-wss-client.cpp | 5 +----
runtime/python/websocket/funasr_wss_client.py | 7 -------
3 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/runtime/python/websocket/funasr_wss_client.py b/runtime/python/websocket/funasr_wss_client.py
index e469319..92dc548 100644
--- a/runtime/python/websocket/funasr_wss_client.py
+++ b/runtime/python/websocket/funasr_wss_client.py
@@ -186,13 +186,6 @@
if wav_path.endswith(".pcm"):
with open(wav_path, "rb") as f:
audio_bytes = f.read()
- elif wav_path.endswith(".wav"):
- import wave
- with wave.open(wav_path, "rb") as wav_file:
- params = wav_file.getparams()
- sample_rate = wav_file.getframerate()
- frames = wav_file.readframes(wav_file.getnframes())
- audio_bytes = bytes(frames)
else:
wav_format = "others"
with open(wav_path, "rb") as f:
diff --git a/runtime/websocket/bin/funasr-wss-client-2pass.cpp b/runtime/websocket/bin/funasr-wss-client-2pass.cpp
index 2db66ff..6533dd5 100644
--- a/runtime/websocket/bin/funasr-wss-client-2pass.cpp
+++ b/runtime/websocket/bin/funasr-wss-client-2pass.cpp
@@ -192,9 +192,7 @@
funasr::Audio audio(1);
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;
- } else if (funasr::IsTargetFile(wav_path.c_str(), "pcm")) {
+ if (funasr::IsTargetFile(wav_path.c_str(), "pcm")) {
if (!audio.LoadPcmwav(wav_path.c_str(), &sampling_rate, false)) return;
} else {
wav_format = "others";
diff --git a/runtime/websocket/bin/funasr-wss-client.cpp b/runtime/websocket/bin/funasr-wss-client.cpp
index dddab8e..93ff62b 100644
--- a/runtime/websocket/bin/funasr-wss-client.cpp
+++ b/runtime/websocket/bin/funasr-wss-client.cpp
@@ -189,10 +189,7 @@
funasr::Audio audio(1);
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 ;
- }else if(funasr::IsTargetFile(wav_path.c_str(), "pcm")){
+ if(funasr::IsTargetFile(wav_path.c_str(), "pcm")){
if (!audio.LoadPcmwav(wav_path.c_str(), &sampling_rate, false))
return ;
}else{
--
Gitblit v1.9.1