BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- move things around

Browse Source
This commit is contained in:
Richard Alam 2010-06-18 11:46:03 -04:00
parent f13384771c
commit cd5bc8c8d7
10 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/Application.java
View File

@ -3,8 +3,6 @@ package org.bigbluebutton.voiceconf.red5;
import java.text.MessageFormat;
import java.util.List;
import org.slf4j.Logger;
import org.bigbluebutton.voiceconf.sip.CallStreamFactory;
import org.bigbluebutton.voiceconf.sip.ClientConnectionManager;
import org.bigbluebutton.voiceconf.sip.PeerNotFoundException;
import org.bigbluebutton.voiceconf.sip.SipPeerManager;
import org.red5.logging.Red5LoggerFactory;

4
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/CallStreamFactory.java → bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/CallStreamFactory.java
View File

@ -1,5 +1,7 @@
package org.bigbluebutton.voiceconf.sip;
package org.bigbluebutton.voiceconf.red5;
import org.bigbluebutton.voiceconf.red5.media.CallStream;
import org.bigbluebutton.voiceconf.sip.SipConnectInfo;
import org.red5.app.sip.codecs.Codec;
import org.red5.server.api.IScope;

2
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/ClientConnection.java → bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/ClientConnection.java
View File

@ -1,4 +1,4 @@
package org.bigbluebutton.voiceconf.sip;
package org.bigbluebutton.voiceconf.red5;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.service.IServiceCapableConnection;

2
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/ClientConnectionManager.java → bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/ClientConnectionManager.java
View File

@ -1,4 +1,4 @@
package org.bigbluebutton.voiceconf.sip;
package org.bigbluebutton.voiceconf.red5;
import java.util.HashMap;
import java.util.Map;

37
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/AudioStream.java → bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/AudioBroadcastStream.java
View File

