Commit dbbea7ae authored 14 years ago by Richard Alam

Merge branch 'master' into record-and-playback-feature

Conflicts:
	bigbluebutton-client/.actionScriptProperties

parents 2f69b4e4 48a66597

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

bbb-api-examples/PHP/bbb_api.php 23 additions, 36 deletions

bbb-api-examples/PHP/bbb_api.php
bbb-voice-conference/config/freeswitch/conf/dialplan/default.xml 2 additions, 3 deletions

...ce-conference/config/freeswitch/conf/dialplan/default.xml
bbb-voice-conference/config/freeswitch/conf/dialplan/public.xml 11 additions, 0 deletions

...ice-conference/config/freeswitch/conf/dialplan/public.xml
bbb-voice/build.gradle 13 additions, 1 deletion

bbb-voice/build.gradle
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/Application.java 19 additions, 0 deletions

...in/java/org/bigbluebutton/voiceconf/red5/Application.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/AudioByteData.java 14 additions, 0 deletions

...org/bigbluebutton/voiceconf/red5/media/AudioByteData.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/FlashToSipAudioStream.java 41 additions, 5 deletions

...luebutton/voiceconf/red5/media/FlashToSipAudioStream.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/RtpStreamReceiver.java 18 additions, 9 deletions

...bigbluebutton/voiceconf/red5/media/RtpStreamReceiver.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/RtpStreamReceiverListener.java 1 addition, 1 deletion

...utton/voiceconf/red5/media/RtpStreamReceiverListener.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/RtpStreamSender.java 9 additions, 10 deletions

...g/bigbluebutton/voiceconf/red5/media/RtpStreamSender.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/SipToFlashAudioStream.java 82 additions, 9 deletions

...luebutton/voiceconf/red5/media/SipToFlashAudioStream.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/net/RtpPacket.java 277 additions, 0 deletions

...org/bigbluebutton/voiceconf/red5/media/net/RtpPacket.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/net/RtpSocket.java 82 additions, 0 deletions

...org/bigbluebutton/voiceconf/red5/media/net/RtpSocket.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/transcoder/FlashToSipTranscoder.java 3 additions, 1 deletion

...voiceconf/red5/media/transcoder/FlashToSipTranscoder.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/transcoder/NellyFlashToSipTranscoderImp.java 20 additions, 12 deletions

...f/red5/media/transcoder/NellyFlashToSipTranscoderImp.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/transcoder/NellySipToFlashTranscoderImp.java 13 additions, 5 deletions

...f/red5/media/transcoder/NellySipToFlashTranscoderImp.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/transcoder/SipToFlashTranscoder.java 3 additions, 1 deletion

...voiceconf/red5/media/transcoder/SipToFlashTranscoder.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/transcoder/SpeexFlashToSipTranscoderImp.java 11 additions, 4 deletions

...f/red5/media/transcoder/SpeexFlashToSipTranscoderImp.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/transcoder/SpeexSipToFlashTranscoderImp.java 10 additions, 2 deletions

...f/red5/media/transcoder/SpeexSipToFlashTranscoderImp.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/transcoder/TranscodedAudioDataListener.java 1 addition, 1 deletion

...nf/red5/media/transcoder/TranscodedAudioDataListener.java

with 653 additions and 100 deletions

Please register or to comment