优化发流逻辑

648540858
1 parent 17ea3750
Showing 3 changed files with 7 additions and 29 deletions
src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
src/main/resources/all-application.yml
@@ -43,8 +43,6 @@ public class UserSetting {
  
     private Boolean pushAuthority = Boolean.TRUE;
  
-    private Boolean gbSendStreamStrict = Boolean.FALSE;
-
     private Boolean syncChannelOnDeviceOnline = Boolean.FALSE;
  
     private Boolean sipLog = Boolean.FALSE;
@@ -204,14 +202,6 @@ public class UserSetting {
         this.pushAuthority = pushAuthority;
     }
  
-    public Boolean getGbSendStreamStrict() {
-        return gbSendStreamStrict;
-    }
-
-    public void setGbSendStreamStrict(Boolean gbSendStreamStrict) {
-        this.gbSendStreamStrict = gbSendStreamStrict;
-    }
-
     public Boolean getSyncChannelOnDeviceOnline() {
         return syncChannelOnDeviceOnline;
     }
@@ -163,15 +163,9 @@ public class ZLMRTPServerFactory {
     public SendRtpItem createSendRtpItem(MediaServerItem serverItem, String ip, int port, String ssrc, String platformId,
                                          String deviceId, String channelId, boolean tcp, boolean rtcp){
  
-        // 默认为随机端口
-        int localPort = 0;
-        if (userSetting.getGbSendStreamStrict()) {
-            if (userSetting.getGbSendStreamStrict()) {
-                localPort = sendRtpPortManager.getNextPort(serverItem);
-                if (localPort == 0) {
-                    return null;
-                }
-            }
+        int localPort = sendRtpPortManager.getNextPort(serverItem);
+        if (localPort == 0) {
+            return null;
         }
         SendRtpItem sendRtpItem = new SendRtpItem();
         sendRtpItem.setIp(ip);
@@ -201,13 +195,10 @@ public class ZLMRTPServerFactory {
      */
     public SendRtpItem createSendRtpItem(MediaServerItem serverItem, String ip, int port, String ssrc, String platformId,
                                          String app, String stream, String channelId, boolean tcp, boolean rtcp){
-        // 默认为随机端口
-        int localPort = 0;
-        if (userSetting.getGbSendStreamStrict()) {
-            localPort = sendRtpPortManager.getNextPort(serverItem);
-            if (localPort == 0) {
-                return null;
-            }
+
+        int localPort = sendRtpPortManager.getNextPort(serverItem);
+        if (localPort == 0) {
+            return null;
         }
         SendRtpItem sendRtpItem = new SendRtpItem();
         sendRtpItem.setIp(ip);
@@ -170,9 +170,6 @@ user-settings:
     stream-on-demand: true
     # 推流鉴权， 默认开启
     push-authority: true
-    # 国标级联发流严格模式，严格模式会使用与sdp信息中一致的端口发流，端口共享media.rtp.port-range，这会损失一些性能，
-    # 非严格模式使用随机端口发流，性能更好， 默认关闭
-    gb-send-stream-strict: false
     # 设备上线时是否自动同步通道
     sync-channel-on-device-online: false
     # 是否使用设备来源Ip作为回复IP， 不设置则为 false