From 8456b0bbb9d1536ebb0b2dc476be736bdd5fb82c Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: Fri, 13 Oct 2023 15:58:20 +0800
Subject: [PATCH] 1. 流媒体增加通过接口配置软硬件解码 2. 流媒体自动同步相机设备。
---
ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java | 216 +++++++++++++++++++++++++-----------------------------
1 files changed, 100 insertions(+), 116 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 6f48201..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,9 @@
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;
@@ -16,6 +19,7 @@
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;
@@ -36,141 +40,102 @@
@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.software_decoding}")
- Boolean softwareDecoding;
+ /**
+ * 添加流媒体
+ * 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.debug("开始加载流媒体列表");
- List<StreamInfo> paths = paths();
- for (StreamInfo path : paths) {
- mediaClient.removePath(path.getName());
- }
- List<Vtdu> vtduList = vtduMapper.selectVtduList(new Vtdu());
- 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());
- }
- }
+ public Map<String, String> addPath(String name, String sourceUrl, String mode, String isCode) {
- @Override
- public Map<String,String> addPath(String name, String sourceUrl, String mode, String isCode) {
- String rtspUrl = "rtsp://" + mediamtxHost + ":7554/" + name;
+ 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/";
- //-vcodec libx264 //指定视频编码器为 libx264，使用 H.264 编码格式进行视频压缩
- //-preset ultrafast //--preset的参数主要调节编码速度和质量的平衡，有ultrafast（转码速度最快，视频往往也最模糊）、superfast、veryfast、faster、fast、medium、slow、slower、veryslow、placebo这10个选项，从快到慢
- //-r 25 //设置输出视频的帧率为 25 帧/秒
- //-g 20 //关键帧间隔20
- //-sc_threshold 0 //将其设置为0（-sc_threshold 0）禁用场景变化检测
- //-rtsp_transport tcp //这个选项告诉 FFmpeg 使用 TCP 作为 RTSP 的传输协议
- //-threads 4: 指定要使用的线程数为 4。//这允许 FFmpeg 在多核处理器上使用多个线程来进行视频编码，以加快速度。
- // -i //用于指定输入媒体文件或输入流的地址
- // -bf 0 禁用B帧，因为webrtc在网页调用时控制台一直输出 WebRTC doesn’t 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";
if (isCode.equals("1")) {
- String cmd = "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 2048k -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
- if (!softwareDecoding) {
- cmd = "ffmpeg -hwaccel cuvid -c:v h264_cuvid -rtsp_transport tcp -i " + sourceUrl + " -c:v h264_nvenc -r 25 -g 60 -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("0")) {
- mediaInfo.setRunondemand(cmd);
- mediaInfo.setRunondemandrestart(true);
- mediaInfo.setRunondemandcloseafter("5s");
- } else {
- mediaInfo.setRunoninit(cmd);
- mediaInfo.setRunoninitrestart(true);
- }
+ mediaInfo.setRunondemand(cmd);
+ mediaInfo.setRunondemandrestart(true);
+ mediaInfo.setRunondemandcloseafter("5s");
} else {
mediaInfo.setSource(sourceUrl);
+ mediaInfo.setSourceondemand(true);
}
mediaInfo.setMaxReaders(100);
mediaInfo.setSourceprotocol("tcp");
- mediaClient.addPath(name, mediaInfo);
- Map<String,String> map=new HashMap<>();
- map.put("rtspUrl",rtspUrl);
- map.put("rtmpUrl",rtmpUrl);
- map.put("webrtcUrl",webrtcUrl);
+
+ 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) {
- String rtspUrl = "rtsp://" + mediamtxHost + ":7554/" + name;
- String rtmpUrl = "rtmp://" + mediamtxHost + ":1935/" + name;
- String webrtcUrl = "http://" + mediamtxHost + ":8889/" + name;
+ 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/";
- //-vcodec libx264 //指定视频编码器为 libx264，使用 H.264 编码格式进行视频压缩
- //-preset ultrafast //--preset的参数主要调节编码速度和质量的平衡，有ultrafast（转码速度最快，视频往往也最模糊）、superfast、veryfast、faster、fast、medium、slow、slower、veryslow、placebo这10个选项，从快到慢
- //-r 25 //设置输出视频的帧率为 25 帧/秒
- //-g 20 //关键帧间隔20
- //-sc_threshold 0 //将其设置为0（-sc_threshold 0）禁用场景变化检测
- //-rtsp_transport tcp //这个选项告诉 FFmpeg 使用 TCP 作为 RTSP 的传输协议
- //-threads 4: 指定要使用的线程数为 4。//这允许 FFmpeg 在多核处理器上使用多个线程来进行视频编码，以加快速度。
- // -i //用于指定输入媒体文件或输入流的地址
- // -bf 0 禁用B帧，因为webrtc在网页调用时控制台一直输出 WebRTC doesn’t 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";
- 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 25 -sc_threshold 0 -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 " + sourceUrl + " -c:v h264_nvenc -r 25 -g 60 -threads 6 -b:v 2048k -bf 0 -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
- }
- if (mode.equals("0")) {
+ 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.setRunondemandcloseafter("5s");
mediaInfo.setRunondemandrestart(true);
- mediaInfo.setRunoninit("");
- mediaInfo.setRunoninitrestart(false);
+ mediaInfo.setRunondemandcloseafter("5s");
} else {
- mediaInfo.setRunoninit(cmd);
- mediaInfo.setRunoninitrestart(true);
- mediaInfo.setRunondemand("");
- mediaInfo.setRunondemandrestart(false);
+ mediaInfo.setSource(sourceUrl);
}
- } else {
- mediaInfo.setSource(sourceUrl);
- mediaInfo.setRunondemand("");
- mediaInfo.setRunondemandrestart(false);
- mediaInfo.setRunoninit("");
- mediaInfo.setRunoninitrestart(false);
+ 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.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);
return map;
}
@@ -209,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);
@@ -219,14 +189,9 @@
//ID
String name = item.getName();
info.setName(name);
- String runOn;
+ String runOn = "";
if (StringUtils.isNotEmpty(item.getConf().getRunondemand())) {
runOn = item.getConf().getRunondemand();
- info.setMode("0");
- } else {
- runOn = item.getConf().getRunoninit();
- //runOn = item.getConf().getRunonready();
- info.setMode("1");
}
//RTSP源地址
Matcher matcher = Pattern.compile("rtsp://[^\\s\"]+").matcher(runOn);
@@ -290,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;
@@ -321,12 +286,9 @@
info.setRemoteAddr(rtspSession.getRemoteAddr());
}
//RTSP源地址
- String runOn;
+ String runOn = "";
if (StringUtils.isNotEmpty(item.getConf().getRunondemand())) {
runOn = item.getConf().getRunondemand();
- } else {
- runOn = item.getConf().getRunoninit();
- //runOn = item.getConf().getRunonready();
}
Matcher matcher = Pattern.compile("rtsp://[^\\s\"]+").matcher(runOn);
if (matcher.find()) {
@@ -486,5 +448,27 @@
return false;
}
}
-
+ /**
+ * 获取流媒体name列表
+ * 刘苏义
+ * 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