From 1ec70660c687aa1da5812045009a8337981c59c8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 26 十月 2020 17:22:29 +0800
Subject: [PATCH] Merge pull request #3 from lawrencehj/master
---
src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java | 6 +++++-
libs/jain-sip-ri-1.3.0-91.jar | 0
README.md | 7 ++++---
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 69f77eb..df15500 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# wvp
WEB VIDEO PLATFORM鏄竴涓熀浜嶨B28181-2016鏍囧噯瀹炵幇鐨勭綉缁滆棰戝钩鍙帮紝璐熻矗瀹炵幇鏍稿績淇′护涓庤澶囩鐞嗗悗鍙伴儴鍒嗭紝鏀寔NAT绌块�忥紝鏀寔娴峰悍銆佸ぇ鍗庛�佸畤瑙嗙瓑鍝佺墝鐨処PC銆丯VR銆丏VR鎺ュ叆銆�
-娴佸獟浣撴湇鍔″熀浜嶼LMediaKit-https://github.com/xiongziliang/ZLMediaKit
+娴佸獟浣撴湇鍔″熀浜嶼LMediaKit-https://github.com/xiongziliang/ZLMediaKit
鍓嶆椤甸潰鍩轰簬MediaServerUI杩涜淇敼.
# 搴旂敤鍦烘櫙锛�
@@ -34,12 +34,13 @@
7. 鏀寔閫氶亾瀛愮洰褰曟煡璇�;
8. 鏀寔udp/tcp鍥芥爣娴佷紶杈撴ā寮�;
9. 鏀寔鐩存帴杈撳嚭RTSP銆丷TMP銆丠TTP-FLV銆乄ebsocket-FLV銆丠LS澶氱鍗忚娴佸湴鍧�
-10.
+10. 鏀寔鍥芥爣缃戠粶鏍℃椂
+
# 寰呭疄鐜帮細
涓婄骇绾ц仈
鎺ㄦ祦鍒楄〃
鎷夋祦鍒楄〃
-web鐣岄潰绯荤粺璁剧疆
+web鐣岄潰绯荤粺璁剧疆
浣跨敤mysql浣滀负鏁版嵁搴�
# 椤圭洰閮ㄧ讲
diff --git a/libs/jain-sip-ri-1.3.0-91.jar b/libs/jain-sip-ri-1.3.0-91.jar
index 18e4f3b..960c83e 100644
--- a/libs/jain-sip-ri-1.3.0-91.jar
+++ b/libs/jain-sip-ri-1.3.0-91.jar
Binary files differ
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 ea2a062..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 != 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