wvp-pro.git - Gitblit

			@@ -43,8 +43,6 @@

			private Boolean pushAuthority = Boolean.TRUE;

			private Boolean gbSendStreamStrict = Boolean.FALSE;

			private Boolean syncChannelOnDeviceOnline = Boolean.FALSE;

			private Boolean sipLog = Boolean.FALSE;
			@@ -202,14 +200,6 @@

			public void setPushAuthority(Boolean pushAuthority) {
			this.pushAuthority = pushAuthority;
			}

			public Boolean getGbSendStreamStrict() {
			return gbSendStreamStrict;
			}

			public void setGbSendStreamStrict(Boolean gbSendStreamStrict) {
			this.gbSendStreamStrict = gbSendStreamStrict;
			}

			public Boolean getSyncChannelOnDeviceOnline() {

			@@ -163,15 +163,9 @@
			public SendRtpItem createSendRtpItem(MediaServerItem serverItem, String ip, int port, String ssrc, String platformId,
			String deviceId, String channelId, boolean tcp, boolean rtcp){

			// 默认为随机端口
			int localPort = 0;
			if (userSetting.getGbSendStreamStrict()) {
			if (userSetting.getGbSendStreamStrict()) {
			localPort = sendRtpPortManager.getNextPort(serverItem);
			if (localPort == 0) {
			return null;
			}
			}
			int localPort = sendRtpPortManager.getNextPort(serverItem);
			if (localPort == 0) {
			return null;
			}
			SendRtpItem sendRtpItem = new SendRtpItem();
			sendRtpItem.setIp(ip);
			@@ -201,13 +195,10 @@
			*/
			public SendRtpItem createSendRtpItem(MediaServerItem serverItem, String ip, int port, String ssrc, String platformId,
			String app, String stream, String channelId, boolean tcp, boolean rtcp){
			// 默认为随机端口
			int localPort = 0;
			if (userSetting.getGbSendStreamStrict()) {
			localPort = sendRtpPortManager.getNextPort(serverItem);
			if (localPort == 0) {
			return null;
			}

			int localPort = sendRtpPortManager.getNextPort(serverItem);
			if (localPort == 0) {
			return null;
			}
			SendRtpItem sendRtpItem = new SendRtpItem();
			sendRtpItem.setIp(ip);

			@@ -170,9 +170,6 @@
			stream-on-demand: true
			# 推流鉴权，默认开启
			push-authority: true
			# 国标级联发流严格模式，严格模式会使用与sdp信息中一致的端口发流，端口共享media.rtp.port-range，这会损失一些性能，
			# 非严格模式使用随机端口发流，性能更好，默认关闭
			gb-send-stream-strict: false
			# 设备上线时是否自动同步通道
			sync-channel-on-device-online: false
			# 是否使用设备来源Ip作为回复IP，不设置则为 false

	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/all-application.yml	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史