From 9bf87971e7dc6e0bccc0cf9a2301e9c89f9a0ba6 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期四, 07 一月 2021 14:56:10 +0800
Subject: [PATCH] 完成向上级联->启动时自动注册
---
src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java b/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
index 5964e99..8ebdf64 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
@@ -8,6 +8,7 @@
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
+import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.vmanager.play.PlayController;
import org.slf4j.Logger;
@@ -35,7 +36,8 @@
@Autowired
private IVideoManagerStorager storager;
- private boolean closeWaitRTPInfo = false;
+ @Autowired
+ private IRedisCatchStorage redisCatchStorage;
@Autowired
@@ -86,6 +88,8 @@
JSONObject result = new JSONObject();
result.put("error","timeout");
resultDeferredResult.setResult(result);
+
+ // 娓呯悊RTP server
});
DeviceChannel deviceChannel = storager.queryChannel(serial, code);
@@ -156,14 +160,14 @@
){
- StreamInfo streamInfo = storager.queryPlayByDevice(serial, code);
+ StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(serial, code);
if (streamInfo == null) {
JSONObject result = new JSONObject();
result.put("error","鏈壘鍒版祦淇℃伅");
return result;
}
cmder.streamByeCmd(streamInfo.getStreamId());
- storager.stopPlay(streamInfo);
+ redisCatchStorage.stopPlay(streamInfo);
return null;
}
--
Gitblit v1.8.0