guzijian / wvp-GB28181-pro · Commits

Commit 045f2334d0f0259bf0a4e03b11669fe54815aed0

Authored by 648540858
1 parent debfac58

修复级联查看国标录像

Inline Side-by-side
Showing 1 changed file with 3 additions and 2 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
  View file @045f233
@@ -498,6 +498,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements @@ -498,6 +498,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
498 String endTimeStr = DateUtil.urlFormatter.format(end); 498 String endTimeStr = DateUtil.urlFormatter.format(end);
499 String stream = device.getDeviceId() + "_" + channelId + "_" + startTimeStr + "_" + endTimeStr; 499 String stream = device.getDeviceId() + "_" + channelId + "_" + startTimeStr + "_" + endTimeStr;
500 SSRCInfo ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, stream, null, device.isSsrcCheck(), true, 0,false, false, device.getStreamModeForParam()); 500 SSRCInfo ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, stream, null, device.isSsrcCheck(), true, 0,false, false, device.getStreamModeForParam());
  501 + sendRtpItem.setStream(stream);
501 // 写入redis， 超时时回复 502 // 写入redis， 超时时回复
502 redisCatchStorage.updateSendRTPSever(sendRtpItem); 503 redisCatchStorage.updateSendRTPSever(sendRtpItem);
503 playService.playBack(mediaServerItem, ssrcInfo, device.getDeviceId(), channelId, DateUtil.formatter.format(start), 504 playService.playBack(mediaServerItem, ssrcInfo, device.getDeviceId(), channelId, DateUtil.formatter.format(start),
@@ -1006,7 +1007,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements @@ -1006,7 +1007,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
1006 Media media = mediaDescription.getMedia(); 1007 Media media = mediaDescription.getMedia();
1007 1008
1008 Vector mediaFormats = media.getMediaFormats(false); 1009 Vector mediaFormats = media.getMediaFormats(false);
1009 - if (mediaFormats.contains("8")) { 1010 +// if (mediaFormats.contains("8")) {
1010 port = media.getMediaPort(); 1011 port = media.getMediaPort();
1011 String protocol = media.getProtocol(); 1012 String protocol = media.getProtocol();
1012 // 区分TCP发流还是udp， 当前默认udp 1013 // 区分TCP发流还是udp， 当前默认udp
@@ -1022,7 +1023,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements @@ -1022,7 +1023,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
1022 } 1023 }
1023 } 1024 }
1024 break; 1025 break;
1025 - } 1026 +// }
1026 } 1027 }
1027 if (port == -1) { 1028 if (port == -1) {
1028 logger.info("不支持的媒体格式，返回415"); 1029 logger.info("不支持的媒体格式，返回415");