From 381c3bdc2079ece5147cf4cee004e9071edadf7a Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期四, 04 五月 2023 16:04:44 +0800 Subject: [PATCH] 修复国标点播下级平台,ssrc更新的时单端口错误更新rtpserver的问题 --- src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java | 60 +++--------------------------------------------------------- 1 files changed, 3 insertions(+), 57 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java index ec09ce5..e6bbb5f 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java @@ -1,13 +1,9 @@ package com.genersoft.iot.vmp.media.zlm.dto; -import com.genersoft.iot.vmp.gb28181.session.SsrcConfig; import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig; import io.swagger.v3.oas.annotations.media.Schema; import org.springframework.util.ObjectUtils; -import org.springframework.util.StringUtils; - -import java.util.HashMap; @Schema(description = "娴佸獟浣撴湇鍔′俊鎭�") public class MediaServerItem{ @@ -54,11 +50,8 @@ @Schema(description = "ZLM閴存潈鍙傛暟") private String secret; - @Schema(description = "鏌愪釜娴佹棤浜鸿鐪嬫椂锛岃Е鍙慼ook.on_stream_none_reader浜嬩欢鐨勬渶澶х瓑寰呮椂闂达紝鍗曚綅姣") - private int streamNoneReaderDelayMS; - @Schema(description = "keepalive hook瑙﹀彂闂撮殧,鍗曚綅绉�") - private int hookAliveInterval; + private Float hookAliveInterval; @Schema(description = "鏄惁浣跨敤澶氱鍙fā寮�") private boolean rtpEnable; @@ -68,9 +61,6 @@ @Schema(description = "澶氱鍙TP鏀舵祦绔彛鑼冨洿") private String rtpPortRange; - - @Schema(description = "RTP鍙戞祦绔彛鑼冨洿") - private String sendRtpPortRange; @Schema(description = "assist鏈嶅姟绔彛") private int recordAssistPort; @@ -87,19 +77,9 @@ @Schema(description = "鏄惁鏄粯璁LM") private boolean defaultServer; - @Schema(description = "SSRC淇℃伅") - private SsrcConfig ssrcConfig; - @Schema(description = "褰撳墠浣跨敤鍒扮殑绔彛") private int currentPort; - - /** - * 姣忎竴鍙癦LM閮芥湁涓�濂楃嫭绔嬬殑SSRC鍒楄〃 - * 鍦ˋpplicationCheckRunner閲屽mediaServerSsrcMap杩涜鍒濆鍖� - */ - @Schema(description = "ID") - private HashMap<String, SsrcConfig> mediaServerSsrcMap; public MediaServerItem() { } @@ -119,11 +99,9 @@ rtspSSLPort = zlmServerConfig.getRtspSSlport(); autoConfig = true; // 榛樿鍊紅rue; secret = zlmServerConfig.getApiSecret(); - streamNoneReaderDelayMS = zlmServerConfig.getGeneralStreamNoneReaderDelayMS(); hookAliveInterval = zlmServerConfig.getHookAliveInterval(); rtpEnable = false; // 榛樿浣跨敤鍗曠鍙�;鐩村埌鐢ㄦ埛鑷繁璁剧疆寮�鍚绔彛 rtpPortRange = zlmServerConfig.getPortRange().replace("_",","); // 榛樿浣跨敤30000,30500浣滀负绾ц仈鏃跺彂閫佹祦鐨勭鍙e彿 - sendRtpPortRange = "30000,30500"; // 榛樿浣跨敤30000,30500浣滀负绾ц仈鏃跺彂閫佹祦鐨勭鍙e彿 recordAssistPort = 0; // 榛樿鍏抽棴 } @@ -240,14 +218,6 @@ this.secret = secret; } - public int getStreamNoneReaderDelayMS() { - return streamNoneReaderDelayMS; - } - - public void setStreamNoneReaderDelayMS(int streamNoneReaderDelayMS) { - this.streamNoneReaderDelayMS = streamNoneReaderDelayMS; - } - public boolean isRtpEnable() { return rtpEnable; } @@ -296,22 +266,6 @@ this.updateTime = updateTime; } - public HashMap<String, SsrcConfig> getMediaServerSsrcMap() { - return mediaServerSsrcMap; - } - - public void setMediaServerSsrcMap(HashMap<String, SsrcConfig> mediaServerSsrcMap) { - this.mediaServerSsrcMap = mediaServerSsrcMap; - } - - public SsrcConfig getSsrcConfig() { - return ssrcConfig; - } - - public void setSsrcConfig(SsrcConfig ssrcConfig) { - this.ssrcConfig = ssrcConfig; - } - public int getCurrentPort() { return currentPort; } @@ -336,19 +290,11 @@ this.lastKeepaliveTime = lastKeepaliveTime; } - public String getSendRtpPortRange() { - return sendRtpPortRange; - } - - public void setSendRtpPortRange(String sendRtpPortRange) { - this.sendRtpPortRange = sendRtpPortRange; - } - - public int getHookAliveInterval() { + public Float getHookAliveInterval() { return hookAliveInterval; } - public void setHookAliveInterval(int hookAliveInterval) { + public void setHookAliveInterval(Float hookAliveInterval) { this.hookAliveInterval = hookAliveInterval; } } -- Gitblit v1.8.0