diff --git a/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java b/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java index 3514b56f..8311745c 100644 --- a/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java +++ b/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java @@ -169,25 +169,31 @@ public class StreamInfo implements Serializable, Cloneable{ public void setRtmp(String host, int port, int sslPort, String app, String stream, String callIdParam) { String file = String.format("%s/%s/%s", app, stream, callIdParam); - this.rtmp = new StreamURL("rtmp", host, port, file); - if (sslPort != 0) { + if (port > 0) { + this.rtmp = new StreamURL("rtmp", host, port, file); + } + if (sslPort > 0) { this.rtmps = new StreamURL("rtmps", host, sslPort, file); } } public void setRtsp(String host, int port, int sslPort, String app, String stream, String callIdParam) { String file = String.format("%s/%s/%s", app, stream, callIdParam); - this.rtsp = new StreamURL("rtsp", host, port, file); - if (sslPort != 0) { + if (port > 0) { + this.rtsp = new StreamURL("rtsp", host, port, file); + } + if (sslPort > 0) { this.rtsps = new StreamURL("rtsps", host, sslPort, file); } } public void setFlv(String host, int port, int sslPort, String app, String stream, String callIdParam) { String file = String.format("%s/%s.live.flv%s", app, stream, callIdParam); - this.flv = new StreamURL("http", host, port, file); + if (port > 0) { + this.flv = new StreamURL("http", host, port, file); + } this.ws_flv = new StreamURL("ws", host, port, file); - if (sslPort != 0) { + if (sslPort > 0) { this.https_flv = new StreamURL("https", host, sslPort, file); this.wss_flv = new StreamURL("wss", host, sslPort, file); } @@ -195,9 +201,11 @@ public class StreamInfo implements Serializable, Cloneable{ public void setFmp4(String host, int port, int sslPort, String app, String stream, String callIdParam) { String file = String.format("%s/%s.live.mp4%s", app, stream, callIdParam); - this.fmp4 = new StreamURL("http", host, port, file); - this.ws_fmp4 = new StreamURL("ws", host, port, file); - if (sslPort != 0) { + if (port > 0) { + this.fmp4 = new StreamURL("http", host, port, file); + this.ws_fmp4 = new StreamURL("ws", host, port, file); + } + if (sslPort > 0) { this.https_fmp4 = new StreamURL("https", host, sslPort, file); this.wss_fmp4 = new StreamURL("wss", host, sslPort, file); } @@ -205,9 +213,11 @@ public class StreamInfo implements Serializable, Cloneable{ public void setHls(String host, int port, int sslPort, String app, String stream, String callIdParam) { String file = String.format("%s/%s/hls.m3u8%s", app, stream, callIdParam); - this.hls = new StreamURL("http", host, port, file); - this.ws_hls = new StreamURL("ws", host, port, file); - if (sslPort != 0) { + if (port > 0) { + this.hls = new StreamURL("http", host, port, file); + this.ws_hls = new StreamURL("ws", host, port, file); + } + if (sslPort > 0) { this.https_hls = new StreamURL("https", host, sslPort, file); this.wss_hls = new StreamURL("wss", host, sslPort, file); } @@ -215,51 +225,91 @@ public class StreamInfo implements Serializable, Cloneable{ public void setTs(String host, int port, int sslPort, String app, String stream, String callIdParam) { String file = String.format("%s/%s.live.ts%s", app, stream, callIdParam); - this.ts = new StreamURL("http", host, port, file); - this.ws_ts = new StreamURL("ws", host, port, file); - if (sslPort != 0) { + + if (port > 0) { + this.ts = new StreamURL("http", host, port, file); + this.ws_ts = new StreamURL("ws", host, port, file); + } + if (sslPort > 0) { this.https_ts = new StreamURL("https", host, sslPort, file); this.wss_ts = new StreamURL("wss", host, sslPort, file); } } - public void setRtc(String host, int port, int sslPort, String app, String stream, String callIdParam, boolean isPlay) { - String file = String.format("index/api/webrtc?app=%s&stream=%s&type=%s%s", app, stream, callIdParam, isPlay?"play":"push"); - this.rtc = new StreamURL("http", host, port, file); - if (sslPort != 0) { + public void setRtc(String host, int port, int sslPort, String app, String stream, String callIdParam) { + String file = String.format("index/api/webrtc?app=%s&stream=%s&type=play%s", app, stream, callIdParam); + if (port > 0) { + this.rtc = new StreamURL("http", host, port, file); + } + if (sslPort > 0) { this.rtcs = new StreamURL("https", host, sslPort, file); } } public void channgeStreamIp(String localAddr) { - this.flv.setHost(localAddr); - this.ws_flv.setHost(localAddr); - this.hls.setHost(localAddr); - this.ws_hls.setHost(localAddr); - this.ts.setHost(localAddr); - this.ws_ts.setHost(localAddr); - this.fmp4.setHost(localAddr); - this.ws_fmp4.setHost(localAddr); - this.rtc.setHost(localAddr); + if (this.flv != null) { + this.flv.setHost(localAddr); + } + if (this.ws_flv != null ){ + this.ws_flv.setHost(localAddr); + } + if (this.hls != null ) { + this.hls.setHost(localAddr); + } + if (this.ws_hls != null ) { + this.ws_hls.setHost(localAddr); + } + if (this.ts != null ) { + this.ts.setHost(localAddr); + } + if (this.ws_ts != null ) { + this.ws_ts.setHost(localAddr); + } + if (this.fmp4 != null ) { + this.fmp4.setHost(localAddr); + } + if (this.ws_fmp4 != null ) { + this.ws_fmp4.setHost(localAddr); + } + if (this.rtc != null ) { + this.rtc.setHost(localAddr); + } if (this.https_flv != null) { this.https_flv.setHost(localAddr); + } + if (this.wss_flv != null) { this.wss_flv.setHost(localAddr); + } + if (this.https_hls != null) { this.https_hls.setHost(localAddr); + } + if (this.wss_hls != null) { this.wss_hls.setHost(localAddr); + } + if (this.wss_ts != null) { this.wss_ts.setHost(localAddr); + } + if (this.https_fmp4 != null) { this.https_fmp4.setHost(localAddr); + } + if (this.wss_fmp4 != null) { this.wss_fmp4.setHost(localAddr); + } + if (this.rtcs != null) { this.rtcs.setHost(localAddr); } - this.rtsp.setHost(localAddr); + if (this.rtsp != null) { + this.rtsp.setHost(localAddr); + } if (this.rtsps != null) { this.rtsps.setHost(localAddr); } - this.rtmp.setHost(localAddr); + if (this.rtmp != null) { + this.rtmp.setHost(localAddr); + } if (this.rtmps != null) { this.rtmps.setHost(localAddr); } - } diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java index 8a1e4866..e31995c3 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java @@ -386,8 +386,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements return; } SendRtpItem sendRtpItem = zlmrtpServerFactory.createSendRtpItem(mediaServerItem, addressStr, port, ssrc, requesterId, - device.getDeviceId(), channelId, - mediaTransmissionTCP, platform.isRtcp()); + device.getDeviceId(), channelId, mediaTransmissionTCP, platform.isRtcp()); if (tcpActive != null) { sendRtpItem.setTcpActive(tcpActive); @@ -582,8 +581,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements if (streamReady) { // 自平台内容 SendRtpItem sendRtpItem = zlmrtpServerFactory.createSendRtpItem(mediaServerItem, addressStr, port, ssrc, requesterId, - gbStream.getApp(), gbStream.getStream(), channelId, - mediaTransmissionTCP, platform.isRtcp()); + gbStream.getApp(), gbStream.getStream(), channelId, mediaTransmissionTCP, platform.isRtcp()); if (sendRtpItem == null) { logger.warn("服务器端口资源不足"); @@ -622,8 +620,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements if (streamReady) { // 自平台内容 SendRtpItem sendRtpItem = zlmrtpServerFactory.createSendRtpItem(mediaServerItem, addressStr, port, ssrc, requesterId, - gbStream.getApp(), gbStream.getStream(), channelId, - mediaTransmissionTCP, platform.isRtcp()); + gbStream.getApp(), gbStream.getStream(), channelId, mediaTransmissionTCP, platform.isRtcp()); if (sendRtpItem == null) { logger.warn("服务器端口资源不足"); @@ -802,7 +799,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements // 发送redis消息 redisGbPlayMsgListener.sendMsg(streamPushItem.getServerId(), streamPushItem.getMediaServerId(), streamPushItem.getApp(), streamPushItem.getStream(), addressStr, port, ssrc, requesterId, - channelId, mediaTransmissionTCP, platform.isRtcp(), null, responseSendItemMsg -> { + channelId, mediaTransmissionTCP, platform.isRtcp(),null, responseSendItemMsg -> { SendRtpItem sendRtpItem = responseSendItemMsg.getSendRtpItem(); if (sendRtpItem == null || responseSendItemMsg.getMediaServerItem() == null) { logger.warn("服务器端口资源不足"); diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue index 228909f7..89b3e07b 100644 --- a/web_src/src/components/dialog/devicePlayer.vue +++ b/web_src/src/components/dialog/devicePlayer.vue @@ -50,91 +50,91 @@ 更多地址 - + FLV: {{ streamInfo.flv.url }} - + FLV(https): {{ streamInfo.https_flv.url }} - + FLV(ws): {{ streamInfo.ws_flv.url }} - + FLV(wss): {{ streamInfo.wss_flv.url }} - + FMP4: {{ streamInfo.fmp4.url }} - + FMP4(https): {{ streamInfo.https_fmp4.url }} - + FMP4(ws): {{ streamInfo.ws_fmp4.url }} - + FMP4(wss): {{ streamInfo.wss_fmp4.url }} - + HLS: {{ streamInfo.hls.url }} - + HLS(https): {{ streamInfo.https_hls.url }} - + HLS(ws): {{ streamInfo.ws_hls.url }} - + HLS(wss): {{ streamInfo.wss_hls.url }} - + TS: {{ streamInfo.ts.url }} - + TS(https): {{ streamInfo.https_ts.url }} - + TS(ws): {{ streamInfo.ws_ts.url }} - + TS(wss): {{ streamInfo.wss_ts.url }} - + RTC: {{ streamInfo.rtc.url }} - + RTCS: {{ streamInfo.rtcs }} - + RTMP: {{ streamInfo.rtmp.url }} - + RTMPS: {{ streamInfo.rtmps.url }} - + RTSP: {{ streamInfo.rtsp.url }} - + RTSPS: {{ streamInfo.rtsps.url }}