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

114 Commits

Author SHA1 Message Date
Mateus Dalepiane
85d5cb786b Merge pull request #9 from mdalepiane/ios-video-support 
iOS video support
 2015-03-18 19:10:46 -03:00
Mateus Dalepiane
d65b92fad2 Fix log level of FFmpeg and location of some logs 2015-03-18 19:07:00 -03:00
Mateus Dalepiane
122f065c05 Clean up after merge 2015-03-18 19:01:42 -03:00
Mateus Dalepiane
dabd9b2ae8 Merge branch 'ios-video-support' into mconf-live0.6.2 
Conflicts:
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
 2015-03-18 18:52:01 -03:00
Mateus Dalepiane
8ae1ab7698 Improving H263 logs 2015-03-18 17:40:12 -03:00
Mateus Dalepiane
f282180683 Launch FFmpeg when convertion is necessary 
Launch FFmpeg when a client plays a stream with stream name beginning
with "h263/". Also keep track of how many clients are listening to a
converted stream, and closes it when no longer used.
 2015-03-18 17:29:07 -03:00
Mateus Dalepiane
cd2f91d8e9 Check if video convertion is necessary 
Check whether client is trying to play a stream starting with "h263/",
this indicates that the video must be converted.
 2015-03-18 14:37:30 -03:00
Mateus Dalepiane
64cf2abdc5 Check bbb video connection parameters 
This is necessary because ffmpeg do not pass these paraemters, but
should connect anyway.
 2015-03-18 11:53:59 -03:00
Felipe Cecagno
2761c31e52 Merge branch '090-encrypted-recording' into mconf-live0.6.2 
Conflicts:
	bbb-video/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/locale/de_DE/bbbResources.properties
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-config/web/index.html
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy
 2015-01-21 18:11:56 -02:00
Richard Alam
0d44571674 - update to latest red5 with local connection ishared object fix 2015-01-13 18:08:03 +00:00
Richard Alam
fca1798868 - increase the number of log history 2015-01-08 20:21:47 +00:00
Richard Alam
7936ee3e7c - upgrade to red5 1.0.4 release 2014-12-29 10:37:35 -08:00
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