From da340e6a6cf8680878a083f5c1b18775dc0c686f Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期五, 12 四月 2024 15:01:54 +0800
Subject: [PATCH] add

---
 funasr/models/sense_voice/model.py |   31 +++++++++++++++----------------
 1 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/funasr/models/sense_voice/model.py b/funasr/models/sense_voice/model.py
index 521dec8..f8c1177 100644
--- a/funasr/models/sense_voice/model.py
+++ b/funasr/models/sense_voice/model.py
@@ -73,28 +73,27 @@
 
         speech = speech.to(device=kwargs["device"])[0, :, :]
         speech_lengths = speech_lengths.to(device=kwargs["device"])
-        
-        task = kwargs.get("task", "ASR")
+
+        DecodingOptions = kwargs.get("DecodingOptions", {})
+        task = DecodingOptions.get("task", "ASR")
         if isinstance(task, str):
             task = [task]
         task = "".join([f"<|{x}|>" for x in task])
         initial_prompt = kwargs.get("initial_prompt", f"<|startoftranscript|>{task}")
-        language = kwargs.get("language", None)
+        DecodingOptions["initial_prompt"] = initial_prompt
+        
+        language = DecodingOptions.get("language", None)
         language = None if language == "auto" else language
-        # if language is None:
-        #     # detect the spoken language
-        #     _, probs = self.model.detect_language(speech, initial_prompt=initial_prompt)
-        #     print(f"Detected language: {max(probs, key=probs.get)}")
-        #     language = max(probs, key=probs.get)
-        #     language = language if kwargs.get("language", None) is None else kwargs.get("language")
-        
-        # decode the audio
-        
-        # initial_prompt = kwargs.get("initial_prompt", "<|startoftranscript|><|ASR|>")
-        
-        vocab_path = kwargs.get("vocab_path", None)
-        options = whisper.DecodingOptions(language=language, fp16=False, without_timestamps=True, initial_prompt=initial_prompt, vocab_path=vocab_path)
+        DecodingOptions["language"] = language
 
+        DecodingOptions["vocab_path"] = kwargs.get("vocab_path", None)
+        
+        
+        if "without_timestamps" not in DecodingOptions:
+            DecodingOptions["without_timestamps"] = True
+
+    
+        options = whisper.DecodingOptions(**DecodingOptions)
         
         result = whisper.decode(self.model, speech, options)
 

--
Gitblit v1.9.1