优化对讲释放流程

648540858

2023-08-16 d4fdd975cc760432b11f931a003174d435e5b5b0

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

@@ -72,7 +72,7 @@
   private IVideoManagerStorage storager;

   @Autowired
   private ZLMServerFactory ZLMServerFactory;
   private ZLMServerFactory zlmServerFactory;

   @Autowired
   private SSRCFactory ssrcFactory;
@@ -114,18 +114,19 @@
      SendRtpItem sendRtpItem =  redisCatchStorage.querySendRTPServer(null, null, null, callIdHeader.getCallId());

      if (sendRtpItem != null){
         logger.info("[收到bye] 来自平台{}， 停止通道：{}", sendRtpItem.getPlatformId(), sendRtpItem.getChannelId());
         logger.info("[收到bye] 来自{}，停止通道：{}, 类型： {}", sendRtpItem.getPlatformId(), sendRtpItem.getChannelId(), sendRtpItem.getPlayType());

         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);
         logger.info("[收到bye] 停止推流：{}", streamId);
         MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
         redisCatchStorage.deleteSendRTPServer(sendRtpItem.getPlatformId(), sendRtpItem.getChannelId(),
               callIdHeader.getCallId(), null);
         ZLMServerFactory.stopSendRtpStream(mediaInfo, param);
         zlmServerFactory.stopSendRtpStream(mediaInfo, param);
         if (sendRtpItem.getPlayType().equals(InviteStreamType.PUSH)) {
            ParentPlatform platform = platformService.queryPlatformByServerGBId(sendRtpItem.getPlatformId());
            if (platform != null) {
@@ -138,8 +139,14 @@
               logger.info("[上级平台停止观看] 未找到平台{}的信息，发送redis消息失败", sendRtpItem.getPlatformId());
            }
         }
         AudioBroadcastCatch audioBroadcastCatch = audioBroadcastManager.get(sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
         if (audioBroadcastCatch != null && audioBroadcastCatch.getSipTransactionInfo().getCallId().equals(callIdHeader.getCallId())) {
            // 来自上级平台的停止对讲
            logger.info("[停止对讲] 来自上级，平台：{}, 通道：{}", sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
            audioBroadcastManager.del(sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
         }

         int totalReaderCount = ZLMServerFactory.totalReaderCount(mediaInfo, sendRtpItem.getApp(), streamId);
         int totalReaderCount = zlmServerFactory.totalReaderCount(mediaInfo, sendRtpItem.getApp(), streamId);
         if (totalReaderCount <= 0) {
            logger.info("[收到bye] {} 无其它观看者，通知设备停止推流", streamId);
            if (sendRtpItem.getPlayType().equals(InviteStreamType.PLAY)) {
@@ -148,7 +155,7 @@
                  logger.info("[收到bye] {} 通知设备停止推流时未找到设备信息", streamId);
               }
               try {
                  logger.warn("[停止点播] {}/{}", sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
                  logger.info("[停止点播] {}/{}", sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
                  cmder.streamByeCmd(device, sendRtpItem.getChannelId(), streamId, null);
               } catch (InvalidArgumentException | ParseException | SipException |
                      SsrcTransactionNotFoundException e) {