From 028c178ef5c01d3bfe9824dd838578c23ac1ac9a Mon Sep 17 00:00:00 2001
From: shikong <919411476@qq.com>
Date: Wed, 17 Jan 2024 16:29:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=8F=82=E6=95=B0=20?=
 =?UTF-8?q?=E5=92=8C=20=E5=81=8F=E7=A7=BB=E9=87=8F=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gb28181/wvp/config/Gb28181DeviceVideoApiConfig.java  | 2 +-
 .../src/main/resources/application-local.yml             | 6 ++++++
 .../src/main/resources/application.yml                   | 9 +++++----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/config/Gb28181DeviceVideoApiConfig.java b/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/config/Gb28181DeviceVideoApiConfig.java
index e8ebb27..716a82f 100644
--- a/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/config/Gb28181DeviceVideoApiConfig.java
+++ b/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/config/Gb28181DeviceVideoApiConfig.java
@@ -21,7 +21,7 @@ public class Gb28181DeviceVideoApiConfig {
     @NoArgsConstructor
     @AllArgsConstructor
     public static class Offset {
-        private Duration forward = Duration.of(30, ChronoUnit.SECONDS);
+        private Duration forward = Duration.of(0, ChronoUnit.SECONDS);
         private Duration back= Duration.of(0, ChronoUnit.SECONDS);
     }
 }
diff --git a/gb28181-wvp-proxy-starter/src/main/resources/application-local.yml b/gb28181-wvp-proxy-starter/src/main/resources/application-local.yml
index b5ba458..26b9a14 100644
--- a/gb28181-wvp-proxy-starter/src/main/resources/application-local.yml
+++ b/gb28181-wvp-proxy-starter/src/main/resources/application-local.yml
@@ -72,6 +72,11 @@ proxy:
       use-playback-to-download: false
       proxy-media-url: 'https://10.10.10.200:18181/media'
 #        - 192.168.1.241
+    device-api:
+      offset:
+        forward: 0s
+        back: 0s
+
 ffmpeg-support:
   ffmpeg: D:\Soft\Captura\ffmpeg\ffmpeg.exe
   ffprobe: D:\Soft\Captura\ffmpeg\ffprobe.exe
@@ -79,6 +84,7 @@ ffmpeg-support:
 #    input: -i http://10.10.10.200:5080/live/test.live.flv
     input: -re -i
     output: -preset ultrafast -vcodec libx264 -acodec aac -movflags empty_moov+frag_keyframe+default_base_moof -f mp4 # -rtsp_transport tcp
+#    output: -enc_time_base -1 -preset ultrafast -tune zerolatency -vcodec libx264 -an -movflags faststart -f flv # -rtsp_transport tcp
     download: -thread_queue_size 128 -i
   debug:
     download: false
diff --git a/gb28181-wvp-proxy-starter/src/main/resources/application.yml b/gb28181-wvp-proxy-starter/src/main/resources/application.yml
index 650a857..6cf30f4 100644
--- a/gb28181-wvp-proxy-starter/src/main/resources/application.yml
+++ b/gb28181-wvp-proxy-starter/src/main/resources/application.yml
@@ -24,8 +24,8 @@ spring:
     username: root
     password: 123456a
     url: jdbc:mysql://192.168.1.241:3306/gb28181_docking_platform_dev?createDatabaseIfNotExist=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-#  profiles:
-#    active: local
+  profiles:
+    active: local
   cloud:
     openfeign:
       httpclient:
@@ -78,7 +78,7 @@ proxy:
       proxy-media-url: 'https://192.168.1.241:9022/mf-config/media'
     device-api:
       offset:
-        forward: 30s
+        forward: 0s
         back: 0s
 
 ffmpeg-support:
@@ -88,7 +88,8 @@ ffmpeg-support:
   rtp:
     input: -re -i
     #output: -preset ultrafast -tune zerolatency -vcodec libx264 -acodec aac -movflags empty_moov+frag_keyframe+default_base_moof -f mp4 # -rtsp_transport tcp
-    output: -enc_time_base -1 -preset ultrafast -tune zerolatency -vcodec libx264 -an -movflags empty_moov+frag_keyframe+default_base_moof -f mp4 # -rtsp_transport tcp
+    # output: -enc_time_base -1 -preset ultrafast -tune zerolatency -vcodec libx264 -an -movflags empty_moov+frag_keyframe+default_base_moof -f mp4 # -rtsp_transport tcp
+    output: -enc_time_base -1 -preset ultrafast -tune zerolatency -vcodec libx264 -an -movflags faststart -f mp4 # -rtsp_transport tcp
     download: -thread_queue_size 128 -fflags +genpts -enc_time_base -1 -i
   debug:
     download: false