From e82cfae81d016a5171224f1358eba663d2f60c68 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 12 八月 2023 15:23:49 +0800
Subject: [PATCH] 流媒体区分转码和不转码

---
 ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java |   78 +++++++++++++++++++++++++-------------
 1 files changed, 51 insertions(+), 27 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 c4be437..e493271 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
@@ -81,8 +81,8 @@
     }
 
     @Override
-    public String addPath(String name, String rtspPath, String mode) {
-        String rtspUrl = "rtsp://" + mediamtxHost + ":7554/";
+    public String addPath(String name, String rtspPath, String mode, String isCode) {
+        String rtspUrl = "rtsp://" + mediamtxHost + ":7554/" + name;
         Conf mediaInfo = new Conf();
         //-vcodec libx264 //鎸囧畾瑙嗛缂栫爜鍣ㄤ负 libx264锛屼娇鐢� H.264 缂栫爜鏍煎紡杩涜瑙嗛鍘嬬缉
         //-preset ultrafast  //--preset鐨勫弬鏁颁富瑕佽皟鑺傜紪鐮侀�熷害鍜岃川閲忕殑骞宠 锛屾湁ultrafast锛堣浆鐮侀�熷害鏈�蹇紝瑙嗛寰�寰�涔熸渶妯$硦锛夈�乻uperfast銆乿eryfast銆乫aster銆乫ast銆乵edium銆乻low銆乻lower銆乿eryslow銆乸lacebo杩�10涓�夐」锛屼粠蹇埌鎱�
@@ -95,16 +95,20 @@
         String cmd = "ffmpeg -rtsp_transport tcp -i \"" + rtspPath + "\" -vcodec libx264 -preset:v ultrafast -r 25 -threads 4  -b:v 4096k -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
         //GPU纭В鐮佺紪鐮� -hwaccel cuvid -c:v h264_cuvid  浣跨敤cuda瑙g爜   -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")) {
-            mediaInfo.setRunondemand(cmd);
-            mediaInfo.setRunondemandrestart(true);
+        if (isCode.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);
+            mediaInfo.setSource(rtspPath);
         }
+
         mediaClient.addPath(name, mediaInfo);
-        return rtspUrl + name;
+        return rtspUrl;
     }
 
     @Override
@@ -128,6 +132,12 @@
         Matcher matcher = pattern.matcher(runoninit);
         if (matcher.find()) {
             info.setRtspSource(matcher.group());
+            info.setIsCode("1");
+        }
+        else
+        {
+            info.setRtspSource(item.getConf().getSource());
+            info.setIsCode("0");
         }
         return info;
     }
@@ -141,7 +151,6 @@
 
     @Override
     public List<StreamInfo> paths() {
-
         String list = mediaClient.paths();
         JsonsRoot jsonsRoot = JSONObject.parseObject(list, JsonsRoot.class);
         List<Items> items = jsonsRoot.getItems();
@@ -166,6 +175,10 @@
             Matcher matcher = pattern.matcher(runoninit);
             if (matcher.find()) {
                 info.setRtspSource(matcher.group());
+                info.setIsCode("1");
+            } else {
+                info.setRtspSource(item.getConf().getSource());
+                info.setIsCode("0");
             }
             //浼犺緭鍗忚
             regex = "-rtsp_transport\\s+(\\w+)";
@@ -249,22 +262,30 @@
             String rtspUrl = "rtsp://" + mediamtxHost + ":7554/" + name;
             info.setRtspUrl(rtspUrl);
             Source source = item.getSource();
-            if (source == null) {
-                continue;
+            if (source.getId().equals("")) {
+                //浼氳瘽ID
+                info.setId("0");
+                //涓婅娴侀噺
+                long bytesReceived = item.getBytesReceived();
+                String formatReceivedSize = ArdTool.formatFileSize(bytesReceived);
+                info.setUpTraffic(formatReceivedSize);
+            } else {
+                RtspSession rtspSession = getRtspSessionById(source.getId());
+                //浼氳瘽ID
+                info.setId(rtspSession.getId());
+                //寮�濮嬫帹娴佹椂闂�
+                info.setBeginTime(rtspSession.getCreated());
+                //涓婅娴侀噺
+                long bytesReceived = rtspSession.getBytesReceived();
+                String formatReceivedSize = ArdTool.formatFileSize(bytesReceived);
+                info.setUpTraffic(formatReceivedSize);
+                //涓嬭娴侀噺
+                long bytesSent = rtspSession.getBytesSent();
+                String formatSentSize = ArdTool.formatFileSize(bytesSent);
+                info.setDownTraffic(formatSentSize);
+                //鎺ㄦ祦鏈嶅姟鍣�
+                info.setRemoteAddr(rtspSession.getRemoteAddr());
             }
-            RtspSession rtspSession = getRtspSessionById(source.getId());
-            //浼氳瘽ID
-            info.setId(rtspSession.getId());
-            //寮�濮嬫帹娴佹椂闂�
-            info.setBeginTime(rtspSession.getCreated());
-            //涓婅娴侀噺
-            long bytesReceived = rtspSession.getBytesReceived();
-            String formatReceivedSize = ArdTool.formatFileSize(bytesReceived);
-            info.setUpTraffic(formatReceivedSize);
-            //涓嬭娴侀噺
-            long bytesSent = rtspSession.getBytesSent();
-            String formatSentSize = ArdTool.formatFileSize(bytesSent);
-            info.setDownTraffic(formatSentSize);
             //RTSP婧愬湴鍧�
             String runondemand = item.getConf().getRunondemand();
             String runoninit;
@@ -279,6 +300,10 @@
             if (matcher.find()) {
                 info.setRtspSource(matcher.group());
             }
+            else
+            {
+                info.setRtspSource(item.getConf().getSource());
+            }
             //浼犺緭鍗忚
             regex = "-rtsp_transport\\s+(\\w+)";
             pattern = Pattern.compile(regex);
@@ -289,8 +314,7 @@
             //鎷夋祦鏁伴噺
             List<Readers> readers = item.getReaders();
             info.setNum(readers.size());
-            //鎺ㄦ祦鏈嶅姟鍣�
-            info.setRemoteAddr(rtspSession.getRemoteAddr());
+
 
             PushStreamInfoList.add(info);
         }

--
Gitblit v1.9.3