From 71dbac60afa54d2642c3471c080686da56579ca0 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 09 九月 2023 16:37:13 +0800
Subject: [PATCH] 流媒体优化
---
ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java | 83 ++++++++++++++++++++++-------------------
1 files changed, 44 insertions(+), 39 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 4966e7e..32fc297 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,8 @@
package com.ruoyi.media.service.impl;
import com.alibaba.fastjson2.JSONObject;
+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;
@@ -20,10 +22,7 @@
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;
@@ -61,8 +60,13 @@
mediaClient.removePath(path.getName());
}
List<Vtdu> vtduList = vtduMapper.selectVtduList(new Vtdu());
- for (Vtdu v : vtduList) {
- addPath(v.getName(), v.getRtspUrl(), v.getCodeType(), v.getIsCode());
+ for (Vtdu vtdu : vtduList) {
+ Map<String, String> map = addPath(vtdu.getName(), vtdu.getSourceUrl(), vtdu.getCodeType(), vtdu.getIsCode());
+ vtdu.setRtspUrl(map.get("rtspUrl"));
+ vtdu.setRtmpUrl(map.get("rtmpUrl"));
+ vtdu.setWebrtcUrl(map.get("webrtcUrl"));
+ vtdu.setUpdateTime(DateUtils.getNowDate());
+ vtduMapper.updateVtdu(vtdu);
}
} catch (Exception ex) {
log.error("鍔犺浇娴佸獟浣撳垪琛ㄥ紓甯�:" + ex.getMessage());
@@ -105,8 +109,11 @@
}
@Override
- public String addPath(String name, String rtspPath, String mode, String isCode) {
+ public Map<String,String> addPath(String name, String sourceUrl, String mode, String isCode) {
String rtspUrl = "rtsp://" + mediamtxHost + ":7554/" + 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/";
//-vcodec libx264 //鎸囧畾瑙嗛缂栫爜鍣ㄤ负 libx264锛屼娇鐢� H.264 缂栫爜鏍煎紡杩涜瑙嗛鍘嬬缉
@@ -124,9 +131,9 @@
//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";
if (isCode.equals("1")) {
- String cmd = rootPath + "ffmpeg -rtsp_transport tcp -i " + rtspPath + " -vcodec libx264 -preset:v ultrafast -r 25 -keyint_min 20 -g 20 -sc_threshold 0 -threads 6 -b:v 2048k -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
+ String cmd = rootPath + "ffmpeg -rtsp_transport tcp -i " + sourceUrl + " -vcodec libx264 -preset:v ultrafast -r 25 -keyint_min 25 -g 25 -sc_threshold 0 -threads 6 -b:v 4096k -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
if (!softwareDecoding) {
- cmd = rootPath + "ffmpeg -hwaccel cuvid -c:v h264_cuvid -rtsp_transport tcp -i " + rtspPath + " -c:v h264_nvenc -r 25 -g 60 -threads 6 -b:v 2048k -bf 0 -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
+ cmd = rootPath + "ffmpeg -hwaccel cuvid -c:v h264_cuvid -rtsp_transport tcp -i " + sourceUrl + " -c:v h264_nvenc -r 25 -g 60 -threads 6 -b:v 4096k -bf 0 -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
}
if (mode.equals("0")) {
mediaInfo.setRunondemand(cmd);
@@ -134,13 +141,20 @@
} else {
mediaInfo.setRunoninit(cmd);
mediaInfo.setRunoninitrestart(true);
+ //mediaInfo.setRunonready(cmd);
+ //mediaInfo.setRunonreadyrestart(true);
}
} else {
- mediaInfo.setSource(rtspPath);
+ mediaInfo.setSource(sourceUrl);
}
+ mediaInfo.setMaxReaders(100);
mediaInfo.setSourceprotocol("tcp");
mediaClient.addPath(name, mediaInfo);
- return rtspUrl;
+ Map<String,String> map=new HashMap<>();
+ map.put("rtspUrl",rtspUrl);
+ map.put("rtmpUrl",rtmpUrl);
+ map.put("webrtcUrl",webrtcUrl);
+ return map;
}
@Override
@@ -149,19 +163,17 @@
StreamInfo info = new StreamInfo();
//ID
info.setName(name);
- String runoninit;
- String runondemand = item.getConf().getRunondemand();
- if (StringUtils.isNotEmpty(runondemand)) {
- runoninit = item.getConf().getRunondemand();
+ String runOn;
+ if (StringUtils.isNotEmpty(item.getConf().getRunondemand())) {
+ runOn = item.getConf().getRunondemand();
info.setMode("0");
} else {
- runoninit = item.getConf().getRunoninit();
+ //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");
@@ -190,19 +202,17 @@
//ID
String name = item.getName();
info.setName(name);
- String runoninit;
- String runondemand = item.getConf().getRunondemand();
- if (StringUtils.isNotEmpty(runondemand)) {
- runoninit = item.getConf().getRunondemand();
+ String runOn;
+ if (StringUtils.isNotEmpty(item.getConf().getRunondemand())) {
+ runOn = item.getConf().getRunondemand();
info.setMode("0");
} else {
- runoninit = item.getConf().getRunoninit();
+ runOn = item.getConf().getRunoninit();
+ //runOn = item.getConf().getRunonready();
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");
@@ -211,9 +221,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));
}
@@ -296,16 +304,14 @@
info.setRemoteAddr(rtspSession.getRemoteAddr());
}
//RTSP婧愬湴鍧�
- String runondemand = item.getConf().getRunondemand();
- String runoninit;
- if (StringUtils.isNotEmpty(runondemand)) {
- runoninit = item.getConf().getRunondemand();
+ String runOn;
+ if (StringUtils.isNotEmpty(item.getConf().getRunondemand())) {
+ runOn = item.getConf().getRunondemand();
} else {
- runoninit = item.getConf().getRunoninit();
+ runOn = item.getConf().getRunoninit();
+ //runOn = item.getConf().getRunonready();
}
- 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 {
@@ -316,7 +322,6 @@
//鎷夋祦鏁伴噺
List<Readers> readers = item.getReaders();
info.setNum(readers.size());
-
PushStreamInfoList.add(info);
}
--
Gitblit v1.9.3