From b9e4682d3ffb4446f41cf6170a3920a93d94f2d3 Mon Sep 17 00:00:00 2001
From: songww <songww@inspur.com>
Date: 星期日, 10 五月 2020 22:33:43 +0800
Subject: [PATCH] 完善ssrc符合国标，并完善很多小问题
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java | 96 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 72 insertions(+), 24 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 630d44c..b012f9a 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
@@ -17,6 +17,9 @@
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommander;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.SIPRequestHeaderProvider;
import com.genersoft.iot.vmp.gb28181.utils.DateUtil;
+import com.genersoft.iot.vmp.gb28181.utils.SsrcUtil;
+
+import tk.mybatis.mapper.util.StringUtil;
/**
* @Description:璁惧鑳藉姏鎺ュ彛锛岀敤浜庡畾涔夎澶囩殑鎺у埗銆佹煡璇㈣兘鍔�
@@ -27,7 +30,7 @@
public class SIPCommander implements ISIPCommander {
@Autowired
- private SipConfig config;
+ private SipConfig sipConfig;
@Autowired
private SIPRequestHeaderProvider headerProvider;
@@ -46,7 +49,7 @@
*/
@Override
public boolean ptzdirectCmd(Device device, String channelId, int leftRight, int upDown) {
- return ptzCmd(device, channelId, leftRight, upDown, 0, config.getSpeed(), 0);
+ return ptzCmd(device, channelId, leftRight, upDown, 0, sipConfig.getSpeed(), 0);
}
/**
@@ -72,7 +75,7 @@
*/
@Override
public boolean ptzZoomCmd(Device device, String channelId, int inOut) {
- return ptzCmd(device, channelId, 0, 0, inOut, 0, config.getSpeed());
+ return ptzCmd(device, channelId, 0, 0, inOut, 0, sipConfig.getSpeed());
}
/**
@@ -135,23 +138,19 @@
public String playStreamCmd(Device device, String channelId) {
try {
- //鐢熸垚ssrc鏍囪瘑鏁版嵁娴� 10浣嶆暟瀛�
- String ssrc = "";
- Random random = new Random();
- // ZLMediaServer鏈�澶ц瘑鍒�7FFFFFFF鍗�2147483647锛屾墍浠ラ殢鏈烘暟涓嶈兘瓒呰繃杩欎釜鏁�
- ssrc = String.valueOf(random.nextInt(2147483647));
+ String ssrc = SsrcUtil.getPlaySsrc();
//
StringBuffer content = new StringBuffer(200);
content.append("v=0\r\n");
- content.append("o="+channelId+" 0 0 IN IP4 "+config.getSipIp()+"\r\n");
+ content.append("o="+channelId+" 0 0 IN IP4 "+sipConfig.getSipIp()+"\r\n");
content.append("s=Play\r\n");
- content.append("c=IN IP4 "+config.getMediaIp()+"\r\n");
+ content.append("c=IN IP4 "+sipConfig.getMediaIp()+"\r\n");
content.append("t=0 0\r\n");
if(device.getTransport().equals("TCP")) {
- content.append("m=video "+config.getMediaPort()+" TCP/RTP/AVP 96 98 97\r\n");
+ content.append("m=video "+sipConfig.getMediaPort()+" TCP/RTP/AVP 96 98 97\r\n");
}
if(device.getTransport().equals("UDP")) {
- content.append("m=video "+config.getMediaPort()+" RTP/AVP 96 98 97\r\n");
+ content.append("m=video "+sipConfig.getMediaPort()+" RTP/AVP 96 98 97\r\n");
}
content.append("a=sendrecv\r\n");
content.append("a=rtpmap:96 PS/90000\r\n");
@@ -171,6 +170,53 @@
e.printStackTrace();
return null;
}
+ }
+
+ /**
+ * 璇锋眰鍥炴斁瑙嗛娴�
+ *
+ * @param device 瑙嗛璁惧
+ * @param channelId 棰勮閫氶亾
+ * @param startTime 寮�濮嬫椂闂�,鏍煎紡瑕佹眰锛歽yyy-MM-dd HH:mm:ss
+ * @param endTime 缁撴潫鏃堕棿,鏍煎紡瑕佹眰锛歽yyy-MM-dd HH:mm:ss
+ */
+ @Override
+ public String playbackStreamCmd(Device device, String channelId, String recordId, String startTime, String endTime) {
+ try {
+
+ String ssrc = SsrcUtil.getPlayBackSsrc();
+ //
+ StringBuffer content = new StringBuffer(200);
+ content.append("v=0\r\n");
+ content.append("o="+channelId+" 0 0 IN IP4 "+sipConfig.getSipIp()+"\r\n");
+ content.append("s=Playback\r\n");
+ content.append("u="+recordId+":3\r\n");
+ content.append("c=IN IP4 "+sipConfig.getMediaIp()+"\r\n");
+ content.append("t="+DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(startTime)+" "+DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(endTime) +"\r\n");
+ if(device.getTransport().equals("TCP")) {
+ content.append("m=video "+sipConfig.getMediaPort()+" TCP/RTP/AVP 96 98 97\r\n");
+ }
+ if(device.getTransport().equals("UDP")) {
+ content.append("m=video "+sipConfig.getMediaPort()+" RTP/AVP 96 98 97\r\n");
+ }
+ content.append("a=recvonly\r\n");
+ content.append("a=rtpmap:96 PS/90000\r\n");
+ content.append("a=rtpmap:98 H264/90000\r\n");
+ content.append("a=rtpmap:97 MPEG4/90000\r\n");
+ if(device.getTransport().equals("TCP")){
+ content.append("a=setup:passive\r\n");
+ content.append("a=connection:new\r\n");
+ }
+ content.append("y="+ssrc+"\r\n");//ssrc
+
+ Request request = headerProvider.createInviteRequest(device, content.toString(), null, "live", null);
+
+ transmitRequest(device, request);
+ return ssrc;
+ } catch ( SipException | ParseException | InvalidArgumentException e) {
+ e.printStackTrace();
+ return null;
+ }
}
/**
@@ -323,22 +369,23 @@
* @param endTime 缁撴潫鏃堕棿,鏍煎紡瑕佹眰锛歽yyy-MM-dd HH:mm:ss
*/
@Override
- public boolean recordInfoQuery(Device device, String startTime, String endTime) {
+ public boolean recordInfoQuery(Device device, String channelId, String startTime, String endTime) {
try {
- StringBuffer catalogXml = new StringBuffer(200);
- catalogXml.append("<?xml version=\"1.0\" encoding=\"GB2312\"?>");
- catalogXml.append("<Query>");
- catalogXml.append("<CmdType>RecordInfo</CmdType>");
- catalogXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>");
- catalogXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>");
- catalogXml.append("<StartTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(startTime) + "</StartTime>");
- catalogXml.append("<EndTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(endTime) + "</EndTime>");
+ StringBuffer recordInfoXml = new StringBuffer(200);
+ recordInfoXml.append("<?xml version=\"1.0\" encoding=\"GB2312\"?>");
+ recordInfoXml.append("<Query>");
+ recordInfoXml.append("<CmdType>RecordInfo</CmdType>");
+ recordInfoXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>");
+ recordInfoXml.append("<DeviceID>" + channelId + "</DeviceID>");
+ recordInfoXml.append("<StartTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(startTime) + "</StartTime>");
+ recordInfoXml.append("<EndTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(endTime) + "</EndTime>");
+ recordInfoXml.append("<Secrecy>0</Secrecy>");
// 澶у崕NVR瑕佹眰蹇呴』澧炲姞涓�涓�间负all鐨勬枃鏈厓绱犺妭鐐筎ype
- catalogXml.append("<Type>all</Type>");
- catalogXml.append("</Query>");
+ recordInfoXml.append("<Type>all</Type>");
+ recordInfoXml.append("</Query>");
- Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), "ViaRecordInfoBranch", "FromRecordInfoTag", "ToRecordInfoTag");
+ Request request = headerProvider.createMessageRequest(device, recordInfoXml.toString(), "ViaRecordInfoBranch", "FromRecordInfoTag", "ToRecordInfoTag");
transmitRequest(device, request);
} catch (SipException | ParseException | InvalidArgumentException e) {
e.printStackTrace();
@@ -398,4 +445,5 @@
sipLayer.getUdpSipProvider().sendRequest(request);
}
}
+
}
--
Gitblit v1.8.0