@ -47,11 +47,10 @@ import org.slf4j.Logger;
import org.red5.server.api.stream.IStreamPacket;;
public class AudioStream implements IBroadcastStream, IProvider, IPipeConnectionListener {
/** Listeners to get notified about received packets. */
private Set<IStreamListener> streamListeners = new CopyOnWriteArraySet<IStreamListener>();
final private Logger log = Red5LoggerFactory.getLogger(AudioStream.class, "sip");
public class AudioBroadcastStream implements IBroadcastStream, IProvider, IPipeConnectionListener {
final private Logger log = Red5LoggerFactory.getLogger(AudioBroadcastStream.class, "sip");
private Set<IStreamListener> streamListeners = new CopyOnWriteArraySet<IStreamListener>();
private String publishedStreamName;
private IPipe livePipe;
private IScope scope;
@ -60,10 +59,10 @@ public class AudioStream implements IBroadcastStream, IProvider, IPipeConnection
private StreamCodecInfo streamCodecInfo;
private Long creationTime;
public AudioStream(String name) {
public AudioBroadcastStream(String name) {
publishedStreamName = name;
livePipe = null;
log.trace("name: {}", name);
log.trace("publishedStreamName: {}", name);
streamCodecInfo = new StreamCodecInfo();
creationTime = null;
@ -75,7 +74,7 @@ public class AudioStream implements IBroadcastStream, IProvider, IPipeConnection
}
public Notify getMetaData() {
System.out.println("**** GETTING METADATA ******");
log.debug("**** GETTING METADATA ******");
return null;
}
@ -95,7 +94,7 @@ public class AudioStream implements IBroadcastStream, IProvider, IPipeConnection
}
public Collection<IStreamListener> getStreamListeners() {
// log.trace("getStreamListeners()");
log.trace("getStreamListeners()");
return streamListeners;
}
@ -104,8 +103,8 @@ public class AudioStream implements IBroadcastStream, IProvider, IPipeConnection
streamListeners.remove(listener);
}
public void saveAs(String filePath, boolean isAppend) throws IOException,
ResourceNotFoundException, ResourceExistException {
public void saveAs(String filePath, boolean isAppend)
throws IOException, ResourceNotFoundException, ResourceExistException {
log.trace("saveAs(filepath:{}, isAppend:{})", filePath, isAppend);
throw new Error("unimplemented method");
}
@ -154,8 +153,7 @@ public class AudioStream implements IBroadcastStream, IProvider, IPipeConnection
public void onPipeConnectionEvent(PipeConnectionEvent event) {
log.trace("onPipeConnectionEvent(event:{})", event);
switch (event.getType())
{
switch (event.getType()) {
case PipeConnectionEvent.PROVIDER_CONNECT_PUSH:
log.trace("PipeConnectionEvent.PROVIDER_CONNECT_PUSH");
System.out.println("PipeConnectionEvent.PROVIDER_CONNECT_PUSH");
@ -163,37 +161,30 @@ public class AudioStream implements IBroadcastStream, IProvider, IPipeConnection
&& (event.getParamMap() == null
|| !event.getParamMap().containsKey("record"))) {
log.trace("Creating a live pipe");
System.out.println("Creating a live pipe");
this.livePipe = (IPipe) event.getSource();
}
break;
case PipeConnectionEvent.PROVIDER_DISCONNECT:
log.trace("PipeConnectionEvent.PROVIDER_DISCONNECT");
System.out.println("PipeConnectionEvent.PROVIDER_DISCONNECT");
if (this.livePipe == event.getSource()) {
log.trace("PipeConnectionEvent.PROVIDER_DISCONNECT - this.mLivePipe = null;");
System.out.println("PipeConnectionEvent.PROVIDER_DISCONNECT - this.mLivePipe = null;");
this.livePipe = null;
}
break;
case PipeConnectionEvent.CONSUMER_CONNECT_PUSH:
log.trace("PipeConnectionEvent.CONSUMER_CONNECT_PUSH");
System.out.println("PipeConnectionEvent.CONSUMER_CONNECT_PUSH");
break;
case PipeConnectionEvent.CONSUMER_DISCONNECT:
log.trace("PipeConnectionEvent.CONSUMER_DISCONNECT");
System.out.println("PipeConnectionEvent.CONSUMER_DISCONNECT");
break;
default:
log.trace("PipeConnectionEvent default");
System.out.println("PipeConnectionEvent default");
break;
}
}
public void dispatchEvent(IEvent event) {
// log.trace("dispatchEvent(event:{})", event);
// System.out.println("dispatchEvent(event:)" + event);
log.trace("dispatchEvent(event:{})", event);
if (event instanceof IRTMPEvent) {
IRTMPEvent rtmpEvent = (IRTMPEvent) event;
if (livePipe != null) {
@ -204,14 +195,14 @@ public class AudioStream implements IBroadcastStream, IProvider, IPipeConnection
creationTime = (long)rtmpEvent.getTimestamp();
try {
// System.out.println("dispatchEvent(event:)" + event);
log.debug("dispatchEvent(event:)" + event);
livePipe.pushMessage(msg);
if (rtmpEvent instanceof IStreamPacket) {
// System.out.println("dispatchEvent(IStreamPacket:)" + event);
log.debug("dispatchEvent(IStreamPacket:)" + event);
for (IStreamListener listener : getStreamListeners()) {
try {
// System.out.println("dispatchEvent(event:)" + event);
log.debug("dispatchEvent(event:)" + event);
listener.packetReceived(this, (IStreamPacket) rtmpEvent);
} catch (Exception e) {
log.error("Error while notifying listener " + listener, e);

3
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/CallStream.java → bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/CallStream.java
View File

@ -1,8 +1,9 @@
package org.bigbluebutton.voiceconf.sip;
package org.bigbluebutton.voiceconf.red5.media;
import java.net.DatagramSocket;
import java.net.SocketException;
import org.bigbluebutton.voiceconf.sip.SipConnectInfo;
import org.red5.app.sip.codecs.Codec;
import org.red5.app.sip.codecs.SpeexCodec;
import org.red5.app.sip.stream.ListenStream;

3
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/CallAgent.java
View File

@ -6,6 +6,9 @@ import org.zoolu.sip.provider.SipProvider;
import org.zoolu.sip.header.StatusLine;
import org.zoolu.sip.message.*;
import org.zoolu.sdp.*;
import org.bigbluebutton.voiceconf.red5.CallStreamFactory;
import org.bigbluebutton.voiceconf.red5.ClientConnectionManager;
import org.bigbluebutton.voiceconf.red5.media.CallStream;
import org.red5.app.sip.codecs.Codec;
import org.red5.app.sip.codecs.CodecUtils;
import org.slf4j.Logger;

2
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipConnectInfo.java
View File

@ -1,6 +1,6 @@
package org.bigbluebutton.voiceconf.sip;
class SipConnectInfo {
public class SipConnectInfo {
private final int localPort;
private final String remoteAddr;

2
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeer.java
View File

@ -6,6 +6,8 @@ import java.util.Iterator;
import org.zoolu.sip.provider.*;
import org.zoolu.net.SocketAddress;
import org.slf4j.Logger;
import org.bigbluebutton.voiceconf.red5.CallStreamFactory;
import org.bigbluebutton.voiceconf.red5.ClientConnectionManager;
import org.red5.logging.Red5LoggerFactory;

2
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeerManager.java
View File

@ -2,6 +2,8 @@ package org.bigbluebutton.voiceconf.sip;
import org.slf4j.Logger;
import org.zoolu.sip.provider.SipStack;
import org.bigbluebutton.voiceconf.red5.CallStreamFactory;
import org.bigbluebutton.voiceconf.red5.ClientConnectionManager;
import org.red5.logging.Red5LoggerFactory;
import java.util.*;