XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复 拉流代理的ffmpeg模式

Browse Source
This commit is contained in:
64850858
2021-06-04 19:22:47 +08:00
parent a209ba77ea
commit 2af5cf496c
8 changed files with 69 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
View File

@@ -168,7 +168,7 @@ public class PlayController {
String dstUrl = String.format("rtmp://%s:%s/convert/%s", "127.0.0.1", mediaInfo.getRtmpPort(),
streamId );
String srcUrl = String.format("rtsp://%s:%s/rtp/%s", "127.0.0.1", mediaInfo.getRtspPort(), streamId);
JSONObject jsonObject = zlmresTfulUtils.addFFmpegSource(srcUrl, dstUrl, "1000000");
JSONObject jsonObject = zlmresTfulUtils.addFFmpegSource(srcUrl, dstUrl, "1000000", true, false, null);
logger.info(jsonObject.toJSONString());
JSONObject result = new JSONObject();
if (jsonObject != null && jsonObject.getInteger("code") == 0) {

13
src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java
View File

@@ -66,6 +66,19 @@ public class StreamProxyController {
return result;
}
@ApiOperation("获取ffmpeg.cmd模板")
@GetMapping(value = "/ffmpeg_cmd/list")
@ResponseBody
public WVPResult getFFmpegCMDs(){
logger.debug("获取ffmpeg.cmd模板：" );
JSONObject data = streamProxyService.getFFmpegCMDs();
WVPResult<JSONObject> result = new WVPResult<>();
result.setCode(0);
result.setMsg("success");
result.setData(data);
return result;
}
@ApiOperation("移除代理")
@ApiImplicitParams({
@ApiImplicitParam(name = "app", value = "应用名", dataTypeClass = String.class),