Merge branch 'wvp-28181-2.0'

648540858

2022-09-08 2f76fa98bb839ede5b47a3c3e1bb6fe499952203

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

@@ -104,6 +104,8 @@
               MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
               zlmrtpServerFactory.stopSendRtpStream(mediaInfo, param);
               redisCatchStorage.deleteSendRTPServer(platformGbId, sendRtpItem.getChannelId(), callIdHeader.getCallId(), null);
               redisCatchStorage.deleteSendRTPServer(platformGbId, channelId, callIdHeader.getCallId(), null);
               zlmrtpServerFactory.stopSendRtpStream(mediaInfo, param);
               int totalReaderCount = zlmrtpServerFactory.totalReaderCount(mediaInfo, sendRtpItem.getApp(), streamId);
               if (totalReaderCount <= 0) {
                  logger.info("收到bye: {} 无其它观看者，通知设备停止推流", streamId);
@@ -133,7 +135,7 @@
               SsrcTransaction ssrcTransactionForPlay = streamSession.getSsrcTransaction(device.getDeviceId(), channelId, "play", null);
               if (ssrcTransactionForPlay != null){
                  SIPDialog dialogForPlay = (SIPDialog) SerializeUtils.deSerialize(ssrcTransactionForPlay.getDialog());
                  if (dialogForPlay.getCallId().equals(callIdHeader.getCallId())){
                  if (dialogForPlay.getCallId().getCallId().equals(callIdHeader.getCallId())){
                     // 释放ssrc
                     MediaServerItem mediaServerItem = mediaServerService.getOne(ssrcTransactionForPlay.getMediaServerId());
                     if (mediaServerItem != null) {