修复重复调用open rtp server 的bug 增加对rtp server开启释放的统一管理

648540858

2020-12-21 bfd1628d5b6e753091b0aa702a520b08cc64cc76

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

@@ -8,7 +8,6 @@
import javax.sip.Dialog;

import javax.sip.InvalidArgumentException;

import javax.sip.SipException;

import javax.sip.SipFactory;

import javax.sip.SipProvider;

import javax.sip.TransactionDoesNotExistException;

import javax.sip.address.SipURI;

@@ -16,11 +15,10 @@
import javax.sip.message.Request;



import com.alibaba.fastjson.JSONObject;

import com.genersoft.iot.vmp.common.StreamInfo;

import com.genersoft.iot.vmp.conf.MediaServerConfig;

import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;

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

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

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

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

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

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

@@ -63,7 +61,7 @@
   private SipProvider udpSipProvider;



   @Autowired

   private ZLMUtils zlmUtils;

   private ZLMRTPServerFactory zlmrtpServerFactory;



   @Value("${media.rtp.enable}")

   private boolean rtpEnable;

@@ -277,17 +275,22 @@
      try {



         String ssrc = streamSession.createPlaySsrc();

         String streamId = null;

         if (rtpEnable) {

            streamId = String.format("gb_play_%s_%s", device.getDeviceId(), channelId);

         }else {

            streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();

         }

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

         MediaServerConfig mediaInfo = storager.getMediaInfo();

         String mediaPort = null;

         // 使用动态udp端口

         if (rtpEnable) {

            mediaPort = zlmUtils.getNewRTPPort(ssrc) + "";

            mediaPort = zlmrtpServerFactory.createRTPServer(streamId) + "";

         }else {

            mediaPort = mediaInfo.getRtpProxyPort();

         }



         String streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();

         // 添加订阅

         JSONObject subscribeKey = new JSONObject();

         subscribeKey.put("app", "rtp");

@@ -330,10 +333,10 @@
         Request request = headerProvider.createInviteRequest(device, channelId, content.toString(), null, "live", null, ssrc);



         ClientTransaction transaction = transmitRequest(device, request);

         streamSession.put(ssrc, transaction);

         streamSession.put(streamId, transaction);

         DeviceChannel deviceChannel = storager.queryChannel(device.getDeviceId(), channelId);

         if (deviceChannel != null) {

            deviceChannel.setSsrc(ssrc);

            deviceChannel.setStreamId(streamId);

            storager.updateChannel(device.getDeviceId(), deviceChannel);

         }



@@ -378,22 +381,28 @@
         String mediaPort = null;

         // 使用动态udp端口

         if (rtpEnable) {

            mediaPort = zlmUtils.getNewRTPPort(ssrc) + "";

            mediaPort = zlmrtpServerFactory.createRTPServer(streamId) + "";

         }else {

            mediaPort = mediaInfo.getRtpProxyPort();

         }

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

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

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

            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 96 98 97\r\n");

            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 96 98 97\r\n");

            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=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=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");

@@ -406,7 +415,7 @@
           Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), null, "playback", null);

   

           ClientTransaction transaction = transmitRequest(device, request);

           streamSession.put(ssrc, transaction);

           streamSession.put(streamId, transaction);



      } catch ( SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

@@ -418,10 +427,10 @@
    * 

    */

   @Override

   public void streamByeCmd(String ssrc) {

   public void streamByeCmd(String streamId) {

      

      try {

         ClientTransaction transaction = streamSession.get(ssrc);

         ClientTransaction transaction = streamSession.get(streamId);

         if (transaction == null) {

            return;

         }

@@ -447,7 +456,8 @@
            clientTransaction = udpSipProvider.getNewClientTransaction(byeRequest);

         }

         dialog.sendRequest(clientTransaction);

         streamSession.remove(ssrc);

         streamSession.remove(streamId);

         zlmrtpServerFactory.closeRTPServer(streamId);

      } catch (TransactionDoesNotExistException e) {

         e.printStackTrace();

      } catch (SipException e) {

@@ -690,4 +700,11 @@
   }





   @Override

   public void closeRTPServer(Device device, String channelId) {

      if (rtpEnable) {

         String streamId = String.format("gb_play_%s_%s", device.getDeviceId(), channelId);

         zlmrtpServerFactory.closeRTPServer(streamId);

      }

   }

}