同步主线的代码，保持一致性

‘sxh’

2023-06-15 ccc0a99d6894844d83d751b924cfebe74da7826c

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

@@ -1,11 +1,13 @@
package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl;

import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.common.InviteInfo;
import com.genersoft.iot.vmp.common.InviteSessionType;
import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.InviteStreamType;
import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;
import com.genersoft.iot.vmp.gb28181.session.SSRCFactory;
import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommander;
@@ -14,17 +16,21 @@
import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.IDeviceService;
import com.genersoft.iot.vmp.service.IInviteStreamService;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.service.bean.MessageForPushChannel;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import gov.nist.javax.sip.message.SIPRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import javax.sip.*;
import javax.sip.InvalidArgumentException;
import javax.sip.RequestEvent;
import javax.sip.SipException;
import javax.sip.address.SipURI;
import javax.sip.header.CallIdHeader;
import javax.sip.header.FromHeader;
@@ -51,6 +57,9 @@
   private IRedisCatchStorage redisCatchStorage;

   @Autowired
   private IInviteStreamService inviteStreamService;

   @Autowired
   private IDeviceService deviceService;

   @Autowired
@@ -58,6 +67,9 @@

   @Autowired
   private ZLMRTPServerFactory zlmrtpServerFactory;

   @Autowired
   private SSRCFactory ssrcFactory;

   @Autowired
   private IMediaServerService mediaServerService;
@@ -82,7 +94,7 @@
   public void process(RequestEvent evt) {

      try {
         responseAck(getServerTransaction(evt), Response.OK);
         responseAck((SIPRequest) evt.getRequest(), Response.OK);
      } catch (SipException | InvalidArgumentException | ParseException e) {
         logger.error("[回复BYE信息失败]，{}", e.getMessage());
      }
@@ -101,12 +113,13 @@
            logger.info("[收到bye] 停止向上级推流：{}", streamId);
            MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
            redisCatchStorage.deleteSendRTPServer(platformGbId, channelId, callIdHeader.getCallId(), null);
            ssrcFactory.releaseSsrc(sendRtpItem.getMediaServerId(), sendRtpItem.getSsrc());
            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)) {
                  Device device = deviceService.queryDevice(sendRtpItem.getDeviceId());
                  Device device = deviceService.getDevice(sendRtpItem.getDeviceId());
                  if (device == null) {
                     logger.info("[收到bye] {} 通知设备停止推流时未找到设备信息", streamId);
                  }
@@ -129,13 +142,13 @@
         // 可能是设备主动停止
         Device device = storager.queryVideoDeviceByChannelId(platformGbId);
         if (device != null) {
            storager.stopPlay(device.getDeviceId(), channelId);
            StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(device.getDeviceId(), channelId);
            if (streamInfo != null) {
               redisCatchStorage.stopPlay(streamInfo);
               mediaServerService.closeRTPServer(streamInfo.getMediaServerId(), streamInfo.getStream());
            SsrcTransaction ssrcTransactionForPlay = null;
            if (device.isSwitchPrimarySubStream() ) {
               ssrcTransactionForPlay = streamSession.getSsrcTransaction(device.getDeviceId(), channelId,  "switch-play", null);
            } else {
               storager.stopPlay(device.getDeviceId(), channelId);
               ssrcTransactionForPlay = streamSession.getSsrcTransaction(device.getDeviceId(), channelId, "play", null);
            }
            SsrcTransaction ssrcTransactionForPlay = streamSession.getSsrcTransaction(device.getDeviceId(), channelId, "play", null);
            if (ssrcTransactionForPlay != null){
               if (ssrcTransactionForPlay.getCallId().equals(callIdHeader.getCallId())){
                  // 释放ssrc
@@ -144,6 +157,21 @@
                     mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcTransactionForPlay.getSsrc());
                  }
                  streamSession.remove(device.getDeviceId(), channelId, ssrcTransactionForPlay.getStream());
               }
               InviteInfo inviteInfo = null;
               if (device.isSwitchPrimarySubStream() ) {
                  String streamType = ssrcTransactionForPlay.getStream().split("_")[0];
                  boolean isSubStream = "sub".equals(streamType);
                  inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, device.getDeviceId(), channelId,isSubStream);
                  inviteStreamService.removeInviteInfo(inviteInfo.getType(),inviteInfo.getDeviceId(),inviteInfo.getChannelId(),isSubStream,inviteInfo.getStream());
               }else {
                  inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, device.getDeviceId(), channelId);
                  inviteStreamService.removeInviteInfo(inviteInfo);
               }
               if (inviteInfo != null) {
                  if (inviteInfo.getStreamInfo() != null) {
                     mediaServerService.closeRTPServer(inviteInfo.getStreamInfo().getMediaServerId(), inviteInfo.getStream());
                  }
               }
            }
            SsrcTransaction ssrcTransactionForPlayBack = streamSession.getSsrcTransaction(device.getDeviceId(), channelId, callIdHeader.getCallId(), null);
@@ -154,6 +182,14 @@
                  mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcTransactionForPlayBack.getSsrc());
               }
               streamSession.remove(device.getDeviceId(), channelId, ssrcTransactionForPlayBack.getStream());
               InviteInfo inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAYBACK, device.getDeviceId(), channelId);

               if (inviteInfo != null) {
                  inviteStreamService.removeInviteInfo(inviteInfo);
                  if (inviteInfo.getStreamInfo() != null) {
                     mediaServerService.closeRTPServer(inviteInfo.getStreamInfo().getMediaServerId(), inviteInfo.getStream());
                  }
               }
            }
         }