BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,166 Commits 13 Branches 260 Tags 1.1 GiB
34bc824472
Commit Graph

202 Commits

Author SHA1 Message Date
Felipe Cecagno
12f7aacf4b Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-client/locale/fr_CA/bbbResources.properties
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/maps/ChatEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/model/ChatConversation.as
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
 2014-12-09 16:52:43 -02:00
Richard Alam
ce07751d79 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1837 2014-11-28 14:24:28 -08:00
Felipe Cecagno
a3acb00893 Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 
Conflicts:
	bbb-video/build.gradle
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
	bigbluebutton-config/web/default.pdf
 2014-11-22 20:28:39 -02:00
Richard Alam
000ddbd9d7 - add more logging about the connection to red5 2014-11-07 22:09:49 +00:00
Felipe Cecagno
d73af2b81a cleanup 2014-09-04 15:02:35 -03:00
Felipe Cecagno
c2eed678d9 cleanup 
Conflicts:
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
 2014-09-04 15:02:16 -03:00
Mateus Dalepiane
b8b91e39d2 Merge remote-tracking branch 'origin/multivideo-1404' into 090-multivideo 
Conflicts:
	bbb-video/build.gradle
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
 2014-08-28 18:37:28 -03:00
Richard Alam
0a718c3f38 - upgrade to latest red5 release 2014-08-14 07:19:59 -07:00
Ghazi Triki
bb09eb6d75 After checking we bumped projects version and Flex locales to 0.9.0 with some fixes 2014-08-13 12:20:10 +01:00
Ghazi Triki
9a794f854a Bumped projects version and Flex locales to 0.9 2014-08-13 10:28:08 +01:00
Ghazi Triki
ac7af7dfea Manually bumped all application version to the correct actual version 0.9.0-dev 2014-07-31 17:42:38 +01:00
Richard Alam
20bd95463c - apply https://code.google.com/p/bigbluebutton/issues/detail?id=1734 2014-07-30 12:57:47 -07:00
Mateus Dalepiane
baf9ac53e7 Fix broken commit (36f34805) 2014-07-01 18:12:20 -03:00
Mateus Dalepiane
5a68746cd3 Relay disconnection timeout is configurable now 
The timeout to close the relay after the last listener has disconnected
is no longer hard coded, and may be configured through at:
bigbluebutton-video.properties
 2014-07-01 17:59:50 -03:00
Mateus Dalepiane
36f348055b Change System.out.print to logger messages 2014-07-01 17:57:25 -03:00
Mateus Dalepiane
52502488ec Merge branch 'multivideo' into multivideo-1404 
Conflicts:
	bbb-video/build.gradle
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
 2014-06-26 16:21:25 -03:00
Mateus Dalepiane
f3fb30322b Separate class file for CustomRTMPClient 2014-06-16 14:59:54 -03:00
Mateus Dalepiane
57a442a3c1 Included timeout to close video proxy relay 
After no all subscribers disconnect from the proxy, there is a timeout to close
the proxy relay. If a user reconnects during this period the proxy is kept, and
the connection is much faster for this user.
All interaction with remoteStreams structure are now synchronized to it,
instead of synchronized methods.
 2014-06-16 12:50:54 -03:00
Mateus Dalepiane
2f9ea8b32d Fix in proxy reconnection, client reconnects 
Tested by forcing disconnections by stopping the Red5 servers with Ctrl-Z,
and restoring them after a while.
 2014-06-13 16:14:44 -03:00
Richard Alam
97262dfba5 - make recording process work 2014-06-12 12:31:24 -07:00
Richard Alam
e7dcf3c4bf - fix compile issue 2014-05-29 13:55:01 -07:00
Mateus Dalepiane
c355b2e9d4 Implementation of proxy reconnection 
Not tested: Depends on the bigbluebutton-client reconnection implementation to
be properly tesed
 2014-05-21 10:59:05 -03:00
