From 0209dc89c9d5a65aaa1c6e3ae8140dfdb5020dcb Mon Sep 17 00:00:00 2001
From: SaltFish <42058801+SaltFish001@users.noreply.github.com>
Date: 星期四, 10 二月 2022 10:29:36 +0800
Subject: [PATCH] Update MediaServiceImpl.java
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java | 65 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 13 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 2f90dee..29f8c05 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
@@ -18,7 +18,6 @@
import com.genersoft.iot.vmp.service.bean.SSRCInfo;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
-import com.genersoft.iot.vmp.vmanager.gb28181.session.InfoCseqCache;
import gov.nist.javax.sip.SipProviderImpl;
import gov.nist.javax.sip.SipStackImpl;
import gov.nist.javax.sip.message.SIPRequest;
@@ -263,7 +262,7 @@
public boolean frontEndCmd(Device device, String channelId, int cmdCode, int parameter1, int parameter2, int combineCode2) {
try {
String cmdStr= frontEndCmdString(cmdCode, parameter1, parameter2, combineCode2);
- logger.info("鎺у埗瀛楃涓诧細" + cmdStr);
+ logger.debug("鎺у埗瀛楃涓诧細" + cmdStr);
StringBuffer ptzXml = new StringBuffer(200);
ptzXml.append("<?xml version=\"1.0\" ?>\r\n");
ptzXml.append("<Control>\r\n");
@@ -1163,7 +1162,7 @@
@Override
public boolean catalogQuery(Device device, SipSubscribe.Event errorEvent) {
// 娓呯┖閫氶亾
- storager.cleanChannelsForDevice(device.getDeviceId());
+// storager.cleanChannelsForDevice(device.getDeviceId());
try {
StringBuffer catalogXml = new StringBuffer(200);
catalogXml.append("<?xml version=\"1.0\" encoding=\"GB2312\"?>\r\n");
@@ -1499,7 +1498,10 @@
CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
: udpSipProvider.getNewCallId();
- Request request = headerProvider.createSubscribeRequest(device, cmdXml.toString(), "z9hG4bK-viaPos-" + tm, "fromTagPos" + tm, null, device.getSubscribeCycleForCatalog(), "Catalog" , callIdHeader);
+ // 鏈夋晥鏃堕棿榛樿涓�60绉掍互涓�
+ Request request = headerProvider.createSubscribeRequest(device, cmdXml.toString(), "z9hG4bK-viaPos-" + tm,
+ "fromTagPos" + tm, null, device.getSubscribeCycleForCatalog() + 60, "Catalog" ,
+ callIdHeader);
transmitRequest(device, request, errorEvent, okEvent);
return true;
@@ -1508,6 +1510,34 @@
e.printStackTrace();
return false;
}
+ }
+
+ @Override
+ public boolean dragZoomCmd(Device device, String channelId, String cmdString) {
+ try {
+ StringBuffer dragXml = new StringBuffer(200);
+ dragXml.append("<?xml version=\"1.0\" ?>\r\n");
+ dragXml.append("<Control>\r\n");
+ dragXml.append("<CmdType>DeviceControl</CmdType>\r\n");
+ dragXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");
+ if (StringUtils.isEmpty(channelId)) {
+ dragXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
+ } else {
+ dragXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
+ }
+ dragXml.append(cmdString);
+ dragXml.append("</Control>\r\n");
+ String tm = Long.toString(System.currentTimeMillis());
+ CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
+ : udpSipProvider.getNewCallId();
+ Request request = headerProvider.createMessageRequest(device, dragXml.toString(), "z9hG4bK-ViaPtz-" + tm, "FromPtz" + tm, null, callIdHeader);
+ logger.debug("鎷夋淇′护锛� " + request.toString());
+ transmitRequest(device, request);
+ return true;
+ } catch (SipException | ParseException | InvalidArgumentException e) {
+ e.printStackTrace();
+ }
+ return false;
}
@@ -1553,12 +1583,15 @@
@Override
public void playPauseCmd(Device device, StreamInfo streamInfo) {
try {
-
+ Long cseq = redisCatchStorage.getCSEQ(Request.INFO);
StringBuffer content = new StringBuffer(200);
content.append("PAUSE RTSP/1.0\r\n");
- content.append("CSeq: " + InfoCseqCache.CSEQCACHE.get(streamInfo.getStreamId()) + "\r\n");
+ content.append("CSeq: " + cseq + "\r\n");
content.append("PauseTime: now\r\n");
- Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString());
+ Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString(), cseq);
+ if (request == null) {
+ return;
+ }
logger.info(request.toString());
ClientTransaction clientTransaction = null;
if ("TCP".equals(device.getTransport())) {
@@ -1581,11 +1614,13 @@
@Override
public void playResumeCmd(Device device, StreamInfo streamInfo) {
try {
+ Long cseq = redisCatchStorage.getCSEQ(Request.INFO);
StringBuffer content = new StringBuffer(200);
content.append("PLAY RTSP/1.0\r\n");
- content.append("CSeq: " + InfoCseqCache.CSEQCACHE.get(streamInfo.getStreamId()) + "\r\n");
+ content.append("CSeq: " + cseq + "\r\n");
content.append("Range: npt=now-\r\n");
- Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString());
+ Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString(), cseq);
+ if (request == null) return;
logger.info(request.toString());
ClientTransaction clientTransaction = null;
if ("TCP".equals(device.getTransport())) {
@@ -1607,12 +1642,14 @@
@Override
public void playSeekCmd(Device device, StreamInfo streamInfo, long seekTime) {
try {
+ Long cseq = redisCatchStorage.getCSEQ(Request.INFO);
StringBuffer content = new StringBuffer(200);
content.append("PLAY RTSP/1.0\r\n");
- content.append("CSeq: " + InfoCseqCache.CSEQCACHE.get(streamInfo.getStreamId()) + "\r\n");
+ content.append("CSeq: " + cseq + "\r\n");
content.append("Range: npt=" + Math.abs(seekTime) + "-\r\n");
- Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString());
+ Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString(), cseq);
+ if (request == null) return;
logger.info(request.toString());
ClientTransaction clientTransaction = null;
if ("TCP".equals(device.getTransport())) {
@@ -1634,11 +1671,13 @@
@Override
public void playSpeedCmd(Device device, StreamInfo streamInfo, Double speed) {
try {
+ Long cseq = redisCatchStorage.getCSEQ(Request.INFO);
StringBuffer content = new StringBuffer(200);
content.append("PLAY RTSP/1.0\r\n");
- content.append("CSeq: " + InfoCseqCache.CSEQCACHE.get(streamInfo.getStreamId()) + "\r\n");
+ content.append("CSeq: " + cseq + "\r\n");
content.append("Scale: " + String.format("%.1f",speed) + "\r\n");
- Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString());
+ Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString(), cseq);
+ if (request == null) return;
logger.info(request.toString());
ClientTransaction clientTransaction = null;
if ("TCP".equals(device.getTransport())) {
--
Gitblit v1.8.0