优化对讲逻辑

648540858

2022-07-03 72c1b36d6d2ece497e032c8434641d6576590f9d

 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 {
      // 添加消息处理的订阅
@@ -81,13 +85,15 @@
         responseAck(evt, Response.OK);
         Dialog dialog = evt.getDialog();
         CallIdHeader callIdHeader = (CallIdHeader)evt.getRequest().getHeader(CallIdHeader.NAME);
         if (dialog == null) return;
         if (dialog == null) {
            return;
         }
         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__");
@@ -97,21 +103,20 @@
               logger.info("收到bye:停止向上级推流：" + streamId);
               MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
               zlmrtpServerFactory.stopSendRtpStream(mediaInfo, param);
               redisCatchStorage.deleteSendRTPServer(platformGbId, channelId, callIdHeader.getCallId(), null);
               redisCatchStorage.deleteSendRTPServer(platformGbId, sendRtpItem.getChannelId(), callIdHeader.getCallId(), null);
               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 = new MessageForPushChannel();
                     messageForPushChannel.setType(0);
                     messageForPushChannel.setGbId(sendRtpItem.getChannelId());
                     messageForPushChannel.setApp(sendRtpItem.getApp());
                     messageForPushChannel.setStream(sendRtpItem.getStreamId());
                     messageForPushChannel.setMediaServerId(sendRtpItem.getMediaServerId());
                     messageForPushChannel.setPlatFormId(sendRtpItem.getPlatformId());
                     MessageForPushChannel messageForPushChannel = MessageForPushChannel.getInstance(0,
                           sendRtpItem.getApp(), sendRtpItem.getStreamId(), sendRtpItem.getChannelId(),
                           sendRtpItem.getPlatformId(), null, null, sendRtpItem.getMediaServerId());
                     redisCatchStorage.sendStreamPushRequestedMsg(messageForPushChannel);
                  }
               }