Mateus Dalepiane
4e84687b32 Working through more than one proxy server 
A modified version of RTMP Client is being used to communicate with the next
proxy server, this client behaves like the bbb flash client. The difference is
how the client asks the server for the stream. The bbb flash client uses only
the streamname as a parameter in play(), while the red5 client also uses
timestamp and length.
 2014-05-05 14:44:50 -03:00
Mateus Dalepiane
f784f5839c Implemented synchronization during creation/playing/closing a remote stream. 
The creation, playing and closing of remote streams are now inside
synchronized methods. This is necessary because multiple threads might
try to create and/or close the same stream at the same time.
 2014-04-08 13:26:27 -03:00
Hugo Lazzari
3d47ab67b2 Removed exit bug. 2014-03-19 10:37:13 -03:00
Hugo Lazzari
8758eefa07 1) Removed video proxy 
2) Changed libs with jarjar to use 2 different servers version
3) Finished server side implementation of changes to use check docs documentation
 2014-03-06 09:33:54 -03:00
Hugo Lazzari
e29dfb84dd Finished client connection control 2014-02-26 10:30:17 -03:00
Hugo Lazzari
02f34bd51b URL connection control. Now only record on source server. 2014-02-24 10:25:00 -03:00
Hugo Lazzari
243faae445 Begin server implementation of url play pattern 2014-02-20 11:06:47 -03:00
Hugo Lazzari
595368050f Implemented video publishing, but still has stack overflow 2014-01-23 10:01:13 -02:00
Hugo Lazzari
1379f2d086 Created new red5 app, videoproxy and adapted VideoReceiver from bbb-bot using flazr. 
TO-DO:
	Adapt VideoPublisher from bot
	Logic with url.
 2014-01-21 10:42:44 -02:00
Hugo Lazzari
ce4107bf50 Begin debug to restream video data 2014-01-13 09:20:24 -02:00
Hugo Lazzari
e9960681ba Branch to multiserver video 2014-01-07 09:05:30 -02: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
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
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
0b055b1672 - fix commons-pool jar definition 2013-04-26 22:58:24 +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
Markos Calderon
ba40fcca6b Updated license for bigbluebutton-client, bbb-video, and demo 2013-01-21 16:14:55 -05:00
Fred Dixon
79cc2379d5 bbb-apps-vide now records video by default 2012-10-28 13:11:53 -04:00
Richard Alam
ad35b2ab08 - upgrade to red5 r4415 2012-09-12 20:39:34 +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
Fred Dixon
b566041eb7 Turn off recording of desktop and webcams by default 2012-02-18 14:14:08 -05:00
Richard Alam
5ea0e41b2d upgrading to fixed red.jar for rtmpt 2011-11-16 21:28:09 +00:00
Richard Alam
806d0cb6d4 build video with red5 4293 2011-11-03 20:24:26 +00:00
Richard Alam
0af93e46c6 - listen for the first webcam packet and dispatch a startWebcamEvent...this is 
required to be able to sync the video with the audio in ingest and processing.
 2011-06-29 13:36:01 -04:00
Richard Alam
c1860ac53c - add duration on StopWebcamEvent 2011-06-27 09:34:36 -04:00
Richard Alam
b49ddec9f0 - remove adding timstamp in recording filename as it screws up ingest and processing 2011-06-26 12:15:31 -04:00
Richard Alam
8ba1e6484a Merge branch 'master' into ref-bbb-web-2 
Conflicts:
	bbb-video/.gitignore
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/RedisDispatcher.java
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
	bigbluebutton-web/src/java/org/bigbluebutton/api/RedisDispatcherImp.java
 2011-06-16 14:49:57 -04:00
Richard Alam
4291dce4ae - add timestamp on filename so it will be unique 2011-06-13 16:57:37 -04:00
Richard Alam
12c5b34cea - store start and stop webcam events by sending message from video app 
instead of relying on status event
 2011-06-13 14:32:07 -04:00
