From 9e1c6de09a1c078e02d267c980d0ee49003016ee Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Thu, 27 Nov 2025 11:46:20 +0800
Subject: [PATCH] 流媒体增加rtsp/rtmp/webrtc端口自定义

---
 ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java
index 1852a1b..7133276 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java
@@ -81,6 +81,11 @@
     @Override
     public void saveLiveCapacity(LiveCapacityReceiver liveCapacityReceiver, Long timestamp) {
         // Solve timing problems
+        if (liveCapacityReceiver == null) {
+            //2025-10-28 zwy,这里有个空指针异常问题,如果liveCapacityReceiver为空,则不应该执行下面的代码。
+            //机场设备在刚开机时,发送的state状态时,直播能力前三次发送的是空,可能是由于刚开机,等待各设备开机,第四次为正常数据。
+            return;
+        }
         for (CapacityDeviceReceiver capacityDeviceReceiver : liveCapacityReceiver.getDeviceList()) {
             long last = (long) Objects.requireNonNullElse(
                     RedisOpsUtils.get(RedisConst.LIVE_CAPACITY + capacityDeviceReceiver.getSn()), 0L);
@@ -95,7 +100,8 @@
 
     @Override
     public ResponseResult liveStart(LiveTypeDTO liveParam) {
-        String rtmpPublishUrl = "rtmp://" + mediamtxConfig.getApiHost() + ":1935/" + liveParam.getVideoId();
+        String rtmpPublishUrl =
+                "rtmp://" + mediamtxConfig.getApiHost() + ":" + mediamtxConfig.getRtmpPort() + "/" + liveParam.getVideoId();
         liveParam.setUrl(rtmpPublishUrl);
         // Check if this lens is available live.
         ResponseResult responseResult = this.checkBeforeLive(liveParam.getVideoId());
@@ -120,13 +126,20 @@
             case RTMP:
                 String name = liveParam.getVideoId();
                 // 拼接地址
-                String rtspUrl = "rtsp://" + mediamtxConfig.getPlayHost() + ":8554" + "/" + name;  // 拼接 webrtcUrl
-                String rtmpUrl = "rtmp://" + mediamtxConfig.getPlayHost() + ":1935" + "/" + name;  // 拼接 webrtcUrl
+                String rtspUrl =
+                        "rtsp://" + mediamtxConfig.getPlayHost() + ":" + mediamtxConfig.getRtspPort() + "/" + name;  //
+                // 拼接 webrtcUrl
+                String rtmpUrl =
+                        "rtmp://" + mediamtxConfig.getPlayHost() + ":" + mediamtxConfig.getRtmpPort() + "/" + name;  //
+                // 拼接 webrtcUrl
                 String protocol = mediamtxConfig.isHttps() ? "https://" : "http://";
-                String webrtcUrl = protocol + mediamtxConfig.getPlayHost() + ":8889" + "/" + name;  // 拼接 webrtcUrl
+                String webrtcUrl =
+                        protocol + mediamtxConfig.getPlayHost() + ":" + mediamtxConfig.getWebrtcPort() + "/" + name;  // 拼接
+                // webrtcUrl
 
                 // 如果没有,插入新的记录
-                ArdVtdu vtdu = ArdVtdu.builder().name(name).rtspSource("publisher").rtspUrl(rtspUrl).rtmpUrl(rtmpUrl).webrtcUrl(webrtcUrl).build();
+                ArdVtdu vtdu =
+                        ArdVtdu.builder().name(name).rtspSource("publisher").rtspUrl(rtspUrl).rtmpUrl(rtmpUrl).webrtcUrl(webrtcUrl).build();
                 int i = ardVtduService.insertArdVtdu(vtdu);  // 保存到媒体表
                 if (i > 0) {
                     live.setRtmpUrl(rtmpUrl);

--
Gitblit v1.9.3