From fbdad00cdb294a857f55e33b2dd92c61dc37475c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 13 十月 2020 18:55:42 +0800
Subject: [PATCH] 修复无音频通道开启通道音频后无法播放的bug 修复点播接口真的收到视频后回复
---
src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java | 34 +++++++++++-----------------------
1 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
index 6d53033..2d79839 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
@@ -3,7 +3,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
-@Configuration
+@Configuration("sipConfig")
public class SipConfig {
@Value("${sip.ip}")
@@ -12,12 +12,10 @@
Integer sipPort;
@Value("${sip.domain}")
String sipDomain;
+ @Value("${sip.id}")
+ String sipId;
@Value("${sip.password}")
String sipPassword;
- @Value("${media.ip}")
- String mediaIp;
- @Value("${media.port}")
- Integer mediaPort;
@Value("${sip.ptz.speed:50}")
Integer speed;
@@ -54,22 +52,6 @@
this.sipPassword = sipPassword;
}
- public String getMediaIp() {
- return mediaIp;
- }
-
- public void setMediaIp(String mediaIp) {
- this.mediaIp = mediaIp;
- }
-
- public Integer getMediaPort() {
- return mediaPort;
- }
-
- public void setMediaPort(Integer mediaPort) {
- this.mediaPort = mediaPort;
- }
-
public Integer getSpeed() {
return speed;
}
@@ -77,6 +59,12 @@
public void setSpeed(Integer speed) {
this.speed = speed;
}
-
-
+
+ public String getSipId() {
+ return sipId;
+ }
+
+ public void setSipId(String sipId) {
+ this.sipId = sipId;
+ }
}
--
Gitblit v1.8.0