From 04af6de363b8d420eb244e289817277ea2bcc5d4 Mon Sep 17 00:00:00 2001
From: panll <m18010473990@163.com>
Date: 星期六, 17 十月 2020 16:41:40 +0800
Subject: [PATCH] 修改默认参数与ZLM统一
---
src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java | 21 +++------------------
1 files changed, 3 insertions(+), 18 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 d5647fc..ad0ff0c 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
@@ -7,6 +7,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.CrossOrigin;
@@ -69,30 +70,14 @@
return new ResponseEntity<String>("timeout",HttpStatus.OK);
}else {
JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
- Boolean exist = rtpInfo.getBoolean("exist");
- if (rtpInfo == null || !rtpInfo.getBoolean("exist") || streamInfo.getFlv() != null){
+ if (rtpInfo == null || !rtpInfo.getBoolean("exist") || storager.queryPlayByDevice(deviceId, channelId).getFlv() == null){
+ Thread.sleep(2000);
continue;
}else {
lockFlag = false;
streamInfo = storager.queryPlay(streamInfo);
- // 鑾峰彇濯掍綋淇℃伅
- JSONObject mediaList = zlmresTfulUtils.getMediaList("rtp", "rtmp");
- if (mediaList.getInteger("code") == 0) {
- JSONArray data = mediaList.getJSONArray("data");
- if (data!= null) {
- for (Object datum : data) {
- JSONObject media = (JSONObject)datum;
- if (streamId.equals(media.getString("stream"))) {
- streamInfo.setTracks(media.getJSONArray("tracks"));
- storager.startPlay(streamInfo);
- }
- }
- }
- }
};
}
- Thread.sleep(200);
- streamInfo = storager.queryPlayByDevice(deviceId, channelId);
} catch (InterruptedException e) {
e.printStackTrace();
}
--
Gitblit v1.8.0