From 0a12bfc2e9594345a0a6cf136bcf234c62450d9d Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 14 十月 2023 16:31:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java | 259 ++++++++++++++++++++++++++-------------------------
1 files changed, 133 insertions(+), 126 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 ffa84ff..5d84867 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,6 +1,11 @@
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.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.media.domain.*;
import com.ruoyi.media.mapper.VtduMapper;
@@ -14,16 +19,14 @@
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.core.annotation.Order;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.annotation.Resource;
import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
+import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -37,109 +40,103 @@
@Service
@Slf4j(topic = "cmd")
@Order(2)
-public class MediaServiceImpl implements IMediaService, ApplicationRunner {
- @Resource
- VtduMapper vtduMapper;
+public class MediaServiceImpl implements IMediaService {
+
@Resource
MediaClient mediaClient;
@Value("${mediamtx.host}")
String mediamtxHost;
- @Value("${mediamtx.enabled}")
- Boolean mediamtxEnabled;
- @Value("${mediamtx.software_decoding}")
- Boolean softwareDecoding;
- String processName = "mediamtx.exe";
-
+ /**
+ * 娣诲姞娴佸獟浣�
+ * name 鐩告満ID
+ * sourceUrl rtsp鍦板潃
+ * isCode 0-涓嶈浆鐮� 1-杞爜
+ * mode 0-gpu纭В鐮� 1-cpu杞В鐮�
+ * <p>
+ * 鍒樿嫃涔�
+ * 2023/10/12 9:03:41
+ */
@Override
- public void run(ApplicationArguments args){
- try {
- log.info("寮�濮嬪姞杞芥祦濯掍綋鍒楄〃");
- List<StreamInfo> paths = paths();
- for (StreamInfo path : paths) {
- mediaClient.removePath(path.getName());
- }
- List<Vtdu> vtduList = vtduMapper.selectVtduList(new Vtdu());
- for (Vtdu v : vtduList) {
- addPath(v.getName(), v.getRtspUrl(), v.getCodeType(), v.getIsCode());
- }
- }
- catch (Exception ex)
- {
- log.error("鍔犺浇娴佸獟浣撳垪琛ㄥ紓甯�:"+ex.getMessage());
- }
- }
- @PostConstruct
- public void initMediaMtx() {
- if (mediamtxEnabled) {
- log.info("鍒濆鍖栧惎鍔╩ediaMTX");
- if (Platform.isWindows()) {
- String exePath = System.getProperty("user.dir") + File.separator + "lib" + File.separator + "mediamtx" + File.separator + "mediamtx.exe";
- String ymlPath = System.getProperty("user.dir") + File.separator + "lib" + File.separator + "mediamtx" + File.separator + "mediamtx.yml";
+ public Map<String, String> addPath(String name, String sourceUrl, String mode, String isCode) {
- List<String> cmd = new ArrayList<>();
- cmd.add(exePath);
- cmd.add(ymlPath);
- if (CmdUtils.isProcessRunning(processName)) {
- // 杩涚▼宸茬粡鍦ㄨ繍琛岋紝缁撴潫璇ヨ繘绋�
- CmdUtils.stopProcess(processName);
- }
- // 鍚姩鍚庡彴杩涚▼
- CmdUtils.commandStart(processName, cmd, null);
- // 鍚姩cmd绐楀彛
-// String[] command = {"cmd","/c","start",exePath,ymlPath};
-// CmdUtils.commandStart(command);
- }
- }
- }
+ String rtspUrl = "rtsp://" + mediamtxHost + ":8554/" + name;
+ String rtmpUrl = "rtmp://" + mediamtxHost + ":1935/" + name;
+ String webrtcUrl = "http://" + mediamtxHost + ":8889/" + name;
- @PreDestroy
- public void destroyMediaMtx() {
- if (mediamtxEnabled) {
- log.info("閿�姣乵ediaMtx");
- if (CmdUtils.isProcessRunning(processName)) {
- // 杩涚▼宸茬粡鍦ㄨ繍琛岋紝缁撴潫璇ヨ繘绋�
- CmdUtils.stopProcess(processName);
- }
- }
- }
-
- @Override
- public String addPath(String name, String rtspPath, String mode, String isCode) {
- String rtspUrl = "rtsp://" + mediamtxHost + ":7554/" + name;
Conf mediaInfo = new Conf();
- String rootPath = System.getProperty("user.dir").replaceAll("\\\\", "/")+ "/lib/mediamtx/";
- //-vcodec libx264 //鎸囧畾瑙嗛缂栫爜鍣ㄤ负 libx264锛屼娇鐢� H.264 缂栫爜鏍煎紡杩涜瑙嗛鍘嬬缉
- //-preset ultrafast //--preset鐨勫弬鏁颁富瑕佽皟鑺傜紪鐮侀�熷害鍜岃川閲忕殑骞宠 锛屾湁ultrafast锛堣浆鐮侀�熷害鏈�蹇紝瑙嗛寰�寰�涔熸渶妯＄硦锛夈�乻uperfast銆乿eryfast銆乫aster銆乫ast銆乵edium銆乻low銆乻lower銆乿eryslow銆乸lacebo杩�10涓�夐」锛屼粠蹇埌鎱�
- //-r 25 //璁剧疆杈撳嚭瑙嗛鐨勫抚鐜囦负 25 甯�/绉�
- //-rtsp_transport tcp //杩欎釜閫夐」鍛婅瘔 FFmpeg 浣跨敤 TCP 浣滀负 RTSP 鐨勪紶杈撳崗璁�
- //-threads 4: 鎸囧畾瑕佷娇鐢ㄧ殑绾跨▼鏁颁负 4銆�//杩欏厑璁� FFmpeg 鍦ㄥ鏍稿鐞嗗櫒涓婁娇鐢ㄥ涓嚎绋嬫潵杩涜瑙嗛缂栫爜锛屼互鍔犲揩閫熷害銆�
- // -i //鐢ㄤ簬鎸囧畾杈撳叆濯掍綋鏂囦欢鎴栬緭鍏ユ祦鐨勫湴鍧�
- // -bf 0 绂佺敤B甯э紝鍥犱负webrtc鍦ㄧ綉椤佃皟鐢ㄦ椂鎺у埗鍙颁竴鐩磋緭鍑� WebRTC doesn鈥檛 support H264 streams with B-frames
- //-f rtsp //杩欎釜閫夐」鍛婅瘔 FFmpeg 杈撳嚭涓� RTSP 鏍煎紡銆�
- //CPU杞В鐮佺紪鐮�
- //String cmd = rootPath + "/lib/mediamtx/" +"ffmpeg -rtsp_transport tcp -i " + rtspPath + " -vcodec libx264 -preset:v ultrafast -r 25 -threads 4 -b:v 2048k -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
- //GPU纭В鐮佺紪鐮� -hwaccel cuvid -c:v h264_cuvid 浣跨敤cuda瑙ｇ爜 -c:v h264_nvenc 浣跨敤cuda缂栫爜
- //String cmd = rootPath + "/lib/mediamtx/" + "ffmpeg -hwaccel cuvid -c:v h264_cuvid -rtsp_transport udp -i " + rtspPath + " -c:v h264_nvenc -r 25 -threads 4 -b:v 2048k -bf 0 -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
+ String rootPath = System.getProperty("user.dir").replaceAll("\\\\", "/") + "/lib/mediamtx/";
if (isCode.equals("1")) {
- String cmd = "ffmpeg -rtsp_transport tcp -i " + rtspPath + " -vcodec libx264 -preset:v ultrafast -r 25 -g 20 -threads 6 -b:v 2048k -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
- if (!softwareDecoding) {
- cmd = "ffmpeg -hwaccel cuvid -c:v h264_cuvid -rtsp_transport tcp -i " + rtspPath + " -c:v h264_nvenc -r 25 -threads 6 -b:v 2048k -bf 0 -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
+ mediaInfo.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";
}
- if (mode.equals("1")) {
+ mediaInfo.setRunondemand(cmd);
+ mediaInfo.setRunondemandrestart(true);
+ mediaInfo.setRunondemandcloseafter("5s");
+ } else {
+ mediaInfo.setSource(sourceUrl);
+ mediaInfo.setSourceondemand(true);
+ }
+ mediaInfo.setMaxReaders(100);
+ mediaInfo.setSourceprotocol("tcp");
+
+ 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());
+ }
+ if(!nameList.contains(name)) {
+ mediaClient.addPath(name, mediaInfo);
+ }
+ Map<String, String> map = new HashMap<>();
+ map.put("rtspUrl", rtspUrl);
+ map.put("rtmpUrl", rtmpUrl);
+ map.put("webrtcUrl", webrtcUrl);
+ return map;
+ }
+
+ @Override
+ public Map<String, String> editPath(String name, String sourceUrl, String mode, String isCode) {
+ Map<String, String> map = new HashMap<>();
+ try {
+ String rtspUrl = "rtsp://" + mediamtxHost + ":8554/" + name;
+ String rtmpUrl = "rtmp://" + mediamtxHost + ":1935/" + name;
+ String webrtcUrl = "http://" + mediamtxHost + ":8889/" + name;
+
+ Conf mediaInfo = new Conf();
+ String rootPath = System.getProperty("user.dir").replaceAll("\\\\", "/") + "/lib/mediamtx/";
+ if (isCode.equals("1")) {
+ mediaInfo.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";
+ }
mediaInfo.setRunondemand(cmd);
mediaInfo.setRunondemandrestart(true);
+ mediaInfo.setRunondemandcloseafter("5s");
} else {
- mediaInfo.setRunoninit(cmd);
- mediaInfo.setRunoninitrestart(true);
+ mediaInfo.setSource(sourceUrl);
}
- } else {
- mediaInfo.setSource(rtspPath);
+ mediaInfo.setMaxReaders(100);
+ mediaInfo.setSourceprotocol("tcp");
+
+ mediaClient.editPath(name, mediaInfo);
+
+ // Map<String,String> map=new HashMap<>();
+ map.put("rtspUrl", rtspUrl);
+ map.put("rtmpUrl", rtmpUrl);
+ map.put("webrtcUrl", webrtcUrl);
+ } catch (ForestNetworkException ex) {
+ log.error(ex.getMessage());
}
- mediaInfo.setSourceprotocol("tcp");
- mediaClient.addPath(name, mediaInfo);
- return rtspUrl;
+ return map;
}
@Override
@@ -148,19 +145,17 @@
StreamInfo info = new StreamInfo();
//ID
info.setName(name);
- String runoninit;
- String runondemand = item.getConf().getRunondemand();
- if (StringUtils.isNotEmpty(runondemand)) {
- runoninit = item.getConf().getRunondemand();
- info.setMode("1");
- } else {
- runoninit = item.getConf().getRunoninit();
+ String runOn;
+ if (StringUtils.isNotEmpty(item.getConf().getRunondemand())) {
+ runOn = item.getConf().getRunondemand();
info.setMode("0");
+ } else {
+ //runOn = item.getConf().getRunonready();
+ runOn = item.getConf().getRunoninit();
+ info.setMode("1");
}
//RTSP婧愬湴鍧�
- String regex = "rtsp://[^\\s\"]+";
- Pattern pattern = Pattern.compile(regex);
- Matcher matcher = pattern.matcher(runoninit);
+ Matcher matcher = Pattern.compile("rtsp://[^\\s\"]+").matcher(runOn);
if (matcher.find()) {
info.setRtspSource(matcher.group());
info.setIsCode("1");
@@ -179,6 +174,11 @@
}
@Override
+ public void removePath(String name) {
+ mediaClient.removePath(name);
+ }
+
+ @Override
public List<StreamInfo> paths() {
String list = mediaClient.paths();
JsonsRoot jsonsRoot = JSONObject.parseObject(list, JsonsRoot.class);
@@ -189,19 +189,12 @@
//ID
String name = item.getName();
info.setName(name);
- String runoninit;
- String runondemand = item.getConf().getRunondemand();
- if (StringUtils.isNotEmpty(runondemand)) {
- runoninit = item.getConf().getRunondemand();
- info.setMode("1");
- } else {
- runoninit = item.getConf().getRunoninit();
- info.setMode("0");
+ String runOn = "";
+ if (StringUtils.isNotEmpty(item.getConf().getRunondemand())) {
+ runOn = item.getConf().getRunondemand();
}
//RTSP婧愬湴鍧�
- String regex = "rtsp://[^\\s\"]+";
- Pattern pattern = Pattern.compile(regex);
- Matcher matcher = pattern.matcher(runoninit);
+ Matcher matcher = Pattern.compile("rtsp://[^\\s\"]+").matcher(runOn);
if (matcher.find()) {
info.setRtspSource(matcher.group());
info.setIsCode("1");
@@ -210,9 +203,7 @@
info.setIsCode("0");
}
//浼犺緭鍗忚
- regex = "-rtsp_transport\\s+(\\w+)";
- pattern = Pattern.compile(regex);
- matcher = pattern.matcher(runoninit);
+ matcher = Pattern.compile("-rtsp_transport\\s+(\\w+)").matcher(runOn);
if (matcher.find()) {
info.setProtocol(matcher.group(1));
}
@@ -264,7 +255,7 @@
String rtmpUrl = "rtmp://" + mediamtxHost + ":1935/" + name;
info.setRtmpUrl(rtmpUrl);
//RTSP鎾斁鍦板潃
- String rtspUrl = "rtsp://" + mediamtxHost + ":7554/" + name;
+ String rtspUrl = "rtsp://" + mediamtxHost + ":8554/" + name;
info.setRtspUrl(rtspUrl);
//WEBRTC鎾斁鍦板潃
String webrtcUrl = "http://" + mediamtxHost + ":8889/" + name;
@@ -295,16 +286,11 @@
info.setRemoteAddr(rtspSession.getRemoteAddr());
}
//RTSP婧愬湴鍧�
- String runondemand = item.getConf().getRunondemand();
- String runoninit;
- if (StringUtils.isNotEmpty(runondemand)) {
- runoninit = item.getConf().getRunondemand();
- } else {
- runoninit = item.getConf().getRunoninit();
+ String runOn = "";
+ if (StringUtils.isNotEmpty(item.getConf().getRunondemand())) {
+ runOn = item.getConf().getRunondemand();
}
- String regex = "rtsp://[^\\s\"]+";
- Pattern pattern = Pattern.compile(regex);
- Matcher matcher = pattern.matcher(runoninit);
+ Matcher matcher = Pattern.compile("rtsp://[^\\s\"]+").matcher(runOn);
if (matcher.find()) {
info.setRtspSource(matcher.group());
} else {
@@ -315,7 +301,6 @@
//鎷夋祦鏁伴噺
List<Readers> readers = item.getReaders();
info.setNum(readers.size());
-
PushStreamInfoList.add(info);
}
@@ -463,5 +448,27 @@
return false;
}
}
-
+ /**
+ * 鑾峰彇娴佸獟浣搉ame鍒楄〃
+ * 鍒樿嫃涔�
+ * 2023/10/13 14:19:07
+ */
+ @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());
+ }
+ return nameList;
+ }
+ /**
+ * 閰嶇疆娴佸獟浣撳弬鏁�
+ */
+ @Override
+ public String setConfig(Config config) {
+ return mediaClient.setConfig(config);
+ }
}
--
Gitblit v1.9.3