From 5ab432856deb79c26a3b4ea05e8582acf9e80cdc Mon Sep 17 00:00:00 2001 From: Lawrence <1934378145@qq.com> Date: 星期一, 19 十月 2020 23:10:33 +0800 Subject: [PATCH] 默认含有音频通道,改为播放时判断音频编码 --- src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java | 36 ++++++++++++++---------------------- 1 files changed, 14 insertions(+), 22 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..3827fc7 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; @@ -63,36 +64,27 @@ while (lockFlag) { try { - if (System.currentTimeMillis() - startTime > 15 * 1000) { storager.stopPlay(streamInfo); return new ResponseEntity<String>("timeout",HttpStatus.OK); }else { + streamInfo = storager.queryPlayByDevice(deviceId, channelId); JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId); - Boolean exist = rtpInfo.getBoolean("exist"); - if (rtpInfo == null || !rtpInfo.getBoolean("exist") || streamInfo.getFlv() != null){ - 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); - } - } - } + if (rtpInfo != null && rtpInfo.getBoolean("exist") && streamInfo.getFlv() != null){ + JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo("rtp", "rtmp", streamId); + if (mediaInfo.getInteger("code") == 0 && mediaInfo.getBoolean("online")) { + lockFlag = false; + JSONArray tracks = mediaInfo.getJSONArray("tracks"); + streamInfo.setTracks(tracks); + storager.startPlay(streamInfo); + }else { + } + }else { + Thread.sleep(2000); + continue; }; } - Thread.sleep(200); - streamInfo = storager.queryPlayByDevice(deviceId, channelId); } catch (InterruptedException e) { e.printStackTrace(); } -- Gitblit v1.8.0