From 85681b3f89d2287b948870f79a2eef780480b6a7 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期二, 08 八月 2023 11:02:53 +0800
Subject: [PATCH] 日子返回格式
---
ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java | 101 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 68 insertions(+), 33 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java b/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java
index baa5569..d10da3b 100644
--- a/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java
+++ b/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java
@@ -6,33 +6,81 @@
import com.ruoyi.media.service.IMediaService;
import com.ruoyi.utils.forest.MediaClient;
import com.ruoyi.utils.tools.ArdTool;
+import com.ruoyi.utils.tools.CmdUtils;
+import com.sun.jna.Platform;
import io.minio.messages.Item;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
+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.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
- * @Description:
+ * @Description: 娴佸獟浣撲笟鍔�
* @ClassName: MediaService
* @Author: 鍒樿嫃涔�
* @Date: 2023骞�07鏈�13鏃�9:28
* @Version: 1.0
**/
@Service
+@Slf4j(topic = "cmd")
public class MediaService implements IMediaService {
@Resource
MediaClient mediaClient;
@Value("${mediamtx.host}")
String mediamtxHost;
+ @Value("${mediamtx.enabled}")
+ Boolean mediamtxEnabled;
+
+ String processName = "mediamtx.exe";
+
+ @PostConstruct
+ public void initMediaMtx() {
+ if (mediamtxEnabled) {
+ 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";
+
+ 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);
+ }
+ }
+ }
+
+ @PreDestroy
+ public void destroyMediaMtx() {
+ log.info("閿�姣乵ediaMtx");
+ if (CmdUtils.isProcessRunning(processName)) {
+ // 杩涚▼宸茬粡鍦ㄨ繍琛岋紝缁撴潫璇ヨ繘绋�
+ CmdUtils.stopProcess(processName);
+ }
+ }
+
@Override
- public String addPath(String name, String rtspPath,String mode) {
- String rtspUrl = "rtsp://" + mediamtxHost + ":8554/";
+ public String addPath(String name, String rtspPath, String mode) {
+ String rtspUrl = "rtsp://" + mediamtxHost + ":7554/";
Conf mediaInfo = new Conf();
//-vcodec libx264 //鎸囧畾瑙嗛缂栫爜鍣ㄤ负 libx264锛屼娇鐢� H.264 缂栫爜鏍煎紡杩涜瑙嗛鍘嬬缉
//-preset ultrafast //--preset鐨勫弬鏁颁富瑕佽皟鑺傜紪鐮侀�熷害鍜岃川閲忕殑骞宠 锛屾湁ultrafast锛堣浆鐮侀�熷害鏈�蹇紝瑙嗛寰�寰�涔熸渶妯＄硦锛夈�乻uperfast銆乿eryfast銆乫aster銆乫ast銆乵edium銆乻low銆乻lower銆乿eryslow銆乸lacebo杩�10涓�夐」锛屼粠蹇埌鎱�
@@ -46,14 +94,12 @@
//GPU纭В鐮佺紪鐮� -hwaccel cuvid -c:v h264_cuvid 浣跨敤cuda瑙ｇ爜 -c:v h264_nvenc 浣跨敤cuda缂栫爜
//String cmd = "ffmpeg -hwaccel cuvid -c:v h264_cuvid -rtsp_transport udp -i \"" + rtspPath + "\" -c:v h264_nvenc -r 25 -threads 4 -b:v 4096k -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
- if(mode.equals("1"))
- {
+ if (mode.equals("1")) {
mediaInfo.setRunondemand(cmd);
mediaInfo.setRunondemandrestart(true);
- }
- else{
- mediaInfo.setRunoninit(cmd);
- mediaInfo.setRunoninitrestart(true);
+ } else {
+ mediaInfo.setRunoninit(cmd);
+ mediaInfo.setRunoninitrestart(true);
}
mediaClient.addPath(name, mediaInfo);
return rtspUrl + name;
@@ -67,13 +113,10 @@
info.setName(name);
String runoninit;
String runondemand = item.getConf().getRunondemand();
- if (StringUtils.isNotEmpty(runondemand))
- {
- runoninit= item.getConf().getRunondemand();
+ if (StringUtils.isNotEmpty(runondemand)) {
+ runoninit = item.getConf().getRunondemand();
info.setMode("1");
- }
- else
- {
+ } else {
runoninit = item.getConf().getRunoninit();
info.setMode("2");
}
@@ -89,8 +132,7 @@
@Override
public void removePath(String[] names) {
- for(String name:names)
- {
+ for (String name : names) {
mediaClient.removePath(name);
}
}
@@ -109,13 +151,10 @@
info.setName(name);
String runoninit;
String runondemand = item.getConf().getRunondemand();
- if (StringUtils.isNotEmpty(runondemand))
- {
- runoninit= item.getConf().getRunondemand();
+ if (StringUtils.isNotEmpty(runondemand)) {
+ runoninit = item.getConf().getRunondemand();
info.setMode("1");
- }
- else
- {
+ } else {
runoninit = item.getConf().getRunoninit();
info.setMode("2");
}
@@ -205,11 +244,10 @@
String name = item.getName();
info.setName(name);
//RTSP鎾斁鍦板潃
- String rtspUrl = "rtsp://" + mediamtxHost + ":8554/" + name;
+ String rtspUrl = "rtsp://" + mediamtxHost + ":7554/" + name;
info.setRtspUrl(rtspUrl);
Source source = item.getSource();
- if(source==null)
- {
+ if (source == null) {
continue;
}
RtspSession rtspSession = getRtspSessionById(source.getId());
@@ -228,13 +266,10 @@
//RTSP婧愬湴鍧�
String runondemand = item.getConf().getRunondemand();
String runoninit;
- if(StringUtils.isNotEmpty(runondemand))
- {
- runoninit = item.getConf().getRunondemand();
- }
- else
- {
- runoninit = item.getConf().getRunoninit();
+ if (StringUtils.isNotEmpty(runondemand)) {
+ runoninit = item.getConf().getRunondemand();
+ } else {
+ runoninit = item.getConf().getRunoninit();
}
String regex = "rtsp://[^\\s\"]+";
Pattern pattern = Pattern.compile(regex);
--
Gitblit v1.9.3