增加对 需要扩展SDP的设备的单独设置

panlinlin

2020-12-28 00e61d9a80b5b013a75d1ce567dc997694577a45

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java

@@ -68,6 +68,9 @@
   @Value("${media.rtp.enable}")

   private boolean rtpEnable;



   @Value("${media.seniorSdp}")

   private boolean seniorSdp;



   @Autowired

   private ZLMHttpHookSubscribe subscribe;



@@ -289,6 +292,10 @@
         }

         String streamMode = device.getStreamMode().toUpperCase();

         MediaServerConfig mediaInfo = storager.getMediaInfo();

         if (mediaInfo == null) {

            logger.warn("点播时发现ZLM尚未连接...");

            return;

         }

         String mediaPort = null;

         // 使用动态udp端口

         if (rtpEnable) {

@@ -347,8 +354,6 @@
            storager.updateChannel(device.getDeviceId(), deviceChannel);

         }



         // TODO 订阅SIP response，处理对方的错误返回





      } catch ( SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

@@ -394,30 +399,53 @@
            mediaPort = mediaInfo.getRtpProxyPort();

         }

         String streamMode = device.getStreamMode().toUpperCase();

         if("TCP-PASSIVE".equals(streamMode)) {

            content.append("m=video "+ mediaPort +" TCP/RTP/AVP 126 125 99 34 98 97 96\r\n");

         }else if ("TCP-ACTIVE".equals(streamMode)) {

            content.append("m=video "+ mediaPort +" TCP/RTP/AVP 126 125 99 34 98 97 96\r\n");

         }else if("UDP".equals(streamMode)) {

            content.append("m=video "+ mediaPort +" RTP/AVP 126 125 99 34 98 97 96\r\n");



         if (seniorSdp) {

            if("TCP-PASSIVE".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" TCP/RTP/AVP 126 125 99 34 98 97 96\r\n");

            }else if ("TCP-ACTIVE".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" TCP/RTP/AVP 126 125 99 34 98 97 96\r\n");

            }else if("UDP".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" RTP/AVP 126 125 99 34 98 97 96\r\n");

            }

            content.append("a=recvonly\r\n");

            content.append("a=fmtp:126 profile-level-id=42e01e\r\n");

            content.append("a=rtpmap:126 H264/90000\r\n");

            content.append("a=rtpmap:125 H264S/90000\r\n");

            content.append("a=fmtp:125 profile-level-id=42e01e\r\n");

            content.append("a=rtpmap:99 MP4V-ES/90000\r\n");

            content.append("a=fmtp:99 profile-level-id=3\r\n");

            content.append("a=rtpmap:98 H264/90000\r\n");

            content.append("a=rtpmap:97 MPEG4/90000\r\n");

            content.append("a=rtpmap:96 PS/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");

            }

         }else {

            if("TCP-PASSIVE".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" TCP/RTP/AVP 96 98 97\r\n");

            }else if ("TCP-ACTIVE".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" TCP/RTP/AVP 96 98 97\r\n");

            }else if("UDP".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" RTP/AVP 96 98 97\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=recvonly\r\n");

         content.append("a=fmtp:126 profile-level-id=42e01e\r\n");

         content.append("a=rtpmap:126 H264/90000\r\n");

         content.append("a=rtpmap:125 H264S/90000\r\n");

         content.append("a=fmtp:125 profile-level-id=42e01e\r\n");

         content.append("a=rtpmap:99 MP4V-ES/90000\r\n");

         content.append("a=fmtp:99 profile-level-id=3\r\n");

         content.append("a=rtpmap:98 H264/90000\r\n");

         content.append("a=rtpmap:97 MPEG4/90000\r\n");

         content.append("a=rtpmap:96 PS/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("y="+ssrc+"\r\n");//ssrc

           

           Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), null, "playback", null);

@@ -645,7 +673,7 @@
         recordInfoXml.append("<Type>all</Type>\r\n");

         recordInfoXml.append("</Query>\r\n");

         

         Request request = headerProvider.createMessageRequest(device, recordInfoXml.toString(), "ViaRecordInfoBranch", "FromRecordInfoTag", "ToRecordInfoTag");

         Request request = headerProvider.createMessageRequest(device, recordInfoXml.toString(), "ViaRecordInfoBranch", "FromRecordInfoTag", null);





         transmitRequest(device, request, null);