From 74d1c21ebb6b3b916904d95d13d289df23dcdedd Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 20 Aug 2024 18:06:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java b/src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java
index 0b21628..ea2892a 100644
--- a/src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java
+++ b/src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java
@@ -18,6 +18,9 @@
import java.io.File;
import java.io.IOException;
+import static com.dji.sample.speak.util.AudioConverter.convertAudio;
+import static com.dji.sample.speak.util.AudioConverter.convertToFile;
+
@RestController
@RequestMapping("${url.speak.prefix}${url.speak.version}")
public class SpeakVoiceController {
@@ -33,7 +36,8 @@
@RequestParam Integer volumn,
@RequestParam MultipartFile file) throws UnsupportedAudioFileException, IOException {
File file1 = MultipartFileTOFileUtil.multipartFile2File(file, patchesConfigPojo.getUnzip());
- return ResponseResult.success(voiceServicel.takeVoice(sn, psdk_index, name, file1, volumn));
+ File convertFile = convertAudio(file1);
+ return ResponseResult.success(voiceServicel.takeVoice(sn, psdk_index, name, convertFile, volumn));
}
@PostMapping("/stopVoice")
--
Gitblit v1.9.3