From a70d0dfe221e06381b6e290d1dab85c9ab4fdc31 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 23 三月 2024 08:36:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java b/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java
index b7242fd..eee6a8b 100644
--- a/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java
@@ -35,17 +35,17 @@
@Slf4j(topic = "vtdu")
@Order(2)
public class MediaServiceImpl implements IMediaService, ApplicationRunner {
- private static List<String> mediaNameList = new ArrayList<>();
+ public static List<String> mediaNameList = new ArrayList<>();
@Resource
MediaClient mediaClient;
@Value("${mediamtx.host}")
String mediamtxHost;
+
@Override
public void run(ApplicationArguments args) throws Exception {
mediaNameList = getNameList();
- if(mediaNameList.size()>0)
- {
+ if (mediaNameList.size() > 0) {
removePath(mediaNameList.toArray(new String[0]));
mediaNameList.clear();
}
@@ -76,7 +76,7 @@
//榛樿杞В鐮�
String cmd = "ffmpeg -rtsp_transport tcp -i " + sourceUrl + " -vcodec libx264 -preset:v ultrafast -r 25 -keyint_min 25 -g 60 -sc_threshold 0 -threads 6 -b:v 2048k -acodec opus -strict -2 -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
if (mode.equals("0")) {//纭В鐮�
- cmd = rootPath+"ffmpeg -hwaccel cuvid -c:v hevc_cuvid -rtsp_transport tcp -i " + sourceUrl + " -c:v h264_nvenc -r 25 -g 60 -sc_threshold 0 -threads 6 -b:v 2048k -bf 0 -acodec opus -strict -2 -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
+ cmd = rootPath + "ffmpeg -hwaccel cuvid -c:v hevc_cuvid -rtsp_transport tcp -i " + sourceUrl + " -c:v h264_nvenc -r 25 -g 60 -sc_threshold 0 -threads 6 -b:v 2048k -bf 0 -acodec opus -strict -2 -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
}
conf.setRunOnDemand(cmd);
conf.setRunOnDemandRestart(true);
@@ -89,7 +89,8 @@
conf.setSourceProtocol("tcp");
if (!checkNameExist(name)) {
- mediaClient.addPath(name, conf);
+ mediaClient.addPath(name, conf);
+ mediaNameList.add(name);
}
map.put("rtspUrl", rtspUrl);
@@ -171,11 +172,14 @@
@Override
public void removePath(String[] names) {
- for (String name : names) {
- if (checkNameExist(name)) {
- mediaClient.removePath(name);
- log.info("鍒犻櫎鎴愬姛");
+ try {
+ for (String name : names) {
+ if (checkNameExist(name)) {
+ mediaClient.removePath(name);
+ }
}
+ } catch (Exception ex) {
+ log.error("鎵归噺绉婚櫎娴佸獟浣撳紓甯革細" + ex.getMessage());
}
}
@@ -184,6 +188,7 @@
try {
if (checkNameExist(name)) {
mediaClient.removePath(name);
+ mediaNameList.remove(name);
}
} catch (ForestRuntimeException ex) {
log.error("绉婚櫎娴佸獟浣撳紓甯革細" + ex.getMessage());
@@ -473,20 +478,19 @@
*/
@Override
public List<String> getNameList() {
- List<String> nameList = new ArrayList<>();
try {
String paths = mediaClient.paths();
JsonsRoot jsonsRoot = JSONObject.parseObject(paths, JsonsRoot.class);
List<Items> items = jsonsRoot.getItems();
for (Items item : items) {
- nameList.add(item.getName());
+ mediaNameList.add(item.getName());
}
} catch (ForestNetworkException ex) {
log.error("鑾峰彇娴佸獟浣搉ame鍒楄〃寮傚父锛�" + ex.getMessage());
} catch (ForestRuntimeException ex) {
log.error("鑾峰彇娴佸獟浣搉ame鍒楄〃寮傚父锛�" + ex.getMessage());
}
- return nameList;
+ return mediaNameList;
}
/**
--
Gitblit v1.9.3