BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,230 Commits 13 Branches 260 Tags 1.1 GiB
ca9fa5dc09
Commit Graph

287 Commits

Author SHA1 Message Date
Felipe Cecagno
8573537873 still working on improving the global audio code quality, trying to make it work properly, not there yet; we're probably going to create a new CallAgent for the user who listens to the global audio, because the implementation is still not straightforward 2014-05-14 14:55:08 -03:00
Felipe Cecagno
c5da1134f0 more cleanup and refactoring; global audio is still buggy - at some point it duplicates a global audio consumer internally, and when the consumer disconnects, bbb-voice sends him two disconnects, which breaks the logic inside the phone module; also, when it happens, the global audio stream is never closed anymore 2014-05-12 00:54:02 -03:00
Felipe Cecagno
eb0a56bb13 refactoring part of the global audio server-side implementation 2014-05-11 22:31:35 -03:00
Felipe Cecagno
92eac1e988 Merge branch 'global-audio' into merge-global-audio 
Most of the client implementation is going to be rewritten on next commits.
 2014-04-23 16:13:40 -03:00
Richard Alam
28e99fe05f - fix compile issue 2014-04-05 09:37:53 -07:00
Richard Alam
17868b5dba - try to upgrade to red5 1.0.2-M1. Need to fix compile and startup issues 2014-04-05 09:22:01 -07:00
Richard Alam
a939588df8 - upgrade to gradle 1.7 
STEPS
cd ~/dev/tools
wget http://services.gradle.org/distributions/gradle-1.7-bin.zip
unzip gradle-1.7-bin.zip
ln -s gradle-1.7 gradle
vi ~/.profile

export GRADLE_HOME=$HOME/dev/tools/gradle
export PATH=$PATH:$GRADLE_HOME/bin

source ~/.profile
 2013-09-17 18:10:52 +00:00
Hugo Lazzari
37d67f1854 Fixed bugs when listenOnlyMode was false, add new icons depending on listenOnlyMode 
changed joingGlobal to listenOnlyMode
Removed old debug messages
 2013-07-12 11:31:04 -03:00
Hugo Lazzari
46522fc943 Begin the global-audio with bbb 0.81 2013-07-08 10:55:53 -03:00
Richard Alam
2800c4f603 - upgrade to red5 r4643 2013-05-18 21:39:53 +00:00
Richard Alam
42afda8f5c - upgrade to red5 r4641 2013-05-14 18:47:23 +00:00
Richard Alam
67185ee9e5 - upgrade to red5 r4639 2013-05-08 19:16:43 +00:00
Hugo Lazzari
98f8b9be4f Fixed concurrency bug that could create multiple global_audio to one conference. 2013-03-21 13:45:32 -03:00
Hugo Lazzari
8be5384c1f Fixed error in field. 2013-02-06 09:08:48 -02:00
Hugo Lazzari
08312165e3 Add KeepGlobalAudioAlive to prevent freeswitch from kicking out global audio from voice conference. The time from sending the keepAlive is in milliseconds and is inside KeepGlobalAudioAlive.java 2013-02-06 08:47:24 -02:00
Richard Alam
0b902805b0 - seems like it's picking the wrong jar 2013-04-30 15:43:56 +00:00
Richard Alam
75fb9c9a09 - upgrade to red5 r4635 to get fix for RTMPT kepp alive 2013-04-30 15:11:28 +00:00
Richard Alam
607d09e7cb - upgrading to latest red5 with fix to rtmpt 2013-04-28 23:38:54 +00:00
Richard Alam
91176431ca - upgrade to red5 r4360 2013-04-28 20:11:19 +00:00
Richard Alam
dfa65a5d91 - upgrade to red5 r4628 2013-04-27 23:07:28 +00:00
Richard Alam
c706c40218 - don't drag commons lib 2013-04-26 22:54:57 +00:00
Richard Alam
c06334f24d - upgrade to red5 r4627 2013-04-26 20:59:33 +00:00
Richard Alam
0cb6721147 - upgrade to red5 r4599 2013-03-19 18:27:22 +00:00
Richard Alam
d28a7ecf02 - upgrade to red5 r4597 2013-03-18 18:05:35 +00:00
Richard Alam
02296cf267 - upgrade to red5 r4592 2013-03-11 15:00:48 +00:00
Richard Alam
e6da7afcdd - upgrade to red5 r4582 2013-03-07 19:48:03 +00:00
Richard Alam
3c53ceecec - upgrade to red5 r4581 2013-03-06 15:58:56 +00:00
Richard Alam
601afeaae3 - upgrade red5 to r4580 2013-03-04 18:12:07 +00:00
Richard Alam
eadd1e3ef0 - upgrade builds to red5 r4578 2013-03-03 12:34:25 +00:00
Richard Alam
19d2472fd0 - move logback config into resources dir so we don't need to copy it as last step in gradle war 2013-02-28 01:03:31 +00:00
Richard Alam
46a07f4eb6 - build bbb-voice and bbb-video on red5 r4573 2013-02-28 00:33:53 +00:00
Richard Alam
cc859b94f8 Merge branch 'master' into upgrade-to-red5-r4573 2013-02-26 14:48:01 +00:00
Richard Alam
5f0b2a7ea7 - change logging history from 30 days to 5 days...don't need that much history 2013-02-26 14:08:12 +00:00
Richard Alam
4838840aa5 - upgrading red5 jar 2013-02-25 20:41:50 +00:00
Richard Alam
89c6b7222a - rename config proerpty names so it's more clear on what the properties are for 2013-01-31 22:49:43 +00:00
Richard Alam
ea8488af38 Merge branch 'master' into external_freeswitch 2013-01-31 22:10:56 +00:00
Richard Alam
f70399303e - move xml header up top...otherwise, the voice app won't start 2013-01-30 19:22:13 +00:00
Markos Calderon
3858a5f146 Added license to bbb-voice 2013-01-21 14:12:44 -05:00
Hugo Lazzari
1f162d9b1c Cleaning code. 2012-12-14 09:04:31 -02:00
Hugo Lazzari
b8d43c1779 Fixed missing codec using global audio. 2012-12-12 14:42:40 -02:00
Hugo Lazzari
3d5fac5956 Global audio working on firefox and chrome. 2012-11-29 10:01:32 -02:00
alexbbb
08bb1df76f Removed forgotten hardcoding used while testing 2012-11-20 16:10:34 +01:00
Hugo Lazzari
3577641137 Server side from global audio is done. 
Now to listen from a global audio in a conference, a client must call the remote
method voiceconf.call with the parameter true. To start talking a client must call the
remote method again with the parameter false. The global stream is created
when a user join a voice conference listen to global audio. The parameter stating if a user
is listen to global audio or not is optional. The default value is false, so the
server is compatible with older clients.
 2012-11-14 10:40:43 -02:00
