优化点播结束后关闭RTPServer

648540858

2022-09-14 5b3dc4d5957050c2ce3e3c0013337168d8c9f700

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

@@ -21,6 +21,7 @@
import com.genersoft.iot.vmp.service.bean.SSRCInfo;

import com.genersoft.iot.vmp.storager.IRedisCatchStorage;

import com.genersoft.iot.vmp.storager.IVideoManagerStorage;

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

import gov.nist.javax.sip.SipProviderImpl;

import gov.nist.javax.sip.SipStackImpl;

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

@@ -59,6 +60,9 @@


   @Autowired

   private SipFactory sipFactory;



   @Autowired

   private GitUtil gitUtil;



   @Autowired

   @Qualifier(value="tcpSipProvider")

@@ -690,7 +694,7 @@
            dialog = streamSession.getDialogByStream(ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId(), ssrcTransaction.getStream());

         }

         mediaServerService.releaseSsrc(ssrcTransaction.getMediaServerId(), ssrcTransaction.getSsrc());

         mediaServerService.closeRTPServer(ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId(), ssrcTransaction.getStream());

         mediaServerService.closeRTPServer(ssrcTransaction.getMediaServerId(), ssrcTransaction.getStream());

         streamSession.remove(ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId(), ssrcTransaction.getStream());



         if (dialog == null) {

@@ -727,7 +731,7 @@
         // 增加Contact header

         Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory().createSipURI(sipConfig.getId(), sipConfig.getIp()+":"+sipConfig.getPort()));

         byeRequest.addHeader(sipFactory.createHeaderFactory().createContactHeader(concatAddress));

         UserAgentHeader userAgentHeader = SipUtils.createUserAgentHeader(sipFactory);

         UserAgentHeader userAgentHeader = SipUtils.createUserAgentHeader(sipFactory, gitUtil);

         byeRequest.addHeader(userAgentHeader);

         ClientTransaction clientTransaction = null;

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

@@ -1616,13 +1620,11 @@
         clientTransaction = udpSipProvider.getNewClientTransaction(request);

      }

      if (request.getHeader(UserAgentHeader.NAME) == null) {

         UserAgentHeader userAgentHeader = null;

         try {

            userAgentHeader = SipUtils.createUserAgentHeader(sipFactory);

            request.addHeader(SipUtils.createUserAgentHeader(sipFactory, gitUtil));

         } catch (ParseException e) {

            logger.error("添加UserAgentHeader失败", e);

         }

         request.addHeader(userAgentHeader);

      }

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

      // 添加错误订阅