From 1fe9f918a907193e84e16de1c4c2d51c2f25c5ec Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期四, 11 七月 2024 22:45:52 +0800
Subject: [PATCH] 测试页兼容流媒体1.8.4
---
ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java | 157 ++++++++++++++++++++++++++++------------------------
1 files changed, 85 insertions(+), 72 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 c0326e2..0079687 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
@@ -2,13 +2,17 @@
import com.alibaba.fastjson2.JSONObject;
import com.dtflys.forest.exceptions.ForestNetworkException;
+import com.dtflys.forest.exceptions.ForestRuntimeException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.media.domain.*;
import com.ruoyi.media.service.IMediaService;
import com.ruoyi.utils.forest.MediaClient;
import com.ruoyi.utils.tools.ArdTool;
+import io.swagger.models.auth.In;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
@@ -25,7 +29,7 @@
* @Version: 1.0
**/
@Service
-@Slf4j(topic = "cmd")
+@Slf4j(topic = "vtdu")
@Order(2)
public class MediaServiceImpl implements IMediaService {
@@ -34,6 +38,7 @@
@Value("${mediamtx.host}")
String mediamtxHost;
+
/**
* 娣诲姞娴佸獟浣�
@@ -47,37 +52,45 @@
*/
@Override
public Map<String, String> addPath(String name, String sourceUrl, String mode, String isCode) {
-
- String rtspUrl = "rtsp://" + mediamtxHost + ":8554/" + name;
- String rtmpUrl = "rtmp://" + mediamtxHost + ":1935/" + name;
- String webrtcUrl = "http://" + mediamtxHost + ":8889/" + name;
-
- Conf conf = new Conf();
- String rootPath = System.getProperty("user.dir").replaceAll("\\\\", "/") + "/lib/mediamtx/";
- if (isCode.equals("1")) {
- conf.setSource("publisher");
- //榛樿杞В鐮�
- 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 = "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);
- conf.setRunOnDemandCloseAfter("5s");
- } else {
- conf.setSource(sourceUrl);
- conf.setSourceOnDemand(true);
- }
- conf.setMaxReaders(100);
- conf.setSourceProtocol("tcp");
-
- if (!checkNameExist(name)) {
- mediaClient.addPath(name, conf);
- }
Map<String, String> map = new HashMap<>();
- map.put("rtspUrl", rtspUrl);
- map.put("rtmpUrl", rtmpUrl);
- map.put("webrtcUrl", webrtcUrl);
+ try {
+ String rtspUrl = "rtsp://" + mediamtxHost + ":8554/" + name;
+ String rtmpUrl = "rtmp://" + mediamtxHost + ":1935/" + name;
+ String webrtcUrl = "http://" + mediamtxHost + ":8889/" + name;
+
+ Conf conf = new Conf();
+ String rootPath = System.getProperty("user.dir").replaceAll("\\\\", "/") + "/server/mediamtx/";
+ if (isCode.equals("1")) {
+ conf.setSource("publisher");
+ //榛樿杞В鐮�
+ 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";
+ }
+ conf.setRunOnDemand(cmd);
+ conf.setRunOnDemandRestart(true);
+ conf.setRunOnDemandCloseAfter("5s");
+ } else {
+ conf.setSource(sourceUrl);
+ conf.setSourceOnDemand(true);
+ }
+ conf.setMaxReaders(100);
+ conf.setSourceProtocol("tcp");
+
+ if (!checkNameExist(name)) {
+ mediaClient.addPath(name, conf);
+ } else {
+ mediaClient.editPath(name, conf);
+ }
+
+ map.put("rtspUrl", rtspUrl);
+ map.put("rtmpUrl", rtmpUrl);
+ map.put("webrtcUrl", webrtcUrl);
+ } catch (ForestNetworkException ex) {
+ log.error("娣诲姞娴佸獟浣撳紓甯革細" + ex.getMessage());
+ } catch (ForestRuntimeException ex) {
+ log.error("娣诲姞娴佸獟浣撳紓甯革細" + ex.getMessage());
+ }
return map;
}
@@ -118,8 +131,8 @@
map.put("rtspUrl", rtspUrl);
map.put("rtmpUrl", rtmpUrl);
map.put("webrtcUrl", webrtcUrl);
- } catch (ForestNetworkException ex) {
- log.error(ex.getMessage());
+ } catch (ForestRuntimeException ex) {
+ log.error("淇敼娴佸獟浣撳紓甯革細" + ex.getMessage());
}
return map;
}
@@ -134,6 +147,8 @@
if (StringUtils.isNotEmpty(conf.getRunOnDemand())) {
runOn = conf.getRunOnDemand();
info.setMode("0");
+ } else {
+ info.setMode("1");
}
//RTSP婧愬湴鍧�
Matcher matcher = Pattern.compile("rtsp://[^\\s\"]+").matcher(runOn);
@@ -149,25 +164,32 @@
@Override
public void removePath(String[] names) {
- for (String name : names) {
- if (checkNameExist(name)) {
- mediaClient.removePath(name);
+ try {
+ for (String name : names) {
+ if (checkNameExist(name)) {
+ mediaClient.removePath(name);
+ }
}
+ } catch (Exception ex) {
+ log.error("鎵归噺绉婚櫎娴佸獟浣撳紓甯革細" + ex.getMessage());
}
}
@Override
public void removePath(String name) {
- if (checkNameExist(name)) {
- mediaClient.removePath(name);
+ try {
+ if (checkNameExist(name)) {
+ mediaClient.removePath(name);
+ }
+ } catch (ForestRuntimeException ex) {
+ log.error("绉婚櫎娴佸獟浣撳紓甯革細" + ex.getMessage());
}
}
@Override
- public List<StreamInfo> paths() {
- String list = mediaClient.paths();
- JsonsRoot jsonsRoot = JSONObject.parseObject(list, JsonsRoot.class);
- List<Items> items = jsonsRoot.getItems();
+ public List<StreamInfo> paths(Integer pageNum, Integer pageSize) {
+ Paths paths = mediaClient.paths(pageNum - 1, pageSize);
+ List<Items> items = paths.getItems();
List<StreamInfo> pathInfoList = new ArrayList<>();
for (Items item : items) {
StreamInfo info = new StreamInfo();
@@ -202,23 +224,17 @@
@Override
public RtspSession getRtspSessionById(String sessionId) {
- String list = mediaClient.getRtspsessionById(sessionId);
- RtspSession rtspSession = JSONObject.parseObject(list, RtspSession.class);
- return rtspSession;
+ return mediaClient.getRtspsessionById(sessionId);
}
@Override
public WebrtcSession getWebrtcSessionById(String sessionId) {
- String list = mediaClient.getWebrtcsessionById(sessionId);
- WebrtcSession webrtcSession = JSONObject.parseObject(list, WebrtcSession.class);
- return webrtcSession;
+ return mediaClient.getWebrtcsessionById(sessionId);
}
@Override
public RtmpSession getRtmpSessionById(String sessionId) {
- String list = mediaClient.getRtmpsessionById(sessionId);
- RtmpSession rtmpSession = JSONObject.parseObject(list, RtmpSession.class);
- return rtmpSession;
+ return mediaClient.getRtmpsessionById(sessionId);
}
/**
@@ -227,11 +243,10 @@
* 2023/8/29 9:37:05
*/
@Override
- public List<StreamInfo> getPushStreamList() {
+ public List<StreamInfo> getPushStreamList(Integer pageNum, Integer pageSize) {
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(pageNum - 1, pageSize);
+ List<Items> items = paths.getItems();
for (Items item : items) {
StreamInfo info = new StreamInfo();
//ID
@@ -257,6 +272,7 @@
long bytesReceived = item.getBytesReceived();
String formatReceivedSize = ArdTool.formatFileSize(bytesReceived);
info.setUpTraffic(formatReceivedSize);
+ info.setBeginTime(item.getReadyTime());
} else {
RtspSession rtspSession = getRtspSessionById(source.getId());
//浼氳瘽ID
@@ -302,11 +318,10 @@
* 2023/8/29 9:37:05
*/
@Override
- public List<StreamInfo> getPullStreamList() {
+ public List<StreamInfo> getPullStreamList(Integer pageNum, Integer pageSize) {
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(pageNum - 1, pageSize);
+ List<Items> items = paths.getItems();
for (Items item : items) {
List<Readers> readers = item.getReaders();
for (Readers reader : readers) {
@@ -343,6 +358,7 @@
PullStreamInfoList.add(info);
break;
case "webRTCSession":
+ case "webrtcSession":
info.setSessionType("webrtc");
//webrtc鎾斁鍦板潃
url = "http://" + mediamtxHost + ":8889/" + name;
@@ -447,17 +463,20 @@
@Override
public List<String> getNameList() {
List<String> nameList = new ArrayList<>();
- String paths = mediaClient.paths();
- JsonsRoot jsonsRoot = JSONObject.parseObject(paths, JsonsRoot.class);
- List<Items> items = jsonsRoot.getItems();
- for (Items item : items) {
- nameList.add(item.getName());
+ try {
+ Paths paths = mediaClient.paths(0, 1000);
+ List<Items> items = paths.getItems();
+ for (Items item : items) {
+ nameList.add(item.getName());
+ }
+ } catch (Exception ex) {
+ log.error("鑾峰彇娴佸獟浣搉ame鍒楄〃寮傚父锛�" + ex.getMessage());
}
return nameList;
}
/**
- * 妫�鏌ュ悕绉版槸鍚﹀瓨鍦�
+ * 妫�鏌ame鏄惁瀛樺湪
* 鍒樿嫃涔�
* 2023/10/19 15:18:45
*/
@@ -471,11 +490,5 @@
return result;
}
- /**
- * 閰嶇疆娴佸獟浣撳弬鏁�
- */
- @Override
- public String setConfig(Config config) {
- return mediaClient.setConfig(config);
- }
+
}
--
Gitblit v1.9.3