alexbbb
7d1da0a16d Added the configuration parameter sip.remoteserver.host to bigbluebutton-sip.properties to be able to call a remote SIP FreeSWITCH on a different port than the default 5060 2012-11-13 15:57:20 +01:00
Hugo Lazzari
0d77d9cbe8 Global Audio 2012-11-08 15:09:27 -02:00
alexbbb
c2d4415b38 Added configurable parameter sip.client.rtp-ip in bigbluebutton-sip.properties to be able to talk correctly to an external FreeSWITCH server. If everything runs locally the value of this parameter will be identical to sip.server.host. If you're connecting to an external FreeSWITCH then this parameter's value must be the IP of the BBB box and sip.server.host's value will be that of the external FreeSWITCH server. 2012-11-08 17:10:21 +01:00
Richard Alam
6ea4b78f72 - fix problem where only one user is able to join the voice conf. We are renaming the sip context which makes 
red5 not find it
 2012-09-14 15:15:11 +00:00
Richard Alam
239744713a - call super methods of Red5 application adapter 2012-09-14 15:13:29 +00:00
Richard Alam
ad35b2ab08 - upgrade to red5 r4415 2012-09-12 20:39:34 +00:00
Richard Alam
2c67f67e9c - make deskshare and voice work with latest red5 (r4406) 2012-09-04 20:20:29 +00:00
Richard Alam
420d5f13dd - try to fix why it's not working properly 2012-09-03 18:39:51 +00:00
Richard Alam
808588cb5d - try upgrading to red5 r4406 2012-09-03 17:15:46 +00:00
Richard Alam
b5b6d5f954 - update red5 to latest (r4316) 2012-04-22 15:03:43 +00:00
Richard Alam
77b443299b - don't start publishing when closing stream 2012-04-05 12:51:57 +00:00
Richard Alam
8cc18ca4ae - act as gateway. Forward call to FreeSWITCH even if not registered. 2012-03-27 15:09:46 +00:00
Richard Alam
892de246d3 - cleanup 2012-03-05 15:25:02 +00:00
Richard Alam
edc494ff97 connect to 127.0.0.1 to freeswitch 2012-03-03 10:35:50 -08:00
Richard Alam
1437374a0c - trim paramaters for sip server 2012-01-25 21:10:50 +00:00
Richard Alam
427f827ba6 - allow users with no mic to listen to audio stream 2012-01-24 21:53:52 +00:00
Richard Alam
6bf086f27b - fail fast when an attempt to join the voice conference is made but we failed to register with FS. 2012-01-09 21:51:54 +00:00
Richard Alam
e7c1d5e334 - call FS anyway even if red5 hasn't registered 2012-01-09 16:42:43 +00:00
Richard Alam
5ea0e41b2d upgrading to fixed red.jar for rtmpt 2011-11-16 21:28:09 +00:00
Richard Alam
bb86f44150 - compile with red5-r4293 
- still some errors to resolve
   - had to add aop jars in bbb-apps
   - deskshare is choking on tunneling
   - exceptions when starting red5 manually
 2011-11-04 02:07:35 +00:00
