From 219c2482ab755fbd4e49dfbdee91bf1a8a4ec49a Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期五, 19 五月 2023 11:33:27 +0800
Subject: [PATCH] websocket 2pass bugfix
---
funasr/bin/vad_inference_launch.py | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/funasr/bin/vad_inference_launch.py b/funasr/bin/vad_inference_launch.py
index 2ccc716..b17d058 100644
--- a/funasr/bin/vad_inference_launch.py
+++ b/funasr/bin/vad_inference_launch.py
@@ -1,6 +1,8 @@
+# -*- encoding: utf-8 -*-
#!/usr/bin/env python3
-# Copyright ESPnet (https://github.com/espnet/espnet). All Rights Reserved.
-# Apache 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+# Copyright FunASR (https://github.com/alibaba-damo-academy/FunASR). All Rights Reserved.
+# MIT License (https://opensource.org/licenses/MIT)
+
import torch
torch.set_num_threads(1)
@@ -237,9 +239,13 @@
ibest_writer = None
vad_results = []
- batch_in_cache = param_dict['in_cache'] if param_dict is not None else dict()
- is_final = param_dict.get('is_final', False) if param_dict is not None else False
- max_end_sil = param_dict.get('max_end_sil', 800) if param_dict is not None else 800
+ if param_dict is None:
+ param_dict = dict()
+ param_dict['in_cache'] = dict()
+ param_dict['is_final'] = True
+ batch_in_cache = param_dict.get('in_cache', dict())
+ is_final = param_dict.get('is_final', False)
+ max_end_sil = param_dict.get('max_end_sil', 800)
for keys, batch in loader:
assert isinstance(batch, dict), type(batch)
assert all(isinstance(s, str) for s in keys), keys
@@ -266,6 +272,17 @@
return _forward
+
+
+
+def inference_launch(mode, **kwargs):
+ if mode == "offline":
+ return inference_vad(**kwargs)
+ elif mode == "online":
+ return inference_vad_online(**kwargs)
+ else:
+ logging.info("Unknown decoding mode: {}".format(mode))
+ return None
def get_parser():
parser = config_argparse.ArgumentParser(
@@ -357,15 +374,6 @@
)
return parser
-
-def inference_launch(mode, **kwargs):
- if mode == "offline":
- return inference_vad(**kwargs)
- elif mode == "online":
- return inference_vad_online(**kwargs)
- else:
- logging.info("Unknown decoding mode: {}".format(mode))
- return None
def main(cmd=None):
print(get_commandline_args(), file=sys.stderr)
--
Gitblit v1.9.1