From 606c6a34fe4bd3fad543a2f41eafe294a331685e Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 18 三月 2024 15:46:03 +0800
Subject: [PATCH] 增加流媒体删除异常捕获

---
 ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java |   21 ++++++++++++---------
 1 files changed, 12 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 694b3a5..eee6a8b 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,11 +41,11 @@
 
     @Value("${mediamtx.host}")
     String mediamtxHost;
+
     @Override
     public void run(ApplicationArguments args) throws Exception {
         mediaNameList = getNameList();
-        if(mediaNameList.size()>0)
-        {
+        if (mediaNameList.size() > 0) {
             removePath(mediaNameList.toArray(new String[0]));
             mediaNameList.clear();
         }
@@ -76,7 +76,7 @@
                 //榛樿杞В鐮�
                 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 = 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 = 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";
                 }
                 conf.setRunOnDemand(cmd);
                 conf.setRunOnDemandRestart(true);
@@ -89,8 +89,8 @@
             conf.setSourceProtocol("tcp");
 
             if (!checkNameExist(name)) {
-                 mediaClient.addPath(name, conf);
-                 mediaNameList.add(name);
+                mediaClient.addPath(name, conf);
+                mediaNameList.add(name);
             }
 
             map.put("rtspUrl", rtspUrl);
@@ -172,11 +172,14 @@
 
     @Override
     public void removePath(String[] names) {
-        for (String name : names) {
-            if (checkNameExist(name)) {
-                mediaClient.removePath(name);
-                log.info("鍒犻櫎鎴愬姛");
+        try {
+            for (String name : names) {
+                if (checkNameExist(name)) {
+                    mediaClient.removePath(name);
+                }
             }
+        } catch (Exception ex) {
+            log.error("鎵归噺绉婚櫎娴佸獟浣撳紓甯革細" + ex.getMessage());
         }
     }
 

--
Gitblit v1.9.3