test

648540858

2022-05-06 e7f5cfc422cb9ac8dc72f0c0faf063bf5fcb711c

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

@@ -2,7 +2,7 @@

import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
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.VideoStreamSessionManager;
@@ -13,8 +13,9 @@
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.bean.MessageForPushChannel;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import com.genersoft.iot.vmp.utils.SerializeUtils;
import gov.nist.javax.sip.stack.SIPDialog;
import org.slf4j.Logger;
@@ -50,7 +51,7 @@
   private IRedisCatchStorage redisCatchStorage;

   @Autowired
   private IVideoManagerStorager storager;
   private IVideoManagerStorage storager;

   @Autowired
   private ZLMRTPServerFactory zlmrtpServerFactory;
@@ -80,7 +81,9 @@
         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();
@@ -99,10 +102,20 @@
               redisCatchStorage.deleteSendRTPServer(platformGbId, channelId, callIdHeader.getCallId(), null);
               int totalReaderCount = zlmrtpServerFactory.totalReaderCount(mediaInfo, sendRtpItem.getApp(), streamId);
               if (totalReaderCount <= 0) {
                  logger.info("收到bye: {}无其它观看者，通知设备停止推流", streamId);
                  if (sendRtpItem.isPlay()) {
                  logger.info("收到bye: {} 无其它观看者，通知设备停止推流", streamId);
                  if (sendRtpItem.getPlayType().equals(InviteStreamType.PLAY)) {
                     cmder.streamByeCmd(sendRtpItem.getDeviceId(), channelId, streamId, null);
                  }
                  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());
                     redisCatchStorage.sendStreamPushRequestedMsg(messageForPushChannel);
                  }
               }
            }
            // 可能是设备主动停止