From 44d216100b45c3337c593ee82ee68e7e0f35d24b Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期三, 16 十二月 2020 20:29:19 +0800
Subject: [PATCH] 与master分支同步
---
src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java | 7 +++----
1 files changed, 3 insertions(+), 4 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 40b1b5b..6180fbb 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
@@ -34,8 +34,7 @@
@Autowired
private IVideoManagerStorager storager;
- @Value("${media.closeWaitRTPInfo}")
- private boolean closeWaitRTPInfo;
+ private boolean closeWaitRTPInfo = false;
@Autowired
@@ -94,7 +93,7 @@
StreamInfo streamInfo = storager.queryPlayByDevice(device.getDeviceId(), code);
if (streamInfo == null) {
logger.debug("streamInfo 绛変簬null, 閲嶆柊鐐规挱");
- streamInfo = cmder.playStreamCmd(device, code);
+// streamInfo = cmder.playStreamCmd(device, code);
}else {
logger.debug("streamInfo 涓嶇瓑浜巒ull, 鍚戞祦濯掍綋鏌ヨ鏄惁姝ｅ湪鎺ㄦ祦");
String streamId = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase();
@@ -136,7 +135,7 @@
} else {
logger.debug("鍚戞祦濯掍綋鏌ヨ娌℃湁鎺ㄦ祦, 閲嶆柊鐐规挱");
storager.stopPlay(streamInfo);
- streamInfo = cmder.playStreamCmd(device, code);
+// streamInfo = cmder.playStreamCmd(device, code);
}
}
--
Gitblit v1.8.0