Richard Alam
b795d159f7 build bbb-voice with red5 r4293 2011-11-03 20:24:50 +00:00
Markos Calderon
0e26498b49 changed bbb-voice to use the latest version of red5 2011-10-28 13:03:41 -07:00
Richard Alam
3fa22c6909 - changing build dependencies 2011-10-19 10:34:15 -04:00
Fred Dixon
09d72242f8 Starting to add logic in bbb-conf to help debug record and playback 2011-06-26 10:42:31 -07:00
Richard Alam
75abfce102 - upgrade bbb-video and bbb-voice to red5 1.0 rc1 2011-05-04 11:03:57 -04:00
Richard Alam
14dc18e392 - add util class to dump bytes to a file...useful for debugging 2011-04-04 11:04:57 -04:00
Richard Alam
775d7fff3c - cleanup 2011-03-22 10:22:44 -04:00
Richard Alam
2e821681f0 - add check for logging 2011-03-02 01:34:15 +00:00
Richard Alam
e7a3fa690e - fix start/stop stream errors 2011-03-02 01:27:01 +00:00
Richard Alam
15459681f6 - minor cleanup and add start/stop into transcoder 
TODO:
  - cleanup logging
  - create abstract class to implement common methods that individual transcoders override
 2011-03-01 21:42:42 +00:00
yuan
a86c7e6186 Support to fix speex wideband 2011-02-28 14:49:40 +00:00
Fred Dixon
20058eb495 - Assigned values for startAudioPort=15000 and stopAudioPort=16383 in bigbluebutton-sip.properties 2011-01-10 21:12:32 -05:00
Fred Dixon
cd5c510df3 - Change value for startAudioPort and stopAudioPort to be 16384 and 32767 2011-01-10 19:19:03 -05:00
Richard Alam
a246f5452c - modify to use NIO buffer and add more documentation to transcoding process 2011-01-04 16:20:28 -05:00
Richard Alam
5941e6371e - drop packets when there is connection congestion 2011-01-04 11:47:40 -05:00
Richard Alam
bd7c7bd17f - send two of the remaining 3 packets at the same time to minimize choppy audio if we just dropped the 3 extra packets 2011-01-03 13:48:07 -05:00
Richard Alam
e49e1cc83b - use FloatBuffer to store transcoded audio 2011-01-03 12:50:06 -05:00
Richard Alam
6151a60cfc - cleanup 2010-12-15 17:05:01 -05:00
Richard Alam
71588b22de - change how we increment timestamps for audio packet 2010-12-14 15:38:09 -05:00
Richard Alam
bcd8d07b9f - change how we put timestamps into the audio packet and mark the packet as live 
that way the RTMPProtocolEncoder can filter packets and start dropping those
   that have been in the queue for long
 2010-12-07 16:09:27 -05:00
Richard Alam
a9c7605fad - change audio packet queues into pipedinput/outputstream 
- drop audio bytes if it grown larger than 1000
 2010-12-07 13:51:01 -05:00
Richard Alam
19066eb91a - null rtppacket to check garbage collection issues 2010-12-03 19:14:23 -05:00
Richard Alam
02970d2b4d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2010-12-03 18:53:06 -05:00
Richard Alam
a01541ec1c - send and receive udp packets only from the specified address 2010-12-03 18:50:50 -05:00
Scott Morris
3261a669a2 Updated some debug issues 2010-12-03 18:05:39 -05:00
Richard Alam
68f94062c1 - merge scott's fixes for voip threads 
Conflicts:
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/SipToFlashAudioStream.java
 2010-12-02 16:07:44 -05:00
Scott Morris
e0a0e510e8 Added posioning support the the audioByteData class and check to see if a posioned packet has been added to the queue. If so then stop consuming packets from the queue. This fixes the left over audio threads. 2010-12-02 12:45:53 -05:00
Richard Alam
e5f1536ae2 - add more logging on why local UDP port for audio is hanging around 2010-12-01 12:12:44 -05:00
Richard Alam
75b6f10582 - increase delay check time as we notice we are dropping too many packets when Asterisk/FreeSWITCH is on a different server 2010-11-29 10:24:42 -05:00
Richard Alam
9ba6b2e878 - add logging when FS/Asterisk is the one telling us to hangup (e.g. being kicked from the conference) 2010-11-26 14:27:06 -05:00
Richard Alam
4665abd490 - change the logs so it's a little bit clear on what the user is doing 2010-11-26 13:46:17 -05:00
Richard Alam
db8ba6cd14 - fix log format 2010-11-25 16:32:49 -05:00
Richard Alam
095f532e35 - add more info on log so we can correlate with the red5 error.log if the client dropped because of connection problems 2010-11-25 15:59:07 -05:00
Richard Alam
b456c92822 - add meaningfull logging so we can track a user when joining/leaving conference. 2010-11-25 15:38:38 -05:00
Richard Alam
c28258d1f3 - format log a little bit better so as not to flood logging when we go thourhg a lot of ports and fail 2010-11-23 17:02:29 -05:00
Richard Alam
98e950ce13 - add more debugging info 2010-11-23 14:51:19 -05:00
Richard Alam
55a10e750a - aggressively try to get a local audio port 2010-11-23 14:42:39 -05:00