XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加配置将国标录像与其他录像分开

Browse Source
This commit is contained in:
648540858
2022-02-20 17:29:03 +08:00
parent 5bcd8495e0
commit 0b6587b1ad
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/genersoft/iot/vmp/conf/UserSetup.java
View File

@@ -23,7 +23,9 @@ public class UserSetup {
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 class UserSetup {
public void setRedisConfig(Boolean redisConfig) {
this.redisConfig = redisConfig;
}
public Boolean getRecordSip() {
return recordSip;
}
public void setRecordSip(Boolean recordSip) {
this.recordSip = recordSip;
}
}

7
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
View File

@@ -186,7 +186,6 @@ public class ZLMHttpHookListener {
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 @@ public class ZLMHttpHookListener {
}
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);
// 录像回放时不进行录像下载