Richard Alam
69da70736b - change build using gradle 
- need to add jedis plugin so we can store the start/stop broadcast event
   as the webcam status event is unreliable and can introduce sync issues.
 2011-06-13 12:25:18 -04:00
Marco Calderon
2ac6aaa09a merge remove-bbb-commons, working prototype, need to add status method to listener 2011-06-09 01:35:24 +00:00
Richard Alam
53eebfef06 - build failed.... what happens when you cut n paste...without checking 2011-06-06 13:48:23 -04:00
Richard Alam
61b927a990 - add some logging on recording webcam 2011-06-06 13:39:53 -04:00
Marco Calderon
5bbb607c5d Added redis pool, pubsub, and maven3 support to bbb-web 2011-05-17 11:04:40 +00:00
Richard Alam
dfaf403f65 - change comment as it is wrong 2011-05-16 11:24:50 -04: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
52817279a2 - add streams directory for video and deskshare apps where we store recordings 2011-03-15 15:30:29 -04:00
Richard Alam
027e8e8f9b - record video camera by setting property 2011-03-12 19:28:09 -05:00
Richard Alam
0d99f7b7b5 - add license headers to bbb-video 2010-11-06 10:24:56 -04:00
Leif Jackson
9decad03c6 Inital import of freeswitch intergration 2010-06-29 04:51:31 +00:00
Richard Alam
cbc54401de - upgrade to red5-0.91 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4052 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-29 18:19:51 +00:00
Richard Alam
3f946fe520 - upgrade to Red5 0.9 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3742 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-02-19 18:03:31 +00:00
Richard Alam
8ae5e7ab59 merge in latest from SVN and fix classpaths 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3681 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-02-08 18:34:55 +00:00
Richard Alam
99490c3404 - change logging appender to rolling file 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3077 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-07 20:12:34 +00:00
Richard Alam
0f1b226393 - make /usr/share/red5 as default for red5.home 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2834 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-05 15:29:32 +00:00
Fred Dixon
de22dd837b reverted bacy to build 1887 for 0.61 release 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2491 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-15 12:27:25 +00:00
Fred Dixon
59ca9890da updated ivysettings in bbb-apps-video 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2489 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-15 00:20:17 +00:00
Fred Dixon
15e52ce95a revert to 2404 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2488 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-15 00:00:05 +00:00
Denis Zgonjanin
a13781893c Tiling support for video module 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2406 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-09 16:30:29 +00:00
Denis Zgonjanin
b656840b13 git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2404 af16638f-c34d-0410-8cfa-b39d5352b314 2009-09-08 18:23:00 +00:00
Denis Zgonjanin
ab6f150959 one more time 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2397 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-06 22:10:07 +00:00
Denis Zgonjanin
531d80b608 jars not commited properly, trying again 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2396 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-06 22:02:00 +00:00
Denis Zgonjanin
bd62c221e5 Added needed jars 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2395 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-06 21:51:15 +00:00
Denis Zgonjanin
00778a2e41 Changed Video app to resize streams 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2394 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-06 21:18:56 +00:00
Denis Zgonjanin
2b82ed313e Forgot to enter a comment for the last commit. The commit was for the changes I have so far for the video app. I think I've found a better way to do it, so I will be deleting a lot of the code. This is just a note to know which revision all the code was in, in case I need some of the old code later 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2393 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-06 20:51:04 +00:00
Denis Zgonjanin
7817d6abed git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2392 af16638f-c34d-0410-8cfa-b39d5352b314 2009-09-06 20:49:10 +00:00
Denis Zgonjanin
8bfab13596 git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2376 af16638f-c34d-0410-8cfa-b39d5352b314 2009-09-04 20:56:19 +00:00
Richard Alam
8e944b3e83 - add lib to svn ignore 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1887 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-07-14 20:03:27 +00:00
Richard Alam
d2f07bbd51 - change application class 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1885 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-07-14 19:57:04 +00:00
Richard Alam
2f81dac41b initial import 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1884 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-07-14 19:55:12 +00:00