Merge branch 'wvp-28181-2.0'

648540858

2022-09-14 ab74d1cff90cc563e0eca8deb8f154d84eb51908

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java

@@ -13,6 +13,7 @@
import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.service.IPlayService;
import com.genersoft.iot.vmp.service.bean.MessageForPushChannel;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
@@ -65,6 +66,9 @@
   @Autowired
   private VideoStreamSessionManager streamSession;

   @Autowired
   private IPlayService playService;

   @Override
   public void afterPropertiesSet() throws Exception {
      // 添加消息处理的订阅
@@ -87,9 +91,9 @@
         if (dialog.getState().equals(DialogState.TERMINATED)) {
            String platformGbId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(FromHeader.NAME)).getAddress().getURI()).getUser();
            String channelId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(ToHeader.NAME)).getAddress().getURI()).getUser();
            SendRtpItem sendRtpItem =  redisCatchStorage.querySendRTPServer(platformGbId, channelId, null, callIdHeader.getCallId());
            SendRtpItem sendRtpItem =  redisCatchStorage.querySendRTPServer(platformGbId, null, null, callIdHeader.getCallId());
            logger.info("收到bye, [{}/{}]", platformGbId, channelId);
            if (sendRtpItem != null){
            if (sendRtpItem != null ){
               String streamId = sendRtpItem.getStreamId();
               Map<String, Object> param = new HashMap<>();
               param.put("vhost","__defaultVhost__");
@@ -99,12 +103,17 @@
               logger.info("收到bye:停止向上级推流：" + streamId);
               MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
               zlmrtpServerFactory.stopSendRtpStream(mediaInfo, param);
               redisCatchStorage.deleteSendRTPServer(platformGbId, sendRtpItem.getChannelId(), callIdHeader.getCallId(), null);
               redisCatchStorage.deleteSendRTPServer(platformGbId, channelId, callIdHeader.getCallId(), null);
               zlmrtpServerFactory.stopSendRtpStream(mediaInfo, param);
               int totalReaderCount = zlmrtpServerFactory.totalReaderCount(mediaInfo, sendRtpItem.getApp(), streamId);
               if (totalReaderCount <= 0) {
                  logger.info("收到bye: {} 无其它观看者，通知设备停止推流", streamId);
                  if (sendRtpItem.getPlayType().equals(InviteStreamType.PLAY)) {
                     cmder.streamByeCmd(sendRtpItem.getDeviceId(), channelId, streamId, null);
                     cmder.streamByeCmd(sendRtpItem.getDeviceId(), sendRtpItem.getChannelId(), streamId, null);
                  }
                  if (sendRtpItem.isOnlyAudio()) {
                     playService.stopAudioBroadcast(sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
                  }
                  if (sendRtpItem.getPlayType().equals(InviteStreamType.PUSH)) {
                     MessageForPushChannel messageForPushChannel = MessageForPushChannel.getInstance(0,
@@ -121,12 +130,12 @@
               StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(device.getDeviceId(), channelId);
               if (streamInfo != null) {
                  redisCatchStorage.stopPlay(streamInfo);
                  mediaServerService.closeRTPServer(device.getDeviceId(), channelId, streamInfo.getStream());
                  mediaServerService.closeRTPServer(streamInfo.getMediaServerId(), streamInfo.getStream());
               }
               SsrcTransaction ssrcTransactionForPlay = streamSession.getSsrcTransaction(device.getDeviceId(), channelId, "play", null);
               if (ssrcTransactionForPlay != null){
                  SIPDialog dialogForPlay = (SIPDialog) SerializeUtils.deSerialize(ssrcTransactionForPlay.getDialog());
                  if (dialogForPlay.getCallId().equals(callIdHeader.getCallId())){
                  if (dialogForPlay.getCallId().getCallId().equals(callIdHeader.getCallId())){
                     // 释放ssrc
                     MediaServerItem mediaServerItem = mediaServerService.getOne(ssrcTransactionForPlay.getMediaServerId());
                     if (mediaServerItem != null) {