|
|
@ -39,7 +39,8 @@ public class PlayController { |
|
|
|
private ZLMRESTfulUtils zlmresTfulUtils; |
|
|
|
|
|
|
|
@GetMapping("/play/{deviceId}/{channelId}") |
|
|
|
public ResponseEntity<String> play(@PathVariable String deviceId, @PathVariable String channelId) { |
|
|
|
public ResponseEntity<String> play(@PathVariable String deviceId, @PathVariable String channelId, |
|
|
|
Integer getEncoding) { |
|
|
|
|
|
|
|
Device device = storager.queryVideoDevice(deviceId); |
|
|
|
StreamInfo streamInfo = storager.queryPlayByDevice(deviceId, channelId); |
|
|
@ -64,6 +65,7 @@ public class PlayController { |
|
|
|
long startTime = System.currentTimeMillis(); |
|
|
|
JSONObject rtpInfo = null; |
|
|
|
|
|
|
|
if (getEncoding == 1) { |
|
|
|
while (lockFlag) { |
|
|
|
try { |
|
|
|
if (System.currentTimeMillis() - startTime > 60 * 1000) { |
|
|
@ -76,7 +78,8 @@ public class PlayController { |
|
|
|
logger.info("查询RTP推流信息..."); |
|
|
|
rtpInfo = zlmresTfulUtils.getRtpInfo(streamId); |
|
|
|
} |
|
|
|
if (rtpInfo != null && rtpInfo.getBoolean("exist") && streamInfo != null && streamInfo.getFlv() != null) { |
|
|
|
if (rtpInfo != null && rtpInfo.getBoolean("exist") && streamInfo != null |
|
|
|
&& streamInfo.getFlv() != null) { |
|
|
|
logger.info("查询流编码信息:" + streamInfo.getFlv()); |
|
|
|
rtpPushed = true; |
|
|
|
Thread.sleep(2000); |
|
|
@ -99,6 +102,13 @@ public class PlayController { |
|
|
|
e.printStackTrace(); |
|
|
|
} |
|
|
|
} |
|
|
|
} else { |
|
|
|
String flv = storager.getMediaInfo().getLocalIP() + ":" + storager.getMediaInfo().getHttpPort() + "/rtp/" |
|
|
|
+ streamId + ".flv"; |
|
|
|
streamInfo.setFlv("http://" + flv); |
|
|
|
streamInfo.setWs_flv("ws://" + flv); |
|
|
|
storager.startPlay(streamInfo); |
|
|
|
} |
|
|
|
|
|
|
|
if (logger.isDebugEnabled()) { |
|
|
|
logger.debug(String.format("设备预览 API调用,deviceId:%s ,channelId:%s", deviceId, channelId)); |
|
|
|