Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial

648540858

2022-05-16 39efda779fcd5d613870e9024cda69da28e571b2

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

@@ -10,7 +10,7 @@
import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;

import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommander;

import com.genersoft.iot.vmp.gb28181.transmit.cmd.SIPRequestHeaderProvider;

import com.genersoft.iot.vmp.gb28181.utils.DateUtil;

import com.genersoft.iot.vmp.utils.DateUtil;

import com.genersoft.iot.vmp.gb28181.utils.NumericUtil;

import com.genersoft.iot.vmp.media.zlm.ZLMHttpHookSubscribe;

import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;

@@ -27,7 +27,6 @@
import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Qualifier;

import org.springframework.boot.SpringBootVersion;

import org.springframework.context.annotation.DependsOn;

import org.springframework.stereotype.Component;

import org.springframework.util.StringUtils;

@@ -371,7 +370,7 @@
         //

         StringBuffer content = new StringBuffer(200);

         content.append("v=0\r\n");

         content.append("o="+ sipConfig.getId()+" 0 0 IN IP4 "+ mediaServerItem.getSdpIp() +"\r\n");

         content.append("o="+ channelId+" 0 0 IN IP4 "+ mediaServerItem.getSdpIp() +"\r\n");

         content.append("s=Play\r\n");

         content.append("c=IN IP4 "+ mediaServerItem.getSdpIp() +"\r\n");

         content.append("t=0 0\r\n");

@@ -390,8 +389,7 @@
            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:99 H265/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被动模式

@@ -403,16 +401,17 @@
            }

         }else {

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

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

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

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

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

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

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

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

               content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 97 98 99\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");

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

            if ("TCP-PASSIVE".equals(streamMode)) { // tcp被动模式

               content.append("a=setup:passive\r\n");

               content.append("a=connection:new\r\n");

@@ -468,7 +467,7 @@


         StringBuffer content = new StringBuffer(200);

           content.append("v=0\r\n");

           content.append("o="+sipConfig.getId()+" 0 0 IN IP4 " + mediaServerItem.getSdpIp() + "\r\n");

           content.append("o="+channelId+" 0 0 IN IP4 " + mediaServerItem.getSdpIp() + "\r\n");

           content.append("s=Playback\r\n");

           content.append("u="+channelId+":0\r\n");

           content.append("c=IN IP4 "+mediaServerItem.getSdpIp()+"\r\n");

@@ -491,8 +490,7 @@
            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:99 H265/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被动模式

@@ -504,16 +502,17 @@
            }

         }else {

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

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

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

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

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

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

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

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

               content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 97 98 99\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");

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

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

            if("TCP-PASSIVE".equals(streamMode)){ // tcp被动模式

               content.append("a=setup:passive\r\n");

               content.append("a=connection:new\r\n");

@@ -578,7 +577,7 @@


         StringBuffer content = new StringBuffer(200);

           content.append("v=0\r\n");

           content.append("o="+sipConfig.getId()+" 0 0 IN IP4 " + mediaServerItem.getSdpIp() + "\r\n");

           content.append("o="+channelId+" 0 0 IN IP4 " + mediaServerItem.getSdpIp() + "\r\n");

           content.append("s=Download\r\n");

           content.append("u="+channelId+":0\r\n");

           content.append("c=IN IP4 "+mediaServerItem.getSdpIp()+"\r\n");

@@ -614,16 +613,17 @@
            }

         }else {

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

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

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

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

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

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

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

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

               content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 97 98 99\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");

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

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

            if("TCP-PASSIVE".equals(streamMode)){ // tcp被动模式

               content.append("a=setup:passive\r\n");

               content.append("a=connection:new\r\n");

@@ -652,6 +652,17 @@
               (MediaServerItem mediaServerItemInUse, JSONObject json)->{

                  hookEvent.call(new InviteStreamInfo(mediaServerItem, json, callIdHeader.getCallId(), "rtp", ssrcInfo.getStream()));

                  subscribe.removeSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey);

                  subscribeKey.put("regist", false);

                  subscribeKey.put("schema", "rtmp");

                  // 添加流注销的订阅，注销了后向设备发送bye

                  subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey,

                        (MediaServerItem mediaServerItemForEnd, JSONObject jsonForEnd)->{

                           ClientTransaction transaction = streamSession.getTransaction(device.getDeviceId(), channelId, ssrcInfo.getStream(), callIdHeader.getCallId());

                           if (transaction != null) {

                              logger.info("[录像]下载结束， 发送BYE");

                              streamByeCmd(device.getDeviceId(), channelId, ssrcInfo.getStream(), callIdHeader.getCallId());

                           }

                        });

               });



           Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), null, "fromplybck" + tm, null, callIdHeader, ssrcInfo.getSsrc());

