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 | 2 +-
1 files changed, 1 insertions(+), 1 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 640dd53..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
@@ -71,7 +71,7 @@
}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);
--
Gitblit v1.8.0