优化按需拉流配置,拉流代理支持按需拉流
This commit is contained in:
@@ -69,9 +69,6 @@ public class MediaConfig{
|
||||
@Value("${media.secret}")
|
||||
private String secret;
|
||||
|
||||
@Value("${media.stream-none-reader-delay-ms:15000}")
|
||||
private int streamNoneReaderDelayMS = 15000;
|
||||
|
||||
@Value("${media.rtp.enable}")
|
||||
private boolean rtpEnable;
|
||||
|
||||
@@ -151,10 +148,6 @@ public class MediaConfig{
|
||||
return secret;
|
||||
}
|
||||
|
||||
public int getStreamNoneReaderDelayMS() {
|
||||
return streamNoneReaderDelayMS;
|
||||
}
|
||||
|
||||
public boolean isRtpEnable() {
|
||||
return rtpEnable;
|
||||
}
|
||||
@@ -219,7 +212,6 @@ public class MediaConfig{
|
||||
mediaServerItem.setRtspSSLPort(rtspSSLPort);
|
||||
mediaServerItem.setAutoConfig(autoConfig);
|
||||
mediaServerItem.setSecret(secret);
|
||||
mediaServerItem.setStreamNoneReaderDelayMS(streamNoneReaderDelayMS);
|
||||
mediaServerItem.setRtpEnable(rtpEnable);
|
||||
mediaServerItem.setRtpPortRange(rtpPortRange);
|
||||
mediaServerItem.setSendRtpPortRange(sendRtpPortRange);
|
||||
|
||||
@@ -33,6 +33,8 @@ public class UserSetting {
|
||||
|
||||
private Boolean usePushingAsStatus = Boolean.TRUE;
|
||||
|
||||
private Boolean streamOnDemand = Boolean.TRUE;
|
||||
|
||||
private String serverId = "000000";
|
||||
|
||||
private String thirdPartyGBIdReg = "[\\s\\S]*";
|
||||
@@ -146,4 +148,12 @@ public class UserSetting {
|
||||
public void setUsePushingAsStatus(Boolean usePushingAsStatus) {
|
||||
this.usePushingAsStatus = usePushingAsStatus;
|
||||
}
|
||||
|
||||
public Boolean getStreamOnDemand() {
|
||||
return streamOnDemand;
|
||||
}
|
||||
|
||||
public void setStreamOnDemand(Boolean streamOnDemand) {
|
||||
this.streamOnDemand = streamOnDemand;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user