From 2310087e03ebc785a3e67f6d85ab4166b6f05ca0 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期三, 07 四月 2021 18:35:13 +0800
Subject: [PATCH] 规范化api， 进行中。。。
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/AckRequestProcessor.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/AckRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/AckRequestProcessor.java
index 72a4d8c..00f1f7d 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/AckRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/AckRequestProcessor.java
@@ -37,20 +37,29 @@
Dialog dialog = evt.getDialog();
if (dialog == null) return;
//DialogState state = dialog.getState();
- if (/*request.getMethod().equals(Request.INVITE) &&*/ dialog.getState()== DialogState.CONFIRMED) {
+ if (/*request.getMecodewwthod().equals(Request.INVITE) &&*/ dialog.getState()== DialogState.CONFIRMED) {
String platformGbId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(FromHeader.NAME)).getAddress().getURI()).getUser();
String channelId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(ToHeader.NAME)).getAddress().getURI()).getUser();
SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(platformGbId, channelId);
String is_Udp = sendRtpItem.isTcp() ? "0" : "1";
String deviceId = sendRtpItem.getDeviceId();
- StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
- sendRtpItem.setStreamId(streamInfo.getStreamId());
+ StreamInfo streamInfo = null;
+ if (deviceId == null) {
+ streamInfo = new StreamInfo();
+ streamInfo.setApp(sendRtpItem.getApp());
+ streamInfo.setStreamId(sendRtpItem.getStreamId());
+ }else {
+ streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
+ sendRtpItem.setStreamId(streamInfo.getStreamId());
+ streamInfo.setApp("rtp");
+ }
+
redisCatchStorage.updateSendRTPSever(sendRtpItem);
System.out.println(platformGbId);
System.out.println(channelId);
Map<String, Object> param = new HashMap<>();
param.put("vhost","__defaultVhost__");
- param.put("app","rtp");
+ param.put("app",streamInfo.getApp());
param.put("stream",streamInfo.getStreamId());
param.put("ssrc", sendRtpItem.getSsrc());
param.put("dst_url",sendRtpItem.getIp());
@@ -63,7 +72,7 @@
while (!rtpPushed) {
try {
if (System.currentTimeMillis() - startTime < 30 * 1000) {
- if (zlmrtpServerFactory.isRtpReady(streamInfo.getStreamId())) {
+ if (zlmrtpServerFactory.isStreamReady(streamInfo.getApp(), streamInfo.getStreamId())) {
rtpPushed = true;
System.out.println("宸茶幏鍙栬澶囨帹娴侊紝寮�濮嬪悜涓婄骇鎺ㄦ祦");
zlmrtpServerFactory.startSendRtpStream(param);
--
Gitblit v1.8.0