Skip to content

Commit

Permalink
- upgrade to red5 oct-10-2017
Browse files Browse the repository at this point in the history
  • Loading branch information
@ritzalam
ritzalam committed Oct 10, 2017
1 parent 66f8be6 commit ae80469
Show file tree
Hide file tree
Showing 6 changed files with 79 additions and 55 deletions.
4 changes: 2 additions & 2 deletions bbb-screenshare/app/build.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ val akkaVersion = "2.5.1"
val scalaTestV = "2.2.6"

libraryDependencies ++= {
val springVersion = "4.3.3.RELEASE"
val springVersion = "4.3.10.RELEASE"
Seq(
"com.typesafe.akka" %% "akka-actor" % akkaVersion,
"com.typesafe.akka" %% "akka-testkit" % akkaVersion % "test",
Expand All @@ -57,7 +57,7 @@ libraryDependencies ++= {
"redis.clients" % "jedis" % "2.7.2",
// "org.apache.commons" % "commons-lang3" % "3.2",
"org.apache.commons" % "commons-pool2" % "2.3",
"org.red5" % "red5-server" % "1.0.8-M13",
"org.red5" % "red5-server" % "1.0.10-M4",
"com.google.code.gson" % "gson" % "2.5",
"org.springframework" % "spring-web" % springVersion,
"org.springframework" % "spring-beans" % springVersion,
Expand Down
34 changes: 17 additions & 17 deletions bbb-video/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,32 +22,32 @@ 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.16@jar'
providedCompile 'org.apache.mina:mina-integration-beans:2.0.16@jar'
providedCompile 'org.apache.mina:mina-integration-jmx:2.0.16@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.10.RELEASE@jar'
providedCompile 'org.springframework:spring-beans:4.3.10.RELEASE@jar'
providedCompile 'org.springframework:spring-context:4.3.10.RELEASE@jar'
providedCompile 'org.springframework:spring-core:4.3.10.RELEASE@jar'

// Red5
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-M4@jar'
providedCompile 'org.red5:red5-server-common:1.0.10-M4@jar'
providedCompile 'org.red5:red5-io:1.0.10-M4@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.10.RELEASE@jar'
compile 'aopalliance:aopalliance:1.0@jar'

// Java Concurrency In Practice
Expand Down
34 changes: 17 additions & 17 deletions bbb-voice/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.16@jar'
providedCompile 'org.apache.mina:mina-integration-beans:2.0.16@jar'
providedCompile 'org.apache.mina:mina-integration-jmx:2.0.16@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.10.RELEASE@jar'
providedCompile 'org.springframework:spring-beans:4.3.10.RELEASE@jar'
providedCompile 'org.springframework:spring-context:4.3.10.RELEASE@jar'
providedCompile 'org.springframework:spring-core:4.3.10.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-M4@jar'
providedCompile 'org.red5:red5-server-common:1.0.10-M4@jar'
providedCompile 'org.red5:red5-io:1.0.10-M4@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.10.RELEASE@jar'
compile 'aopalliance:aopalliance:1.0@jar'

// Testing
Expand Down
14 changes: 13 additions & 1 deletion bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/AudioBroadcastStream.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import org.red5.server.messaging.PipeConnectionEvent;
import org.red5.server.net.rtmp.event.IRTMPEvent;
import org.red5.server.net.rtmp.event.Notify;
import org.red5.server.stream.AbstractStream;
import org.red5.server.stream.message.RTMPMessage;
import org.slf4j.Logger;
import org.red5.server.api.stream.IStreamPacket;;
Expand All @@ -54,7 +55,11 @@ public class AudioBroadcastStream implements IBroadcastStream, IProvider, IPipeC
// Codec handling stuff for frame dropping
private StreamCodecInfo streamCodecInfo;
private Long creationTime;

/**
* Timestamp the stream was started.
*/
private long startTime;

public AudioBroadcastStream(String name) {
publishedStreamName = name;
livePipe = null;
Expand Down Expand Up @@ -137,6 +142,8 @@ public IScope getScope() {

public void start() {
log.debug("Starting AudioBroadcastStream()");
// technically this would be a 'start' time
startTime = System.currentTimeMillis();
}

public void stop() {
Expand All @@ -147,6 +154,11 @@ public void onOOBControlMessage(IMessageComponent source, IPipe pipe, OOBControl
log.trace("onOOBControlMessage");
}

@Override
public long getStartTime() {
return startTime;
}

public void onPipeConnectionEvent(PipeConnectionEvent event) {
log.trace("onPipeConnectionEvent(event:{})", event);
if (event.getType() == PipeConnectionEvent.EventType.PROVIDER_CONNECT_PUSH) {
Expand Down
14 changes: 13 additions & 1 deletion bbb-voice/src/main/java/org/red5/app/sip/AudioStream.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,12 @@ public class AudioStream implements IBroadcastStream, IProvider, IPipeConnection
// Codec handling stuff for frame dropping
private StreamCodecInfo streamCodecInfo;
private Long creationTime;


/**
* Timestamp the stream was started.
*/
private long startTime;

public AudioStream(String name) {
publishedStreamName = name;
livePipe = null;
Expand Down Expand Up @@ -105,8 +110,15 @@ public IScope getScope() {
return scope;
}

@Override
public long getStartTime() {
return startTime;
}

public void start() {
log.trace("start()");
// technically this would be a 'start' time
startTime = System.currentTimeMillis();
}

public void stop() {
Expand Down
34 changes: 17 additions & 17 deletions bigbluebutton-apps/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,31 +26,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.16@jar'
providedCompile 'org.apache.mina:mina-integration-beans:2.0.16@jar'
providedCompile 'org.apache.mina:mina-integration-jmx:2.0.16@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.10.RELEASE@jar'
providedCompile 'org.springframework:spring-beans:4.3.10.RELEASE@jar'
providedCompile 'org.springframework:spring-context:4.3.10.RELEASE@jar'
providedCompile 'org.springframework:spring-core:4.3.10.RELEASE@jar'

// Red5
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-server:1.0.10-M4@jar'
providedCompile 'org.red5:red5-server-common:1.0.10-M4@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.23@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.10.RELEASE@jar'
compile 'aopalliance:aopalliance:1.0@jar'

// Testing
Expand All @@ -61,7 +61,7 @@ dependencies {
compile 'org.apache.commons:commons-pool2:2.3'

compile 'com.google.code.gson:gson:2.5'
providedCompile 'org.apache.commons:commons-lang3:3.2'
providedCompile 'org.apache.commons:commons-lang3:3.6'

compile 'org.bigbluebutton:bbb-common-message_2.12:0.0.19-SNAPSHOT'
compile 'org.bigbluebutton:bbb-apps-common_2.12:0.0.1-SNAPSHOT'
Expand Down

0 comments on commit ae80469

Please sign in to comment.