diff --git a/bbb-voice/build.gradle b/bbb-voice/build.gradle index f58d7d1375cb..68a9cfe0b914 100755 --- a/bbb-voice/build.gradle +++ b/bbb-voice/build.gradle @@ -23,31 +23,31 @@ dependencies { providedCompile 'javax.servlet:servlet-api:2.5@jar' // Mina - providedCompile 'org.apache.mina:mina-core:2.0.15@jar' - providedCompile 'org.apache.mina:mina-integration-beans:2.0.15@jar' - providedCompile 'org.apache.mina:mina-integration-jmx:2.0.14@jar' + providedCompile 'org.apache.mina:mina-core:2.0.17@jar' + providedCompile 'org.apache.mina:mina-integration-beans:2.0.17@jar' + providedCompile 'org.apache.mina:mina-integration-jmx:2.0.17@jar' // Spring - providedCompile 'org.springframework:spring-web:4.3.3.RELEASE@jar' - providedCompile 'org.springframework:spring-beans:4.3.3.RELEASE@jar' - providedCompile 'org.springframework:spring-context:4.3.3.RELEASE@jar' - providedCompile 'org.springframework:spring-core:4.3.3.RELEASE@jar' + providedCompile 'org.springframework:spring-web:4.3.12.RELEASE@jar' + providedCompile 'org.springframework:spring-beans:4.3.12.RELEASE@jar' + providedCompile 'org.springframework:spring-context:4.3.12.RELEASE@jar' + providedCompile 'org.springframework:spring-core:4.3.12.RELEASE@jar' - providedCompile 'org.red5:red5-server:1.0.8-M13@jar' - providedCompile 'org.red5:red5-server-common:1.0.8-M13@jar' - providedCompile 'org.red5:red5-io:1.0.8-M13@jar' + providedCompile 'org.red5:red5-server:1.0.10-M5@jar' + providedCompile 'org.red5:red5-server-common:1.0.10-M5@jar' + providedCompile 'org.red5:red5-io:1.0.10-M5@jar' // Logging - providedCompile 'ch.qos.logback:logback-core:1.1.7@jar' - providedCompile 'ch.qos.logback:logback-classic:1.1.7@jar' - providedCompile 'org.slf4j:log4j-over-slf4j:1.7.21@jar' - providedCompile 'org.slf4j:jcl-over-slf4j:1.7.21@jar' - providedCompile 'org.slf4j:jul-to-slf4j:1.7.21@jar' - providedCompile 'org.slf4j:slf4j-api:1.7.21@jar' + providedCompile 'ch.qos.logback:logback-core:1.2.3@jar' + providedCompile 'ch.qos.logback:logback-classic:1.2.3@jar' + providedCompile 'org.slf4j:log4j-over-slf4j:1.7.25@jar' + providedCompile 'org.slf4j:jcl-over-slf4j:1.7.25@jar' + providedCompile 'org.slf4j:jul-to-slf4j:1.7.25@jar' + providedCompile 'org.slf4j:slf4j-api:1.7.25@jar' // Needed for the JVM shutdown hook but needs to be put into red5/lib dir. // Otherwise we get exception on aop utils class not found. - providedCompile 'org.springframework:spring-aop:4.3.3.RELEASE@jar' + providedCompile 'org.springframework:spring-aop:4.3.12.RELEASE@jar' compile 'aopalliance:aopalliance:1.0@jar' // Testing @@ -61,7 +61,7 @@ dependencies { compile 'org.apache.commons:commons-pool2:2.3' compile 'com.google.code.gson:gson:2.5' - compile 'org.apache.commons:commons-lang3:3.5' + compile 'org.apache.commons:commons-lang3:3.7' compile 'org.bigbluebutton:bbb-common-message_2.12:0.0.19-SNAPSHOT' } diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/AudioBroadcastStream.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/AudioBroadcastStream.java index 2cfc71c6fe1c..2500bf7382e9 100755 --- a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/AudioBroadcastStream.java +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/AudioBroadcastStream.java @@ -54,6 +54,7 @@ public class AudioBroadcastStream implements IBroadcastStream, IProvider, IPipeC // Codec handling stuff for frame dropping private StreamCodecInfo streamCodecInfo; private Long creationTime; + private Long startTime; public AudioBroadcastStream(String name) { publishedStreamName = name; @@ -137,6 +138,8 @@ public IScope getScope() { public void start() { log.debug("Starting AudioBroadcastStream()"); + creationTime = System.currentTimeMillis(); + startTime = creationTime; } public void stop() { @@ -205,4 +208,8 @@ public void dispatchEvent(IEvent event) { public long getCreationTime() { return creationTime != null ? creationTime : 0L; } + + public long getStartTime() { + return startTime != null ? startTime : 0L; + } } diff --git a/bbb-voice/src/main/java/org/red5/app/sip/AudioStream.java b/bbb-voice/src/main/java/org/red5/app/sip/AudioStream.java index 056c98c67d25..30734823e3f1 100755 --- a/bbb-voice/src/main/java/org/red5/app/sip/AudioStream.java +++ b/bbb-voice/src/main/java/org/red5/app/sip/AudioStream.java @@ -37,7 +37,8 @@ public class AudioStream implements IBroadcastStream, IProvider, IPipeConnection // Codec handling stuff for frame dropping private StreamCodecInfo streamCodecInfo; private Long creationTime; - + private Long startTime; + public AudioStream(String name) { publishedStreamName = name; livePipe = null; @@ -107,6 +108,8 @@ public IScope getScope() { public void start() { log.trace("start()"); + creationTime = System.currentTimeMillis(); + startTime = creationTime; } public void stop() { @@ -174,4 +177,8 @@ public void dispatchEvent(IEvent event) { public long getCreationTime() { return creationTime != null ? creationTime : 0L; } + + public long getStartTime() { + return startTime != null ? startTime : 0L; + } }