guzijian / wvp-GB28181-pro · Commits

Commit ba3c38d7d352800ccda6c68bb015b071d0794b42

Authored by 朱俊杰
1 parent b1c479b9

去掉createinfo中的cseq参数

Inline Side-by-side
Showing 2 changed files with 6 additions and 6 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
  View file @ba3c38d
@@ -225,7 +225,7 @@ public class SIPRequestHeaderProvider { @@ -225,7 +225,7 @@ public class SIPRequestHeaderProvider {
225 return request; 225 return request;
226 } 226 }
227 227
228 - public Request createInfoRequest(Device device, StreamInfo streamInfo, String content, Long cseq) 228 + public Request createInfoRequest(Device device, StreamInfo streamInfo, String content)
229 throws PeerUnavailableException, ParseException, InvalidArgumentException { 229 throws PeerUnavailableException, ParseException, InvalidArgumentException {
230 Request request = null; 230 Request request = null;
231 if (streamInfo == null) return null; 231 if (streamInfo == null) return null;
@@ -255,7 +255,7 @@ public class SIPRequestHeaderProvider { @@ -255,7 +255,7 @@ public class SIPRequestHeaderProvider {
255 255
256 // Forwards 256 // Forwards
257 MaxForwardsHeader maxForwards = sipFactory.createHeaderFactory().createMaxForwardsHeader(70); 257 MaxForwardsHeader maxForwards = sipFactory.createHeaderFactory().createMaxForwardsHeader(70);
258 - 258 +
259 cseq = redisCatchStorage.getCSEQ(Request.INVITE); 259 cseq = redisCatchStorage.getCSEQ(Request.INVITE);
260 // ceq 260 // ceq
261 CSeqHeader cSeqHeader = sipFactory.createHeaderFactory() 261 CSeqHeader cSeqHeader = sipFactory.createHeaderFactory()
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
  View file @ba3c38d
@@ -1620,7 +1620,7 @@ public class SIPCommander implements ISIPCommander { @@ -1620,7 +1620,7 @@ public class SIPCommander implements ISIPCommander {
1620 content.append("PAUSE RTSP/1.0\r\n"); 1620 content.append("PAUSE RTSP/1.0\r\n");
1621 content.append("CSeq: " + cseq + "\r\n"); 1621 content.append("CSeq: " + cseq + "\r\n");
1622 content.append("PauseTime: now\r\n"); 1622 content.append("PauseTime: now\r\n");
1623 - Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString(), cseq); 1623 + Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString());
1624 if (request == null) { 1624 if (request == null) {
1625 return; 1625 return;
1626 } 1626 }
@@ -1651,7 +1651,7 @@ public class SIPCommander implements ISIPCommander { @@ -1651,7 +1651,7 @@ public class SIPCommander implements ISIPCommander {
1651 content.append("PLAY RTSP/1.0\r\n"); 1651 content.append("PLAY RTSP/1.0\r\n");
1652 content.append("CSeq: " + cseq + "\r\n"); 1652 content.append("CSeq: " + cseq + "\r\n");
1653 content.append("Range: npt=now-\r\n"); 1653 content.append("Range: npt=now-\r\n");
1654 - Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString(), cseq); 1654 + Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString());
1655 if (request == null) return; 1655 if (request == null) return;
1656 logger.info(request.toString()); 1656 logger.info(request.toString());
1657 ClientTransaction clientTransaction = null; 1657 ClientTransaction clientTransaction = null;
@@ -1680,7 +1680,7 @@ public class SIPCommander implements ISIPCommander { @@ -1680,7 +1680,7 @@ public class SIPCommander implements ISIPCommander {
1680 content.append("CSeq: " + cseq + "\r\n"); 1680 content.append("CSeq: " + cseq + "\r\n");
1681 content.append("Range: npt=" + Math.abs(seekTime) + "-\r\n"); 1681 content.append("Range: npt=" + Math.abs(seekTime) + "-\r\n");
1682 1682
1683 - Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString(), cseq); 1683 + Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString());
1684 if (request == null) return; 1684 if (request == null) return;
1685 logger.info(request.toString()); 1685 logger.info(request.toString());
1686 ClientTransaction clientTransaction = null; 1686 ClientTransaction clientTransaction = null;
@@ -1708,7 +1708,7 @@ public class SIPCommander implements ISIPCommander { @@ -1708,7 +1708,7 @@ public class SIPCommander implements ISIPCommander {
1708 content.append("PLAY RTSP/1.0\r\n"); 1708 content.append("PLAY RTSP/1.0\r\n");
1709 content.append("CSeq: " + cseq + "\r\n"); 1709 content.append("CSeq: " + cseq + "\r\n");
1710 content.append("Scale: " + String.format("%.1f",speed) + "\r\n"); 1710 content.append("Scale: " + String.format("%.1f",speed) + "\r\n");
1711 - Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString(), cseq); 1711 + Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString());
1712 if (request == null) return; 1712 if (request == null) return;
1713 logger.info(request.toString()); 1713 logger.info(request.toString());
1714 ClientTransaction clientTransaction = null; 1714 ClientTransaction clientTransaction = null;