From 9a84ef06adff44bc6e24caa8bc16731eff061f3c Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期日, 25 十月 2020 00:29:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'upstream/master' into master
---
src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
index 3827fc7..134e692 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
@@ -58,13 +58,13 @@
}
String streamId = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase();
- // 绛夊緟鎺ㄦ祦, TODO 榛樿瓒呮椂15s
+ // 绛夊緟鎺ㄦ祦, TODO 榛樿瓒呮椂30s
boolean lockFlag = true;
long startTime = System.currentTimeMillis();
while (lockFlag) {
try {
- if (System.currentTimeMillis() - startTime > 15 * 1000) {
+ if (System.currentTimeMillis() - startTime > 30 * 1000) {
storager.stopPlay(streamInfo);
return new ResponseEntity<String>("timeout",HttpStatus.OK);
}else {
--
Gitblit v1.8.0