Merge pull request #3 from lawrencehj/master

648540858

2020-10-26 1ec70660c687aa1da5812045009a8337981c59c8

Merge pull request #3 from lawrencehj/master

修改jar包编译版本，修正播放获取流编码信息的代码

 README.md

@@ -34,7 +34,8 @@
7. 支持通道子目录查询;  
8. 支持udp/tcp国标流传输模式;  
9. 支持直接输出RTSP、RTMP、HTTP-FLV、Websocket-FLV、HLS多种协议流地址  
10. 
10. 支持国标网络校时

# 待实现： 
上级级联  
推流列表  

 libs/jain-sip-ri-1.3.0-91.jar

Binary files differ

 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);