Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

录像回放时同样根据设置决定是否事先取编码信息

pull/1/head
Lawrence 2020-11-16 12:39:10 +08:00
parent e4e6209835
commit 24cd9158d4
1 changed files with 75 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java
View File

@ -7,6 +7,7 @@ import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@ -38,8 +39,12 @@ public class PlaybackController {
@Autowired @Autowired
private ZLMRESTfulUtils zlmresTfulUtils; private ZLMRESTfulUtils zlmresTfulUtils;
@Value("${media.closeWaitRTPInfo}")
private boolean closeWaitRTPInfo;
@GetMapping("/playback/{deviceId}/{channelId}") @GetMapping("/playback/{deviceId}/{channelId}")
public ResponseEntity<String> play(@PathVariable String deviceId,@PathVariable String channelId, String startTime, String endTime){ public ResponseEntity<String> play(@PathVariable String deviceId, @PathVariable String channelId, String startTime,
String endTime) {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug(String.format("设备回放 API调用，deviceId：%s ，channelId：%s", deviceId, channelId)); logger.debug(String.format("设备回放 API调用，deviceId：%s ，channelId：%s", deviceId, channelId));
@ -59,10 +64,12 @@ public class PlaybackController {
} }
// }else { // }else {
// String streamId = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase(); // String streamId = String.format("%08x",
// Integer.parseInt(streamInfo.getSsrc())).toUpperCase();
// JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId); // JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
// if (rtpInfo.getBoolean("exist")) { // if (rtpInfo.getBoolean("exist")) {
// return new ResponseEntity<String>(JSON.toJSONString(streamInfo),HttpStatus.OK); // return new
// ResponseEntity<String>(JSON.toJSONString(streamInfo),HttpStatus.OK);
// }else { // }else {
// storager.stopPlayback(streamInfo); // storager.stopPlayback(streamInfo);
// streamInfo = cmder.playbackStreamCmd(device, channelId, startTime, endTime); // streamInfo = cmder.playbackStreamCmd(device, channelId, startTime, endTime);
@ -81,6 +88,13 @@ public class PlaybackController {
long lockStartTime = System.currentTimeMillis(); long lockStartTime = System.currentTimeMillis();
JSONObject rtpInfo = null; JSONObject rtpInfo = null;
if (closeWaitRTPInfo) {
String flv = storager.getMediaInfo().getWanIp() + ":" + storager.getMediaInfo().getHttpPort() + "/rtp/"
+ streamId + ".flv";
streamInfo.setFlv("http://" + flv);
streamInfo.setWs_flv("ws://" + flv);
storager.startPlayback(streamInfo);
} else {
while (lockFlag) { while (lockFlag) {
try { try {
if (System.currentTimeMillis() - lockStartTime > 75 * 1000) { if (System.currentTimeMillis() - lockStartTime > 75 * 1000) {
@ -93,7 +107,8 @@ public class PlaybackController {
logger.info("查询RTP推流信息..."); logger.info("查询RTP推流信息...");
rtpInfo = zlmresTfulUtils.getRtpInfo(streamId); 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()); logger.info("查询流编码信息：" + streamInfo.getFlv());
rtpPushed = true; rtpPushed = true;
Thread.sleep(2000); Thread.sleep(2000);
@ -116,6 +131,7 @@ public class PlaybackController {
e.printStackTrace(); e.printStackTrace();
} }
} }
}
if (streamInfo != null) { if (streamInfo != null) {
return new ResponseEntity<String>(JSON.toJSONString(streamInfo), HttpStatus.OK); return new ResponseEntity<String>(JSON.toJSONString(streamInfo), HttpStatus.OK);
} else { } else {