From 935fda56e95270493d9e3e46d28b29125d330ca3 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期一, 29 七月 2024 16:31:02 +0800
Subject: [PATCH] 修改：流媒体转码使用ffmpeg绝对路径，配置文件中增加ffmpegPath 增加：部门列表查询和部门详情查询无数据权限
---
ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 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 ea897fe..1050dce 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
@@ -41,7 +41,8 @@
@Value("${mediamtx.host}")
String mediamtxHost;
-
+ @Value("${mediamtx.ffmpegPath}")
+ String ffmpegPath;
/**
* 娣诲姞娴佸獟浣�
@@ -66,9 +67,9 @@
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";
+ String cmd = ffmpegPath + "/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";
+ cmd = ffmpegPath + "/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);
@@ -106,13 +107,13 @@
String webrtcUrl = "http://" + mediamtxHost + ":8889/" + name;
Conf conf = new Conf();
- String rootPath = System.getProperty("user.dir").replaceAll("\\\\", "/") + "/lib/mediamtx/";
+ 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";
+ String cmd = ffmpegPath + "/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";
+ cmd = ffmpegPath + "/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);
@@ -331,7 +332,7 @@
@Override
public TableDataInfo getPullWebrtcStreamList(Integer pageNum, Integer pageSize) {
TableDataInfo tableDataInfo = new TableDataInfo();
- WebrtcSessions WebrtcSessions = mediaClient.webrtcsessions(pageNum-1, pageSize);
+ WebrtcSessions WebrtcSessions = mediaClient.webrtcsessions(pageNum - 1, pageSize);
List<WebrtcSession> webrtcsessions = WebrtcSessions.getItems();
webrtcsessions.stream().forEach(
webrtcSession -> {
@@ -355,7 +356,7 @@
@Override
public TableDataInfo getPullRtmpStreamList(Integer pageNum, Integer pageSize) {
TableDataInfo tableDataInfo = new TableDataInfo();
- RtmpSessions rtmpSessions = mediaClient.rtmpsessions(pageNum-1, pageSize);
+ RtmpSessions rtmpSessions = mediaClient.rtmpsessions(pageNum - 1, pageSize);
List<RtmpSession> webrtcsessions = rtmpSessions.getItems();
webrtcsessions.stream().forEach(
webrtcSession -> {
@@ -379,7 +380,7 @@
@Override
public TableDataInfo getPullRtspStreamList(Integer pageNum, Integer pageSize) {
TableDataInfo tableDataInfo = new TableDataInfo();
- RtspSessions rtspSessions = mediaClient.rtspsessions(pageNum-1, pageSize);
+ RtspSessions rtspSessions = mediaClient.rtspsessions(pageNum - 1, pageSize);
List<RtspSession> webrtcsessions = rtspSessions.getItems();
webrtcsessions.stream().forEach(
webrtcSession -> {
--
Gitblit v1.9.3