From 0b6587b1ad7371e993904c1b7f4baa67e3495bf4 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期日, 20 二月 2022 17:29:03 +0800
Subject: [PATCH] 增加配置将国标录像与其他录像分开
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 7 ++++++-
src/main/java/com/genersoft/iot/vmp/conf/UserSetup.java | 12 +++++++++++-
src/main/resources/all-application.yml | 2 ++
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/UserSetup.java b/src/main/java/com/genersoft/iot/vmp/conf/UserSetup.java
index 8a4c021..4decd2b 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/UserSetup.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/UserSetup.java
@@ -23,7 +23,9 @@
private Boolean interfaceAuthentication = Boolean.TRUE;
- private Boolean recordPushLive = Boolean.FALSE;
+ private Boolean recordPushLive = Boolean.TRUE;
+
+ private Boolean recordSip = Boolean.TRUE;
private Boolean logInDatebase = Boolean.TRUE;
@@ -134,4 +136,12 @@
public void setRedisConfig(Boolean redisConfig) {
this.redisConfig = redisConfig;
}
+
+ public Boolean getRecordSip() {
+ return recordSip;
+ }
+
+ public void setRecordSip(Boolean recordSip) {
+ this.recordSip = recordSip;
+ }
}
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
index 34ee4a8..5c8a6b5 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -186,7 +186,6 @@
ret.put("code", 0);
ret.put("msg", "success");
ret.put("enableHls", true);
- ret.put("enableMP4", userSetup.isRecordPushLive());
String mediaServerId = json.getString("mediaServerId");
ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_publish, json);
if (subscribe != null) {
@@ -200,6 +199,12 @@
}
String app = json.getString("app");
String stream = json.getString("stream");
+ if ("rtp".equals(app)) {
+ ret.put("enableMP4", userSetup.getRecordSip());
+ }else {
+ ret.put("enableMP4", userSetup.isRecordPushLive());
+ }
+ ret.put("enableMP4", userSetup.isRecordPushLive());
StreamInfo streamInfo = redisCatchStorage.queryPlaybackByStreamId(stream);
// 褰曞儚鍥炴斁鏃朵笉杩涜褰曞儚涓嬭浇
diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index e3b1ad1..5e77236 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -168,6 +168,8 @@
- /api/v1/**
# 鎺ㄦ祦鐩存挱鏄惁褰曞埗
record-push-live: true
+ # 鍥芥爣鏄惁褰曞埗
+ record-sip: true
# 鏄惁灏嗘棩蹇楀瓨鍌ㄨ繘鏁版嵁搴�
logInDatebase: true
# 绗笁鏂瑰尮閰嶏紝鐢ㄤ簬浠巗tream閽熻幏鍙栨湁鏁堜俊鎭�
--
Gitblit v1.8.0