From f8ce65d15bfcba2c8a5009a4cc31ce0b1ecdfc4e Mon Sep 17 00:00:00 2001
From: shikong <919411476@qq.com>
Date: Fri, 15 Mar 2024 11:26:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gb28181/wvp/service/ffmpeg/FfmpegSupportService.java      | 4 ++--
 .../skcks/docking/gb28181/wvp/service/video/VideoService.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/ffmpeg/FfmpegSupportService.java b/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/ffmpeg/FfmpegSupportService.java
index 8a2bc24..382f43c 100644
--- a/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/ffmpeg/FfmpegSupportService.java
+++ b/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/ffmpeg/FfmpegSupportService.java
@@ -27,7 +27,7 @@ public class FfmpegSupportService {
         String outputParam = debug.getOutput() ? rtp.getOutput() : StringUtils.joinWith(" ", "-t", unit.toSeconds(time), rtp.getOutput(), out);
         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
@@ -45,7 +45,7 @@ public class FfmpegSupportService {
         String outputParam = debug.getOutput() ? rtp.getOutput() : StringUtils.joinWith(" ", rtp.getOutput(), out);
         log.info("视频输出参数 {}", outputParam);
 
-        return ffmpegExecutor(inputParam, outputParam, time, unit, streamHandler, executeResultHandler);
+        return ffmpegExecutor(inputParam, outputParam, unit.toSeconds(time) + 15, TimeUnit.SECONDS, streamHandler, executeResultHandler);
     }
 
     @SneakyThrows
diff --git a/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/video/VideoService.java b/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/video/VideoService.java
index 46a6a51..1acf3f4 100644
--- a/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/video/VideoService.java
+++ b/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/video/VideoService.java
@@ -262,7 +262,7 @@ public class VideoService {
             log.info("到达结束时间, 结束录制 {}", url);
             executor.getWatchdog().destroyProcess();
             log.info("结束录制 {}", url);
-        }, time, TimeUnit.SECONDS);
+        }, time + 15, TimeUnit.SECONDS);
         executeResultHandler.waitFor();
         schedule.cancel(true);
         DateTime endTime = DateUtil.date();