Skip to content

Commit 180418c

Browse files
author
zhaoyz
committed
删除ffmpeg安装检查,给出告警提醒
1 parent cde8ba3 commit 180418c

File tree

6 files changed

+5
-34
lines changed

6 files changed

+5
-34
lines changed

src/main/java/com/xiaozhi/dialogue/tts/TtsService.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,7 @@ public interface TtsService {
2323
*
2424
*/
2525
boolean isSupportStreamTts();
26-
/**
27-
* 是否依赖Ffmpeg,如果依赖,检查Ffmpeg是否安装
28-
* @return
29-
*/
30-
boolean isInstallFfmpeg();
26+
3127
/**
3228
* 将文本转换为语音(带自定义语音)
3329
*

src/main/java/com/xiaozhi/dialogue/tts/factory/TtsServiceFactory.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@ public TtsService getTtsService() {
4444

4545
private TtsService getTtsService(String voiceName) {
4646
TtsService ttsService = new EdgeTtsService(voiceName, OUT_PUT_PATH);
47-
if(!ttsService.isInstallFfmpeg()){
48-
logger.warn("请先安装ffmpeg");
49-
}
5047
return ttsService;
5148
}
5249

@@ -97,9 +94,6 @@ public TtsService getTtsService(SysConfig config, String voiceName) {
9794
TtsService service;
9895
// 创建其他API服务
9996
service = createApiService(config, voiceName, OUT_PUT_PATH);
100-
if(!service.isInstallFfmpeg()){
101-
logger.warn("请先安装ffmpeg");
102-
}
10397
serviceCache.put(cacheKey, service);
10498
return service;
10599
} catch (Exception e) {

src/main/java/com/xiaozhi/dialogue/tts/providers/AliyunTtsService.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,7 @@ public String getProviderName() {
6262
public boolean isSupportStreamTts() {
6363
return false;
6464
}
65-
@Override
66-
public boolean isInstallFfmpeg() {
67-
return true;
68-
}
65+
6966
@Override
7067
public String getAudioFileName() {
7168
String uuid = UUID.randomUUID().toString().replace("-", "");

src/main/java/com/xiaozhi/dialogue/tts/providers/EdgeTtsService.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,7 @@ public String getProviderName() {
4141
public boolean isSupportStreamTts() {
4242
return false;
4343
}
44-
@Override
45-
public boolean isInstallFfmpeg() {
46-
try {
47-
logger.info("is Install Ffmpeg");
48-
Process p = new ProcessBuilder("ffmpeg", "-version").start();
49-
p.waitFor();
50-
return true;
51-
} catch (Exception e) {
52-
return false;
53-
}
54-
}
44+
5545
@Override
5646
public String getAudioFileName() {
5747
String uuid = UUID.randomUUID().toString().replace("-", "");

src/main/java/com/xiaozhi/dialogue/tts/providers/VolcengineTtsService.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,7 @@ public String getProviderName() {
5252
public boolean isSupportStreamTts() {
5353
return false;
5454
}
55-
@Override
56-
public boolean isInstallFfmpeg() {
57-
return true;
58-
}
55+
5956
@Override
6057
public String getAudioFileName() {
6158
String uuid = UUID.randomUUID().toString().replace("-", "");

src/main/java/com/xiaozhi/dialogue/tts/providers/XfyunTtsService.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,7 @@ public String getProviderName() {
5353
public boolean isSupportStreamTts() {
5454
return false;
5555
}
56-
@Override
57-
public boolean isInstallFfmpeg() {
58-
return true;
59-
}
56+
6057
@Override
6158
public String getAudioFileName() {
6259
String uuid = UUID.randomUUID().toString().replace("-", "");

0 commit comments

Comments
 (0)