From 016aa105789fca71e86cdbb0d26a181812f200f9 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期三, 10 七月 2024 15:33:36 +0800
Subject: [PATCH] 优化：流媒体同步任务
---
ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java | 74 ++++++++++++++-----------------------
1 files changed, 28 insertions(+), 46 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..de4f9fc 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
@@ -1,10 +1,8 @@
package com.ruoyi.media.service.impl;
import com.alibaba.fastjson2.JSONObject;
-import com.dtflys.forest.Forest;
import com.dtflys.forest.exceptions.ForestNetworkException;
import com.dtflys.forest.exceptions.ForestRuntimeException;
-import com.dtflys.forest.http.ForestRequest;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.media.domain.*;
import com.ruoyi.media.service.IMediaService;
@@ -17,9 +15,7 @@
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
-import javax.annotation.PostConstruct;
import javax.annotation.Resource;
-import javax.xml.soap.SOAPEnvelope;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -34,22 +30,14 @@
@Service
@Slf4j(topic = "vtdu")
@Order(2)
-public class MediaServiceImpl implements IMediaService, ApplicationRunner {
- private static List<String> mediaNameList = new ArrayList<>();
+public class MediaServiceImpl implements IMediaService {
+
@Resource
MediaClient mediaClient;
@Value("${mediamtx.host}")
String mediamtxHost;
- @Override
- public void run(ApplicationArguments args) throws Exception {
- mediaNameList = getNameList();
- if(mediaNameList.size()>0)
- {
- removePath(mediaNameList.toArray(new String[0]));
- mediaNameList.clear();
- }
- }
+
/**
* 娣诲姞娴佸獟浣�
@@ -76,7 +64,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 +77,9 @@
conf.setSourceProtocol("tcp");
if (!checkNameExist(name)) {
- mediaClient.addPath(name, conf);
+ mediaClient.addPath(name, conf);
+ } else {
+ mediaClient.editPath(name, conf);
}
map.put("rtspUrl", rtspUrl);
@@ -171,11 +161,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());
}
}
@@ -192,9 +185,8 @@
@Override
public List<StreamInfo> paths() {
- String list = mediaClient.paths();
- JsonsRoot jsonsRoot = JSONObject.parseObject(list, JsonsRoot.class);
- List<Items> items = jsonsRoot.getItems();
+ Paths paths = mediaClient.paths();
+ List<Items> items = paths.getItems();
List<StreamInfo> pathInfoList = new ArrayList<>();
for (Items item : items) {
StreamInfo info = new StreamInfo();
@@ -256,9 +248,8 @@
@Override
public List<StreamInfo> getPushStreamList() {
List<StreamInfo> PushStreamInfoList = new ArrayList<>();
- String list = mediaClient.paths();
- JsonsRoot jsonsRoot = JSONObject.parseObject(list, JsonsRoot.class);
- List<Items> items = jsonsRoot.getItems();
+ Paths paths = mediaClient.paths();
+ List<Items> items = paths.getItems();
for (Items item : items) {
StreamInfo info = new StreamInfo();
//ID
@@ -284,6 +275,7 @@
long bytesReceived = item.getBytesReceived();
String formatReceivedSize = ArdTool.formatFileSize(bytesReceived);
info.setUpTraffic(formatReceivedSize);
+ info.setBeginTime(item.getReadyTime());
} else {
RtspSession rtspSession = getRtspSessionById(source.getId());
//浼氳瘽ID
@@ -331,9 +323,8 @@
@Override
public List<StreamInfo> getPullStreamList() {
List<StreamInfo> PullStreamInfoList = new ArrayList<>();
- String list = mediaClient.paths();
- JsonsRoot jsonsRoot = JSONObject.parseObject(list, JsonsRoot.class);
- List<Items> items = jsonsRoot.getItems();
+ Paths paths = mediaClient.paths();
+ List<Items> items = paths.getItems();
for (Items item : items) {
List<Readers> readers = item.getReaders();
for (Readers reader : readers) {
@@ -370,6 +361,7 @@
PullStreamInfoList.add(info);
break;
case "webRTCSession":
+ case "webrtcSession":
info.setSessionType("webrtc");
//webrtc鎾斁鍦板潃
url = "http://" + mediamtxHost + ":8889/" + name;
@@ -475,40 +467,30 @@
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();
+ Paths paths = mediaClient.paths();
+ List<Items> items = paths.getItems();
for (Items item : items) {
nameList.add(item.getName());
}
- } catch (ForestNetworkException ex) {
- log.error("鑾峰彇娴佸獟浣搉ame鍒楄〃寮傚父锛�" + ex.getMessage());
- } catch (ForestRuntimeException ex) {
+ } catch (Exception ex) {
log.error("鑾峰彇娴佸獟浣搉ame鍒楄〃寮傚父锛�" + ex.getMessage());
}
return nameList;
}
/**
- * 妫�鏌ュ悕绉版槸鍚﹀瓨鍦�
+ * 妫�鏌ame鏄惁瀛樺湪
* 鍒樿嫃涔�
* 2023/10/19 15:18:45
*/
@Override
public boolean checkNameExist(String name) {
boolean result = false;
- if (mediaNameList.contains(name)) {
+ List<String> nameList = getNameList();
+ if (nameList.contains(name)) {
result = true;
}
return result;
- }
-
- /**
- * 閰嶇疆娴佸獟浣撳弬鏁�
- */
- @Override
- public String setConfig(Config config) {
- return mediaClient.setConfig(config);
}
--
Gitblit v1.9.3