From b55374c75a17c87b9ccb8d5c12abe188875af256 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 14 十月 2020 16:13:39 +0800
Subject: [PATCH] 支持使用udp端口段来启用高性能udp
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
index 3a971a7..f901e5e 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
@@ -19,6 +19,7 @@
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.MediaServerConfig;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
+import com.genersoft.iot.vmp.media.zlm.ZLMUtils;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -59,6 +60,13 @@
@Autowired
@Qualifier(value="udpSipProvider")
private SipProvider udpSipProvider;
+
+ @Autowired
+ private ZLMUtils zlmUtils;
+
+ @Value("${media.rtp.enable}")
+ private boolean rtpEnable;
+
/**
@@ -202,10 +210,17 @@
@Override
public StreamInfo playStreamCmd(Device device, String channelId) {
try {
-
+
String ssrc = streamSession.createPlaySsrc();
String transport = device.getTransport();
MediaServerConfig mediaInfo = storager.getMediaInfo();
+ String mediaPort = null;
+ // 浣跨敤鍔ㄦ�乽dp绔彛
+ if (rtpEnable) {
+ mediaPort = zlmUtils.getNewRTPPort(ssrc) + "";
+ }else {
+ mediaPort = mediaInfo.getRtpProxyPort();
+ }
//
StringBuffer content = new StringBuffer(200);
content.append("v=0\r\n");
@@ -214,10 +229,10 @@
content.append("c=IN IP4 "+mediaInfo.getLocalIP()+"\r\n");
content.append("t=0 0\r\n");
if("TCP".equals(transport)) {
- content.append("m=video "+mediaInfo.getRtpProxyPort()+" TCP/RTP/AVP 96 98 97\r\n");
+ content.append("m=video "+ mediaPort +" TCP/RTP/AVP 96 98 97\r\n");
}
if("UDP".equals(transport)) {
- content.append("m=video "+mediaInfo.getRtpProxyPort()+" RTP/AVP 96 98 97\r\n");
+ content.append("m=video "+ mediaPort +" RTP/AVP 96 98 97\r\n");
}
content.append("a=recvonly\r\n");
content.append("a=rtpmap:96 PS/90000\r\n");
@@ -241,15 +256,9 @@
StreamInfo streamInfo = new StreamInfo();
streamInfo.setSsrc(ssrc);
-// String streamId = Integer.toHexString(Integer.parseInt(streamInfo.getSsrc()));
- String streamId = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase(); // ZLM 瑕佹眰澶у啓涓旈浣嶈ˉ闆�
- streamInfo.setFlv(String.format("http://%s:%s/rtp/%s.flv", mediaInfo.getLocalIP(), mediaInfo.getHttpPort(), streamId));
- streamInfo.setWS_FLV(String.format("ws://%s:%s/rtp/%s.flv", mediaInfo.getLocalIP(), mediaInfo.getHttpPort(), streamId));
- streamInfo.setRTMP(String.format("rtmp://%s:%s/rtp/%s", mediaInfo.getLocalIP(), mediaInfo.getRtmpPort(), streamId));
- streamInfo.setHLS(String.format("http://%s:%s/rtp/%s/hls.m3u8", mediaInfo.getLocalIP(), mediaInfo.getHttpPort(), streamId));
- streamInfo.setRTSP(String.format("rtsp://%s:%s/rtp/%s", mediaInfo.getLocalIP(), mediaInfo.getRtspPort(), streamId));
-
- storager.startPlay(device.getDeviceId(), channelId, streamInfo);
+ streamInfo.setCahnnelId(channelId);
+ streamInfo.setDeviceID(device.getDeviceId());
+ storager.startPlay(streamInfo);
return streamInfo;
} catch ( SipException | ParseException | InvalidArgumentException e) {
e.printStackTrace();
@@ -581,4 +590,5 @@
return clientTransaction;
}
+
}
--
Gitblit v1.8.0