@@ -684,10 +695,10 @@
   @Override

   public void streamByeCmd(String deviceId, String channelId, String stream, String callId, SipSubscribe.Event okEvent) {

      try {

         SsrcTransaction ssrcTransaction = streamSession.getSsrcTransaction(deviceId, channelId, null, stream);

         ClientTransaction transaction = streamSession.getTransactionByStream(deviceId, channelId, stream);

         SsrcTransaction ssrcTransaction = streamSession.getSsrcTransaction(deviceId, channelId, callId, stream);

         ClientTransaction transaction = streamSession.getTransaction(deviceId, channelId, stream, callId);



         if (transaction == null) {

         if (transaction == null ) {

            logger.warn("[ {} -> {}]停止视频流的时候发现事务已丢失", deviceId, channelId);

            SipSubscribe.EventResult<Object> eventResult = new SipSubscribe.EventResult<>();

            if (okEvent != null) {

@@ -733,42 +744,34 @@
            }

         }



         Request byeRequest = dialog.createRequest(Request.BYE);

         SipURI byeURI = (SipURI) byeRequest.getRequestURI();

         SIPRequest request = (SIPRequest)transaction.getRequest();

         byeURI.setHost(request.getRemoteAddress().getHostAddress());

         byeURI.setPort(request.getRemotePort());

         ViaHeader viaHeader = (ViaHeader) byeRequest.getHeader(ViaHeader.NAME);

         String protocol = viaHeader.getTransport().toUpperCase();

         ClientTransaction clientTransaction = null;

         if("TCP".equals(protocol)) {

            clientTransaction = tcpSipProvider.getNewClientTransaction(byeRequest);

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

            clientTransaction = udpSipProvider.getNewClientTransaction(byeRequest);

         }



         CallIdHeader callIdHeader = (CallIdHeader) byeRequest.getHeader(CallIdHeader.NAME);

         if (okEvent != null) {

            sipSubscribe.addOkSubscribe(callIdHeader.getCallId(), okEvent);

         }



         dialog.sendRequest(clientTransaction);

         streamByeCmd(dialog, (SIPRequest)transaction.getRequest(), okEvent);



      } catch (SipException | ParseException e) {

         e.printStackTrace();

      }

   }



   /**

    * 语音广播

    * 
    * @param device  视频设备

    * @param channelId  预览通道

    */

   @Override

   public boolean audioBroadcastCmd(Device device, String channelId) {

      // 改为新的实现

      return false;

   public void streamByeCmd(SIPDialog dialog, SIPRequest request, SipSubscribe.Event okEvent) throws SipException, ParseException {

      Request byeRequest = dialog.createRequest(Request.BYE);

      SipURI byeURI = (SipURI) byeRequest.getRequestURI();

      byeURI.setHost(request.getRemoteAddress().getHostAddress());

      byeURI.setPort(request.getRemotePort());

      ViaHeader viaHeader = (ViaHeader) byeRequest.getHeader(ViaHeader.NAME);

      String protocol = viaHeader.getTransport().toUpperCase();

      ClientTransaction clientTransaction = null;

      if("TCP".equals(protocol)) {

         clientTransaction = tcpSipProvider.getNewClientTransaction(byeRequest);

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

         clientTransaction = udpSipProvider.getNewClientTransaction(byeRequest);

      }



      CallIdHeader callIdHeader = (CallIdHeader) byeRequest.getHeader(CallIdHeader.NAME);

      if (okEvent != null) {

         sipSubscribe.addOkSubscribe(callIdHeader.getCallId(), okEvent);

      }



      dialog.sendRequest(clientTransaction);

   }



   /**

@@ -777,7 +780,7 @@
    * @param device  视频设备

    */

   @Override

   public boolean audioBroadcastCmd(Device device) {

   public boolean audioBroadcastCmd(Device device,String channelId, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) {

      try {

         StringBuffer broadcastXml = new StringBuffer(200);

         String charset = device.getCharset();

@@ -786,7 +789,7 @@
         broadcastXml.append("<CmdType>Broadcast</CmdType>\r\n");

         broadcastXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

         broadcastXml.append("<SourceID>" + sipConfig.getId() + "</SourceID>\r\n");

         broadcastXml.append("<TargetID>" + device.getDeviceId() + "</TargetID>\r\n");

         broadcastXml.append("<TargetID>" + channelId + "</TargetID>\r\n");

         broadcastXml.append("</Notify>\r\n");

         

         String tm = Long.toString(System.currentTimeMillis());

@@ -795,39 +798,14 @@
               : udpSipProvider.getNewCallId();

                        

         Request request = headerProvider.createMessageRequest(device, broadcastXml.toString(), "z9hG4bK-ViaBcst-" + tm, "FromBcst" + tm, null, callIdHeader);

         transmitRequest(device, request);

         transmitRequest(device, request, errorEvent, okEvent);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

      } 

      return false;

   }

   @Override

   public void audioBroadcastCmd(Device device, SipSubscribe.Event errorEvent) {

      try {

         StringBuffer broadcastXml = new StringBuffer(200);

         String charset = device.getCharset();

         broadcastXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         broadcastXml.append("<Notify>\r\n");

         broadcastXml.append("<CmdType>Broadcast</CmdType>\r\n");

         broadcastXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

         broadcastXml.append("<SourceID>" + sipConfig.getId() + "</SourceID>\r\n");

         broadcastXml.append("<TargetID>" + device.getDeviceId() + "</TargetID>\r\n");

         broadcastXml.append("</Notify>\r\n");

			
         String tm = Long.toString(System.currentTimeMillis());



         CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

               : udpSipProvider.getNewCallId();

								
         Request request = headerProvider.createMessageRequest(device, broadcastXml.toString(), "z9hG4bK-ViaBcst-" + tm, "FromBcst" + tm, null, callIdHeader);

         transmitRequest(device, request, errorEvent);

      } catch (SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

      } 
   } 
	
	
   /**

    * 音视频录像控制

    * 

@@ -1664,6 +1642,7 @@
         sipSubscribe.addErrorSubscribe(callIdHeader.getCallId(), (eventResult -> {

            errorEvent.response(eventResult);

            sipSubscribe.removeErrorSubscribe(eventResult.callId);

            sipSubscribe.removeOkSubscribe(eventResult.callId);

         }));

      }

      // 添加订阅

@@ -1671,6 +1650,7 @@
         sipSubscribe.addOkSubscribe(callIdHeader.getCallId(), eventResult ->{

            okEvent.response(eventResult);

            sipSubscribe.removeOkSubscribe(eventResult.callId);

            sipSubscribe.removeErrorSubscribe(eventResult.callId);

         });

      }