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

217 Commits

Author SHA1 Message Date
Chad Pilkey
86da035674 move the global audio messages to the 2.0 format 2017-07-13 18:09:15 -04:00
Pedro Beschorner Marin
c74cc682c4 Merge remote-tracking branch 'mconf/mconf' 2017-03-20 19:45:59 +00:00
Richard Alam
8f6213b77d - upgrade to latest red5 2016-11-22 20:45:58 +00:00
Richard Alam
3ead2b449b - minor formatting from IDE 2016-11-22 15:59:05 +00:00
Richard Alam
9f383c9799 - do not use another thread to do the transcoding. The thread doesn't get cleaned up when the call ends 
and the thread is waiting for packet in the queue. I am noticing a lot of threads hanging around
   in Yourkit from the mem dump. Not sure if this is contributing to OOM.
 2016-11-21 20:14:47 +00:00
Pedro Beschorner Marin
e47cd67903 Merge remote-tracking branch 'mconf/mconf-live0.7.5' into merging-to-1.0 
Conflicts:
	bbb-video/build.gradle
	bbb-voice/build.gradle
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/build.xml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	deskshare/app/build.gradle
	deskshare/build.gradle
 2016-06-20 16:11:04 +00:00
kreismann
1001ea5a53 Cleaning onCallModifying 
This function is responsible for building the 200 OK to answer the REINVITE coming from Freeswitch. In our cause, we just need to use bbb-voice local sdp to answer it. To a later and permanent change, however, it's recommended to investigate the SdpTools.java. My guess is that sdpMediaProduct function is comparing the media codecs in a wrong way.
 2016-06-13 17:25:56 -03:00
kreismann
17828c35f7 bbb-voice now responds OK with local SDP 
bbb-voice was responding the Freeswitch REINVITE with 200 OK containing remote SDP and with no media description.
 2016-06-13 17:24:42 -03:00
kreismann
8e952c224d Getting bbb-voice ip to make SIP Header 
The 'From' field must contain bbb-voice IP. We were getting Freeswitch IP instead (that is ok ONLY when bbb-voice and Freeswitch share the same machine with same IP Address).
 2016-06-13 17:22:11 -03:00
Richard Alam
35d0c07cac Clean up 
Removing unused source files so we can remove jmx dependency jar.
 2016-03-31 18:53:53 +00:00
Richard Alam
52d2ed1666 - try to fix auto-reconnect for listen only users 2015-09-03 14:04:48 +00:00
Richard Alam
442461db88 - configure concurrenthashmap to not use the default 
see https://ria101.wordpress.com/2011/12/12/concurrenthashmap-avoid-a-common-misuse/
 - Noticed that Red5 became slow to response after a while and usin Yourkit saw that
   a lot of threads are blocked in GlobalAudio.getGlobalAudioStream
 2015-08-23 02:22:18 -04:00
Richard Alam
96e8fde865 - change format of logs to add timezone 2015-02-09 18:40:31 +00:00
Richard Alam
fca1798868 - increase the number of log history 2015-01-08 20:21:47 +00:00
Richard Alam
ce07751d79 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1837 2014-11-28 14:24:28 -08:00
Richard Alam
c30604bb3f Merge branch 'investigate-ping-pong-timers' into upgrade-to-red5-nov-4-2014 2014-11-12 10:59:12 -08:00
Richard Alam
b467572fdb - put sending of rtp packet to fs in another thread 2014-11-11 08:11:32 -08:00
Richard Alam
000ddbd9d7 - add more logging about the connection to red5 2014-11-07 22:09:49 +00:00
Richard Alam
bd2f709bf6 - move callback to inform client that call has ended 2014-08-28 11:06:36 -07:00
Richard Alam
8c7b1343ef - add logging to trace why disconnect callback isn't called when joining the conf using chrome 2014-08-28 11:05:45 -07:00
Richard Alam
4c636ec4c8 - reset property 2014-05-15 21:05:38 +00:00
Richard Alam
1a7af0943c - send user connected/disconnected to/from global audio message 2014-05-15 21:04:51 +00:00
Richard Alam
5dcad2c6c9 - keep track of users in listen only mode 2014-05-15 15:50:07 +00:00
Richard Alam
3f75bf0177 - cleanup 2014-05-14 20:56:54 +00:00
Felipe Cecagno
b6855a95fa looks like it's working fine now, still need more testing with a large number of users; also GLOBAL_AUDIO_7* shouldn't appear in the users window 2014-05-14 15:58:00 -03:00
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
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
Hugo Lazzari
98f8b9be4f Fixed concurrency bug that could create multiple global_audio to one conference. 2013-03-21 13:45:32 -03: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
5f0b2a7ea7 - change logging history from 30 days to 5 days...don't need that much history 2013-02-26 14:08:12 +00: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
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