修复订阅清理请示任务的执行时长

648540858

2021-11-03 b445128fb5bdc24f6703e7a40e9fd9f40919baf2

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

@@ -24,7 +24,6 @@
import gov.nist.javax.sip.SipStackImpl;

import gov.nist.javax.sip.message.SIPRequest;

import gov.nist.javax.sip.stack.SIPDialog;

import gov.nist.javax.sip.stack.SIPTransaction;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

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

@@ -106,7 +105,7 @@
    */

   @Override

   public boolean ptzdirectCmd(Device device, String channelId, int leftRight, int upDown) {

      return ptzCmd(device, channelId, leftRight, upDown, 0, sipConfig.getSpeed(), 0);

      return ptzCmd(device, channelId, leftRight, upDown, 0, sipConfig.getPtzSpeed(), 0);

   }



   /**

@@ -132,7 +131,7 @@
    */  

   @Override

   public boolean ptzZoomCmd(Device device, String channelId, int inOut) {

      return ptzCmd(device, channelId, 0, 0, inOut, 0, sipConfig.getSpeed());

      return ptzCmd(device, channelId, 0, 0, inOut, 0, sipConfig.getPtzSpeed());

   }



   /**

@@ -362,7 +361,7 @@
         //

         StringBuffer content = new StringBuffer(200);

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

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

         content.append("o="+ sipConfig.getId()+" 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");

@@ -428,8 +427,8 @@
            mediaServerService.releaseSsrc(mediaServerItem, ssrcInfo.getSsrc());

            errorEvent.response(e);

         }), e ->{

            streamSession.put(device.getDeviceId(), channelId ,ssrcInfo.getSsrc(), finalStreamId, mediaServerItem.getId(),e.getClientTransaction());

            streamSession.put(device.getDeviceId(), channelId , e.getDialog());

            streamSession.put(device.getDeviceId(), channelId ,ssrcInfo.getSsrc(), finalStreamId, mediaServerItem.getId(), ((ResponseEvent)e.event).getClientTransaction());

            streamSession.put(device.getDeviceId(), channelId , e.dialog);

         });



         

@@ -469,7 +468,7 @@


         StringBuffer content = new StringBuffer(200);

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

           content.append("o="+sipConfig.getSipId()+" 0 0 IN IP4 "+sipConfig.getSipIp()+"\r\n");

           content.append("o="+sipConfig.getId()+" 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");

@@ -533,12 +532,12 @@
         CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

               : udpSipProvider.getNewCallId();



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

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



           transmitRequest(device, request, errorEvent, okEvent -> {

            Dialog dialog = okEvent.getClientTransaction().getDialog();

              streamSession.put(device.getDeviceId(), channelId, ssrcInfo.getSsrc(), ssrcInfo.getStreamId(), mediaServerItem.getId(), okEvent.getClientTransaction());

            streamSession.put(device.getDeviceId(), channelId, dialog);

            ResponseEvent responseEvent = (ResponseEvent) okEvent.event;

              streamSession.put(device.getDeviceId(), channelId, ssrcInfo.getSsrc(), ssrcInfo.getStreamId(), mediaServerItem.getId(), responseEvent.getClientTransaction());

            streamSession.put(device.getDeviceId(), channelId, okEvent.dialog);

         });

      } catch ( SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

@@ -576,7 +575,7 @@


         StringBuffer content = new StringBuffer(200);

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

           content.append("o="+sipConfig.getSipId()+" 0 0 IN IP4 "+sipConfig.getSipIp()+"\r\n");

           content.append("o="+sipConfig.getId()+" 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");

@@ -641,7 +640,7 @@
         CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

               : udpSipProvider.getNewCallId();



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

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



           ClientTransaction transaction = transmitRequest(device, request, errorEvent);

           streamSession.put(device.getDeviceId(), channelId, ssrcInfo.getSsrc(), ssrcInfo.getStreamId(), mediaServerItem.getId(), transaction);

@@ -668,6 +667,10 @@
         ClientTransaction transaction = streamSession.getTransaction(deviceId, channelId);

         if (transaction == null) {

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

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

            if (okEvent != null) {

               okEvent.response(eventResult);

            }

            return;

         }

         SIPDialog dialog = streamSession.getDialog(deviceId, channelId);

@@ -750,7 +753,7 @@
         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.getSipId() + "</SourceID>\r\n");

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

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

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

         

@@ -775,7 +778,7 @@
         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.getSipId() + "</SourceID>\r\n");

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

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

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

         

@@ -1507,11 +1510,17 @@
      CallIdHeader callIdHeader = (CallIdHeader)request.getHeader(CallIdHeader.NAME);

      // 添加错误订阅

      if (errorEvent != null) {

         sipSubscribe.addErrorSubscribe(callIdHeader.getCallId(), errorEvent);

         sipSubscribe.addErrorSubscribe(callIdHeader.getCallId(), (eventResult -> {

            errorEvent.response(eventResult);

            sipSubscribe.removeErrorSubscribe(eventResult.callId);

         }));

      }

      // 添加订阅

      if (okEvent != null) {

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

         sipSubscribe.addOkSubscribe(callIdHeader.getCallId(), eventResult ->{

            okEvent.response(eventResult);

            sipSubscribe.removeOkSubscribe(eventResult.callId);

         });

      }



      clientTransaction.sendRequest();