From 5a637c6995f80a41be7026214f4f5a76ad07db70 Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期二, 19 三月 2024 11:45:09 +0800
Subject: [PATCH] vad conf

---
 funasr/auto/auto_model.py |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/funasr/auto/auto_model.py b/funasr/auto/auto_model.py
index 39f91e9..d044455 100644
--- a/funasr/auto/auto_model.py
+++ b/funasr/auto/auto_model.py
@@ -106,9 +106,9 @@
         
         # if vad_model is not None, build vad model else None
         vad_model = kwargs.get("vad_model", None)
+        vad_kwargs = {} if kwargs.get("vad_kwargs", {}) is None else kwargs.get("vad_kwargs", {})
         if vad_model is not None:
             logging.info("Building VAD model.")
-            vad_kwargs = {} if kwargs.get("vad_kwargs", {}) is None else kwargs.get("vad_kwargs", {})
             vad_kwargs["model"] = vad_model
             vad_kwargs["model_revision"] = kwargs.get("vad_model_revision", None)
             vad_kwargs["device"] = kwargs["device"]
@@ -116,10 +116,9 @@
 
         # if punc_model is not None, build punc model else None
         punc_model = kwargs.get("punc_model", None)
-        
+        punc_kwargs = {} if kwargs.get("punc_kwargs", {}) is None else kwargs.get("punc_kwargs", {})
         if punc_model is not None:
             logging.info("Building punc model.")
-            punc_kwargs = {} if kwargs.get("punc_kwargs", {}) is None else kwargs.get("punc_kwargs", {})
             punc_kwargs["model"] = punc_model
             punc_kwargs["model_revision"] = kwargs.get("punc_model_revision", None)
             punc_kwargs["device"] = kwargs["device"]
@@ -127,10 +126,9 @@
 
         # if spk_model is not None, build spk model else None
         spk_model = kwargs.get("spk_model", None)
-        spk_kwargs = kwargs.get("spk_model_revision", None)
+        spk_kwargs = {} if kwargs.get("spk_kwargs", {}) is None else kwargs.get("spk_kwargs", {})
         if spk_model is not None:
             logging.info("Building SPK model.")
-            spk_kwargs = {} if kwargs.get("spk_kwargs", {}) is None else kwargs.get("spk_kwargs", {})
             spk_kwargs["model"] = spk_model
             spk_kwargs["model_revision"] = kwargs.get("spk_model_revision", None)
             spk_kwargs["device"] = kwargs["device"]

--
Gitblit v1.9.1