panlinlin
2021-04-26 5ba0fba03d9fcb09eea0c1e703a4f050378d7992
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
@@ -91,6 +91,9 @@
   @Value("${media.autoApplyPlay}")
   private boolean autoApplyPlay;
   @Value("${userSettings.waitTrack}")
   private boolean waitTrack;
   @Autowired
   private ZLMHttpHookSubscribe subscribe;
@@ -376,7 +379,7 @@
         subscribeKey.put("regist", true);
         subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey, json->{
            if (json.getJSONArray("tracks") == null) return;
            if (waitTrack && json.getJSONArray("tracks") == null) return;
            event.response(json);
            subscribe.removeSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey);
         });
@@ -426,19 +429,12 @@
            content.append("a=rtpmap:96 PS/90000\r\n");
            content.append("a=rtpmap:98 H264/90000\r\n");
            content.append("a=rtpmap:97 MPEG4/90000\r\n");
            if("TCP-PASSIVE".equals(streamMode)) { // tcp被动模式
            if ("TCP-PASSIVE".equals(streamMode)) { // tcp被动模式
               content.append("a=setup:passive\r\n");
               content.append("a=recvonly\r\n");
               content.append("a=rtpmap:96 PS/90000\r\n");
               content.append("a=rtpmap:98 H264/90000\r\n");
               content.append("a=rtpmap:97 MPEG4/90000\r\n");
               if ("TCP-PASSIVE".equals(streamMode)) { // tcp被动模式
                  content.append("a=setup:passive\r\n");
                  content.append("a=connection:new\r\n");
               } else if ("TCP-ACTIVE".equals(streamMode)) { // tcp主动模式
                  content.append("a=setup:active\r\n");
                  content.append("a=connection:new\r\n");
               }
               content.append("a=connection:new\r\n");
            } else if ("TCP-ACTIVE".equals(streamMode)) { // tcp主动模式
               content.append("a=setup:active\r\n");
               content.append("a=connection:new\r\n");
            }
         }