From b4a63d209040b7c890b3324ef6cd19afadb6250a Mon Sep 17 00:00:00 2001 From: qiushui Date: Fri, 26 Nov 2021 11:05:14 +0800 Subject: [PATCH] =?UTF-8?q?m3u8=E9=BB=98=E8=AE=A4=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/main/resources/application-prod.yml | 8 +++++--- web/src/main/resources/application-test.yml | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/web/src/main/resources/application-prod.yml b/web/src/main/resources/application-prod.yml index c0e821a..604f94b 100644 --- a/web/src/main/resources/application-prod.yml +++ b/web/src/main/resources/application-prod.yml @@ -48,6 +48,8 @@ mp4Path: d:\\data\mp4\ cameraType: 1 # ------------服务端类型 0：TCP 1:JSON serverMode: 1 -# ------------ 实时视频流 全部页面的格式 -# --------------默认0 0:1个铺满 1:上下两个视频 2:2*2 3:3*3 4:4*4 5:5*5 6：6*6 8:8*8 -videoStyleAll : 2 \ No newline at end of file +# ------------ 实时视频流 全部页面的格式 行列数量 +videoStyleRow: 2 +videoStyleColumn: 2 +# ------------球机m3u8默认地址 %d是球机数据库id，如果数据库没有，就使用此默认值 +mediaServer: http://127.0.0.1:9080/hls/camera%d.m3u8 \ No newline at end of file diff --git a/web/src/main/resources/application-test.yml b/web/src/main/resources/application-test.yml index c0e821a..604f94b 100644 --- a/web/src/main/resources/application-test.yml +++ b/web/src/main/resources/application-test.yml @@ -48,6 +48,8 @@ mp4Path: d:\\data\mp4\ cameraType: 1 # ------------服务端类型 0：TCP 1:JSON serverMode: 1 -# ------------ 实时视频流 全部页面的格式 -# --------------默认0 0:1个铺满 1:上下两个视频 2:2*2 3:3*3 4:4*4 5:5*5 6：6*6 8:8*8 -videoStyleAll : 2 \ No newline at end of file +# ------------ 实时视频流 全部页面的格式 行列数量 +videoStyleRow: 2 +videoStyleColumn: 2 +# ------------球机m3u8默认地址 %d是球机数据库id，如果数据库没有，就使用此默认值 +mediaServer: http://127.0.0.1:9080/hls/camera%d.m3u8 \ No newline at end of file