From 2fe9e519b42408c07630735ab76e86b999f72948 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 26 十月 2020 17:02:29 +0800
Subject: [PATCH] Merge branch 'master' into master
---
src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java | 8 ++++++--
1 files changed, 6 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 134e692..64fb8f8 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
@@ -66,19 +66,23 @@
try {
if (System.currentTimeMillis() - startTime > 30 * 1000) {
storager.stopPlay(streamInfo);
+ logger.info("鎾斁绛夊緟瓒呮椂");
return new ResponseEntity<String>("timeout",HttpStatus.OK);
}else {
streamInfo = storager.queryPlayByDevice(deviceId, channelId);
JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
- if (rtpInfo != null && rtpInfo.getBoolean("exist") && streamInfo.getFlv() != null){
+ if (rtpInfo != null && rtpInfo.getBoolean("exist") && streamInfo != null && streamInfo.getFlv() != null){
+ logger.info("RTP宸叉帹娴侊紝鏌ヨ缂栫爜淇℃伅锛�"+streamInfo.getFlv());
+ Thread.sleep(2000);
JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo("rtp", "rtmp", streamId);
if (mediaInfo.getInteger("code") == 0 && mediaInfo.getBoolean("online")) {
lockFlag = false;
+ logger.info("濯掍綋缂栫爜淇℃伅宸茶幏鍙�");
JSONArray tracks = mediaInfo.getJSONArray("tracks");
streamInfo.setTracks(tracks);
storager.startPlay(streamInfo);
}else {
-
+ logger.info("濯掍綋缂栫爜淇℃伅鏈幏鍙栵紝2绉掑悗閲嶈瘯...");
}
}else {
Thread.sleep(2000);
--
Gitblit v1.8.0