diff --git a/README.md b/README.md index 69f77eb7..df155003 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # wvp WEB VIDEO PLATFORM是一个基于GB28181-2016标准实现的网络视频平台,负责实现核心信令与设备管理后台部分,支持NAT穿透,支持海康、大华、宇视等品牌的IPC、NVR、DVR接入。 -流媒体服务基于ZLMediaKit-https://github.com/xiongziliang/ZLMediaKit +流媒体服务基于ZLMediaKit-https://github.com/xiongziliang/ZLMediaKit 前段页面基于MediaServerUI进行修改. # 应用场景: @@ -34,12 +34,13 @@ WEB VIDEO PLATFORM是一个基于GB28181-2016标准实现的网络视频平台 7. 支持通道子目录查询; 8. 支持udp/tcp国标流传输模式; 9. 支持直接输出RTSP、RTMP、HTTP-FLV、Websocket-FLV、HLS多种协议流地址 -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 18e4f3b3..960c83ed 100644 Binary files a/libs/jain-sip-ri-1.3.0-91.jar and b/libs/jain-sip-ri-1.3.0-91.jar 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 ea2a062e..64fb8f8c 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 @@ public class PlayController { try { if (System.currentTimeMillis() - startTime > 30 * 1000) { storager.stopPlay(streamInfo); + logger.info("播放等待超时"); return new ResponseEntity("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);