Merge branch 'refs/heads/2.7.0'

648540858

2024-04-23 d41d6b34af2485198ed01e1888db1571e4da1a6a

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

@@ -6,21 +6,20 @@
import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.gb28181.session.AudioBroadcastManager;
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;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
import com.genersoft.iot.vmp.media.bean.MediaInfo;
import com.genersoft.iot.vmp.media.bean.MediaServer;
import com.genersoft.iot.vmp.media.service.IMediaServerService;
import com.genersoft.iot.vmp.media.zlm.ZLMServerFactory;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServer;
import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
import com.genersoft.iot.vmp.media.zlm.ZLMServerFactory;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.*;
import com.genersoft.iot.vmp.service.bean.MessageForPushChannel;
import com.genersoft.iot.vmp.service.bean.RequestStopPushStreamMsg;
import com.genersoft.iot.vmp.service.redisMsg.RedisGbPlayMsgListener;
import com.genersoft.iot.vmp.service.redisMsg.IRedisRpcService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import gov.nist.javax.sip.message.SIPRequest;
@@ -36,8 +35,6 @@
import javax.sip.header.CallIdHeader;
import javax.sip.message.Response;
import java.text.ParseException;
import java.util.HashMap;
import java.util.Map;

/**
 * SIP命令类型： BYE请求
@@ -76,12 +73,6 @@
   private IVideoManagerStorage storager;

   @Autowired
   private ZLMServerFactory zlmServerFactory;

   @Autowired
   private SSRCFactory ssrcFactory;

   @Autowired
   private IMediaServerService mediaServerService;

   @Autowired
@@ -100,7 +91,8 @@
   private IStreamPushService pushService;

   @Autowired
   private RedisGbPlayMsgListener redisGbPlayMsgListener;
   private IRedisRpcService redisRpcService;


   @Override
   public void afterPropertiesSet() throws Exception {
@@ -110,7 +102,6 @@

   /**
    * 处理BYE请求
    * @param evt
    */
   @Override
   public void process(RequestEvent evt) {
@@ -128,11 +119,6 @@
         logger.info("[收到bye] 来自{}，停止通道：{}, 类型： {}, callId: {}", sendRtpItem.getPlatformId(), sendRtpItem.getChannelId(), sendRtpItem.getPlayType(), callIdHeader.getCallId());

         String streamId = sendRtpItem.getStream();
         Map<String, Object> param = new HashMap<>();
         param.put("vhost","__defaultVhost__");
         param.put("app",sendRtpItem.getApp());
         param.put("stream",streamId);
         param.put("ssrc",sendRtpItem.getSsrc());
         logger.info("[收到bye] 停止推流：{}, 媒体节点： {}", streamId, sendRtpItem.getMediaServerId());

         if (sendRtpItem.getPlayType().equals(InviteStreamType.PUSH)) {
@@ -149,33 +135,24 @@
               MediaServer mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
               redisCatchStorage.deleteSendRTPServer(sendRtpItem.getPlatformId(), sendRtpItem.getChannelId(),
                     callIdHeader.getCallId(), null);
               zlmServerFactory.stopSendRtpStream(mediaInfo, param);
               mediaServerService.stopSendRtp(mediaInfo, sendRtpItem.getApp(), sendRtpItem.getStream(), sendRtpItem.getSsrc());
               if (userSetting.getUseCustomSsrcForParentInvite()) {
                  mediaServerService.releaseSsrc(mediaInfo.getId(), sendRtpItem.getSsrc());
               }

               ParentPlatform platform = platformService.queryPlatformByServerGBId(sendRtpItem.getPlatformId());
               if (platform != null) {
                  MessageForPushChannel messageForPushChannel = MessageForPushChannel.getInstance(0,
                        sendRtpItem.getApp(), sendRtpItem.getStream(), sendRtpItem.getChannelId(),
                        sendRtpItem.getPlatformId(), platform.getName(), userSetting.getServerId(), sendRtpItem.getMediaServerId());
                  messageForPushChannel.setPlatFormIndex(platform.getId());
                  redisCatchStorage.sendPlatformStopPlayMsg(messageForPushChannel);
               }else {
                  logger.info("[上级平台停止观看] 未找到平台{}的信息，发送redis消息失败", sendRtpItem.getPlatformId());
               }
            }else {
               logger.info("[上级平台停止观看] 未找到平台{}的信息，发送redis消息失败", sendRtpItem.getPlatformId());
            }
         }else {
            MediaServer mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
            redisCatchStorage.deleteSendRTPServer(sendRtpItem.getPlatformId(), sendRtpItem.getChannelId(),
                  callIdHeader.getCallId(), null);
            zlmServerFactory.stopSendRtpStream(mediaInfo, param);
            mediaServerService.stopSendRtp(mediaInfo, sendRtpItem.getApp(), sendRtpItem.getStream(), sendRtpItem.getSsrc());
            if (userSetting.getUseCustomSsrcForParentInvite()) {
               mediaServerService.releaseSsrc(mediaInfo.getId(), sendRtpItem.getSsrc());
            }
         }
         MediaServer mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
         if (mediaInfo != null) {
         MediaServer mediaServer = mediaServerService.getOne(sendRtpItem.getMediaServerId());
         if (mediaServer != null) {
            AudioBroadcastCatch audioBroadcastCatch = audioBroadcastManager.get(sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
            if (audioBroadcastCatch != null && audioBroadcastCatch.getSipTransactionInfo().getCallId().equals(callIdHeader.getCallId())) {
               // 来自上级平台的停止对讲
@@ -183,8 +160,9 @@
               audioBroadcastManager.del(sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
            }

            int totalReaderCount = zlmServerFactory.totalReaderCount(mediaInfo, sendRtpItem.getApp(), streamId);
            if (totalReaderCount <= 0) {
            MediaInfo mediaInfo = mediaServerService.getMediaInfo(mediaServer, sendRtpItem.getApp(), streamId);

            if (mediaInfo.getReaderCount() <= 0) {
               logger.info("[收到bye] {} 无其它观看者，通知设备停止推流", streamId);
               if (sendRtpItem.getPlayType().equals(InviteStreamType.PLAY)) {
                  Device device = deviceService.getDevice(sendRtpItem.getDeviceId());