Shikong/gb28181-docking-platform-proxy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整

Browse Source
This commit is contained in:
shikong 2024-03-15 11:26:10 +08:00
parent 04cfcfd22a
commit f8ce65d15b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/ffmpeg/FfmpegSupportService.java
View File

@ -27,7 +27,7 @@ public class FfmpegSupportService {
String outputParam = debug.getOutput() ? rtp.getOutput() : StringUtils.joinWith(" ", "-t", unit.toSeconds(time), rtp.getOutput(), out); String outputParam = debug.getOutput() ? rtp.getOutput() : StringUtils.joinWith(" ", "-t", unit.toSeconds(time), rtp.getOutput(), out);
log.info("视频输出参数 {}", outputParam); log.info("视频输出参数 {}", outputParam);
return ffmpegExecutor(inputParam, outputParam, time + 15, unit, streamHandler, executeResultHandler); return ffmpegExecutor(inputParam, outputParam, unit.toSeconds(time) + 15, TimeUnit.SECONDS, streamHandler, executeResultHandler);
} }
@SneakyThrows @SneakyThrows
@ -45,7 +45,7 @@ public class FfmpegSupportService {
String outputParam = debug.getOutput() ? rtp.getOutput() : StringUtils.joinWith(" ", rtp.getOutput(), out); String outputParam = debug.getOutput() ? rtp.getOutput() : StringUtils.joinWith(" ", rtp.getOutput(), out);
log.info("视频输出参数 {}", outputParam); log.info("视频输出参数 {}", outputParam);
return ffmpegExecutor(inputParam, outputParam, time, unit, streamHandler, executeResultHandler); return ffmpegExecutor(inputParam, outputParam, unit.toSeconds(time) + 15, TimeUnit.SECONDS, streamHandler, executeResultHandler);
} }
@SneakyThrows @SneakyThrows

2
gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/video/VideoService.java
View File

@ -262,7 +262,7 @@ public class VideoService {
log.info("到达结束时间, 结束录制 {}", url); log.info("到达结束时间, 结束录制 {}", url);
executor.getWatchdog().destroyProcess(); executor.getWatchdog().destroyProcess();
log.info("结束录制 {}", url); log.info("结束录制 {}", url);
}, time, TimeUnit.SECONDS); }, time + 15, TimeUnit.SECONDS);
executeResultHandler.waitFor(); executeResultHandler.waitFor();
schedule.cancel(true); schedule.cancel(true);
DateTime endTime = DateUtil.date(); DateTime endTime = DateUtil.date();