roouzenn/wvp
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

使用异步接口, 更好的并发, 对hook使用订阅机制

Browse Source 
替换前段播放器, 支持h265的播放
放弃循环获取编码信息,
This commit is contained in:
648540858
2020-12-08 18:11:02 +08:00
parent 5a4859f05c
commit f75b3e6cda
20 changed files with 681 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,10 @@ package com.genersoft.iot.vmp.vmanager.playback;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
import com.genersoft.iot.vmp.vmanager.service.IPlayService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +25,9 @@ import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import org.springframework.web.context.request.async.DeferredResult;
import java.util.UUID;
@CrossOrigin
@RestController
@@ -39,105 +45,41 @@ public class PlaybackController {
@Autowired
private ZLMRESTfulUtils zlmresTfulUtils;
@Value("${media.closeWaitRTPInfo}")
private boolean closeWaitRTPInfo;
@Autowired
private IPlayService playService;
@Autowired
private DeferredResultHolder resultHolder;
@GetMapping("/playback/{deviceId}/{channelId}")
public ResponseEntity<String> play(@PathVariable String deviceId, @PathVariable String channelId, String startTime,
String endTime) {
public DeferredResult<ResponseEntity<String>> play(@PathVariable String deviceId, @PathVariable String channelId, String startTime,
String endTime) {
if (logger.isDebugEnabled()) {
logger.debug(String.format("设备回放 API调用，deviceId：%s ，channelId：%s", deviceId, channelId));
}
if (StringUtils.isEmpty(deviceId) || StringUtils.isEmpty(channelId)) {
String log = String.format("设备回放 API调用失败，deviceId：%s ，channelId：%s", deviceId, channelId);
logger.warn(log);
return new ResponseEntity<String>(log, HttpStatus.BAD_REQUEST);
}
UUID uuid = UUID.randomUUID();
DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>();
// 超时处理
result.onTimeout(()->{
RequestMessage msg = new RequestMessage();
msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
msg.setData("Timeout");
resultHolder.invokeResult(msg);
});
Device device = storager.queryVideoDevice(deviceId);
StreamInfo streamInfo = storager.queryPlaybackByDevice(deviceId, channelId);
if (streamInfo != null) {
// 停止之前的回放
cmder.streamByeCmd(streamInfo.getSsrc());
}
resultHolder.put(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid, result);
cmder.playbackStreamCmd(device, channelId, startTime, endTime, (JSONObject response) -> {
logger.info("收到订阅消息： " + response.toJSONString());
playService.onPublishHandlerForPlayBack(response, deviceId, channelId, uuid.toString());
});
// }else {
// String streamId = String.format("%08x",
// Integer.parseInt(streamInfo.getSsrc())).toUpperCase();
// JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
// if (rtpInfo.getBoolean("exist")) {
// return new
// ResponseEntity<String>(JSON.toJSONString(streamInfo),HttpStatus.OK);
// }else {
// storager.stopPlayback(streamInfo);
// streamInfo = cmder.playbackStreamCmd(device, channelId, startTime, endTime);
// }
// }
streamInfo = cmder.playbackStreamCmd(device, channelId, startTime, endTime);
String streamId = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase();
if (logger.isDebugEnabled()) {
logger.debug("设备回放 API调用，ssrc：" + streamInfo.getSsrc() + ",ZLMedia streamId:" + streamId);
}
// 等待推流, TODO 默认超时15s
boolean lockFlag = true;
boolean rtpPushed = false;
long lockStartTime = System.currentTimeMillis();
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) {
try {
if (System.currentTimeMillis() - lockStartTime > 75 * 1000) {
storager.stopPlayback(streamInfo);
logger.info("播放等待超时");
return new ResponseEntity<String>("timeout", HttpStatus.OK);
} else {
streamInfo = storager.queryPlaybackByDevice(deviceId, channelId);
if (!rtpPushed) {
logger.info("查询RTP推流信息...");
rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
}
if (rtpInfo != null && rtpInfo.getBoolean("exist") && streamInfo != null
&& streamInfo.getFlv() != null) {
logger.info("查询流编码信息：" + streamInfo.getFlv());
rtpPushed = true;
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.startPlayback(streamInfo);
} else {
logger.info("流编码信息未获取，2秒后重试...");
}
} else {
Thread.sleep(2000);
continue;
}
}
} catch (InterruptedException e) {
e.printStackTrace();
}
}
}
if (streamInfo != null) {
return new ResponseEntity<String>(JSON.toJSONString(streamInfo), HttpStatus.OK);
} else {
logger.warn("设备回放API调用失败！");
return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
}
return result;
}
@RequestMapping("/playback/{ssrc}/stop")