优化发流逻辑

648540858

2023-07-01 b64f32080537840cfd772d14dfc1df1ccddc4330

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

@@ -1,9 +1,11 @@
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.UserSetting;
import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
import com.genersoft.iot.vmp.gb28181.bean.*;
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;
@@ -11,10 +13,7 @@
import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.IDeviceChannelService;
import com.genersoft.iot.vmp.service.IDeviceService;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.service.IPlatformService;
import com.genersoft.iot.vmp.service.*;
import com.genersoft.iot.vmp.service.bean.MessageForPushChannel;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
@@ -50,6 +49,9 @@
   private IRedisCatchStorage redisCatchStorage;

   @Autowired
   private IInviteStreamService inviteStreamService;

   @Autowired
   private IPlatformService platformService;

   @Autowired
@@ -63,6 +65,9 @@

   @Autowired
   private ZLMRTPServerFactory zlmrtpServerFactory;

   @Autowired
   private SSRCFactory ssrcFactory;

   @Autowired
   private IMediaServerService mediaServerService;
@@ -142,11 +147,10 @@
            }
         }
      }else {

         // 可能是设备发送的停止
         SsrcTransaction ssrcTransaction = streamSession.getSsrcTransaction(null, null, callIdHeader.getCallId(), null);
         if (ssrcTransaction == null) {
            logger.info("[收到bye] 但是无法获取推流信息和发流信息，忽略此请求");
            logger.info(request.toString());
            return;
         }
         logger.info("[收到bye] 来自设备：{}, 通道已停止推流: {}", ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId());
@@ -162,10 +166,12 @@
            return;
         }
         storager.stopPlay(device.getDeviceId(), channel.getChannelId());
         StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(device.getDeviceId(), channel.getChannelId());
         if (streamInfo != null) {
            redisCatchStorage.stopPlay(streamInfo);
            mediaServerService.closeRTPServer(streamInfo.getMediaServerId(), streamInfo.getStream());
         InviteInfo inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, device.getDeviceId(), channel.getChannelId());
         if (inviteInfo != null) {
            inviteStreamService.removeInviteInfo(inviteInfo);
            if (inviteInfo.getStreamInfo() != null) {
               mediaServerService.closeRTPServer(inviteInfo.getStreamInfo().getMediaServerId(), inviteInfo.getStreamInfo().getStream());
            }
         }
         // 释放ssrc
         MediaServerItem mediaServerItem = mediaServerService.getOne(ssrcTransaction.getMediaServerId());