From e94b99d11c46246532edc93cd25cbf8c0b88f03f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期日, 27 二月 2022 20:01:31 +0800
Subject: [PATCH] 实现国标录像级联播放，优化点播流程，加快点播速度
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java | 84 +++++++++++++++++++++++++----------------
1 files changed, 51 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
index 127ef29..1e99c0b 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
@@ -1,10 +1,13 @@
package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
+import com.genersoft.iot.vmp.media.zlm.ZLMHttpHookSubscribe;
import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.IMediaServerService;
@@ -24,6 +27,8 @@
import javax.sip.header.ToHeader;
import java.util.HashMap;
import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
/**
* SIP鍛戒护绫诲瀷锛� ACK璇锋眰
@@ -52,6 +57,9 @@
@Autowired
private IMediaServerService mediaServerService;
+ @Autowired
+ private ZLMHttpHookSubscribe subscribe;
+
/**
* 澶勭悊 ACK璇锋眰
@@ -60,6 +68,7 @@
*/
@Override
public void process(RequestEvent evt) {
+ logger.debug("ACK璇锋眰锛� {}", ((System.currentTimeMillis())));
Dialog dialog = evt.getDialog();
if (dialog == null) return;
if (dialog.getState()== DialogState.CONFIRMED) {
@@ -69,16 +78,17 @@
String is_Udp = sendRtpItem.isTcp() ? "0" : "1";
String deviceId = sendRtpItem.getDeviceId();
StreamInfo streamInfo = null;
- if (deviceId == null) {
+ if (sendRtpItem.isPlay()) {
+ streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
+ }else {
+ streamInfo = redisCatchStorage.queryPlaybackByDevice(deviceId, channelId);
+ }
+ System.out.println(JSON.toJSON(streamInfo));
+ if (streamInfo == 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);
logger.info(platformGbId);
logger.info(channelId);
@@ -90,34 +100,42 @@
param.put("dst_url",sendRtpItem.getIp());
param.put("dst_port", sendRtpItem.getPort());
param.put("is_udp", is_Udp);
- //param.put ("src_port", sendRtpItem.getLocalPort());
// 璁惧鎺ㄦ祦鏌ヨ锛屾垚鍔熷悗鎵嶈兘杞帹
- boolean rtpPushed = false;
- long startTime = System.currentTimeMillis();
- while (!rtpPushed) {
- try {
- if (System.currentTimeMillis() - startTime < 30 * 1000) {
- MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
- if (zlmrtpServerFactory.isStreamReady(mediaInfo, streamInfo.getApp(), streamInfo.getStreamId())) {
- rtpPushed = true;
- logger.info("宸茶幏鍙栬澶囨帹娴乕{}/{}]锛屽紑濮嬪悜涓婄骇鎺ㄦ祦[{}:{}]",
- streamInfo.getApp() ,streamInfo.getStreamId(), sendRtpItem.getIp(), sendRtpItem.getPort());
- zlmrtpServerFactory.startSendRtpStream(mediaInfo, param);
- } else {
- logger.info("绛夊緟璁惧鎺ㄦ祦[{}/{}].......",
- streamInfo.getApp() ,streamInfo.getStreamId());
- Thread.sleep(1000);
- continue;
- }
- } else {
- rtpPushed = true;
- logger.info("璁惧鎺ㄦ祦[{}/{}]瓒呮椂锛岀粓姝㈠悜涓婄骇鎺ㄦ祦",
- streamInfo.getApp() ,streamInfo.getStreamId());
- }
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
+ MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
+ zlmrtpServerFactory.startSendRtpStream(mediaInfo, param);
+// if (zlmrtpServerFactory.isStreamReady(mediaInfo, streamInfo.getApp(), streamInfo.getStreamId())) {
+// logger.info("宸茶幏鍙栬澶囨帹娴乕{}/{}]锛屽紑濮嬪悜涓婄骇鎺ㄦ祦[{}:{}]",
+// streamInfo.getApp() ,streamInfo.getStreamId(), sendRtpItem.getIp(), sendRtpItem.getPort());
+// zlmrtpServerFactory.startSendRtpStream(mediaInfo, param);
+// } else {
+// // 瀵筯ook杩涜璁㈤槄
+// logger.info("绛夊緟璁惧鎺ㄦ祦[{}/{}].......",
+// streamInfo.getApp(), streamInfo.getStreamId());
+// Timer timer = new Timer();
+// timer.schedule(new TimerTask() {
+// @Override
+// public void run() {
+// logger.info("璁惧鎺ㄦ祦[{}/{}]瓒呮椂锛岀粓姝㈠悜涓婄骇鎺ㄦ祦",
+// finalStreamInfo.getApp() , finalStreamInfo.getStreamId());
+//
+// }
+// }, 30*1000L);
+// // 娣诲姞璁㈤槄
+// JSONObject subscribeKey = new JSONObject();
+// subscribeKey.put("app", "rtp");
+// subscribeKey.put("stream", streamInfo.getStreamId());
+// subscribeKey.put("mediaServerId", streamInfo.getMediaServerId());
+// subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_publish, subscribeKey,
+// (MediaServerItem mediaServerItemInUse, JSONObject json) -> {
+// logger.info("宸茶幏鍙栬澶囨帹娴乕{}/{}]锛屽紑濮嬪悜涓婄骇鎺ㄦ祦[{}:{}]",
+// finalStreamInfo.getApp(), finalStreamInfo.getStreamId(), sendRtpItem.getIp(), sendRtpItem.getPort());
+// timer.cancel();
+// zlmrtpServerFactory.startSendRtpStream(mediaInfo, param);
+// subscribe.removeSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey);
+// });
+// }
+
+
}
}
}
--
Gitblit v1.8.0