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

439 Commits

Author SHA1 Message Date
Markos Calderon
b88fda975e deleting wrong files 2012-08-06 11:36:15 -05:00
Chad Pilkey
4c13535607 starting to make playback accessible 2012-08-03 20:10:54 +00:00
Gustavo Salazar
e523dbf9e6 Merge pull request #55 from mconf/video-playback-into-master 
Video playback
 2012-08-03 09:08:25 -07:00
Markos Calderon
2e8715988b Fix for event urls and support for https 2012-08-01 18:55:50 -05:00
Felipe Cecagno
e8dc780c37 integrated the video playback into master, but the whiteboard events playback, as well as the presentation playback, is not functional yet - it seems that the writing.js is broken on master, tried to fix it without success 2012-08-01 17:40:58 -03:00
Chad Pilkey
ad9f9ef560 added simplified chat-timeline popcorn plugin 2012-07-31 21:15:14 +00:00
Richard Alam
cbe0ee60cc - merge some new stuff 
Conflicts:
	bigbluebutton-web/.gitignore
 2012-07-29 16:06:39 +00:00
Fred Dixon
65f6318241 Fix playback race condition 2012-07-17 16:07:36 -04:00
Fred Dixon
74a28b285d First implementation of playback of all presentation events (slides, mouse, pan/zoom, and whiteboard) 2012-07-17 15:39:44 -04:00
Ajay Gopinath
938103972d Finished basis for text tool. Stil need to add identification for individual objects/add text customization/fix glitches. 2012-07-04 12:28:29 -04:00
Richard Alam
4ee4eb79cc - strip controls chars from chat messages as it fails the process of recordings 2012-05-12 23:17:38 -07:00
Richard Alam
93b274f4c8 - fix http://code.google.com/p/bigbluebutton/issues/detail?id=1087 2012-05-16 19:11:00 +00:00
Richard Alam
48a6a48773 - add support for IE by installing chrome frame for playing back recording 2012-05-14 15:18:56 +00:00
Gustavo Salazar
cc1435a84c Create .done file. 2012-05-03 20:30:49 -07:00
Gustavo Salazar
df41ce84ac Do not process for Matterhorn if webcam, audio, or desktop are not available to be processed. 2012-05-03 20:23:18 -07:00
Richard Alam
7b1ff2d4bb - add utf-8 encoding magic comment to recording ruby scripts 
http://blog.grayproductions.net/articles/understanding_m17n
 2012-05-03 18:56:01 +00:00
Gustavo Salazar
dd384d5f95 Give size to the window of recorded chat. 2012-04-27 08:33:14 -07:00
Gustavo Salazar
1e14fb69b3 Update popcorn script. 
Change message when playback is not possible.
 2012-04-23 15:10:41 -07:00
Markos Calderon
c4d866419c change date format in getRecordings for bigbluebutton 0.8 2012-03-26 13:47:35 -07:00
Fred Dixon
d2a8499719 Merge pull request #25 from gugat/issue1143 
Convert timestamp to float so when dividing the result will contain
 2012-02-27 10:44:25 -08:00
Gustavo Salazar
940f080d60 Create Matterhorn logs in their own directory. 2012-02-27 13:33:22 -05:00
Fred Dixon
24c1c69156 Added logic in build.xml to copy config.xml and join-mock.xml if not in the bigbluebutton-client source tree 2012-02-22 17:32:55 -05:00
Gustavo Salazar
6c85a36005 Convert timestamp to float so when dividing the result will contain 
decimals
 2012-02-17 13:02:52 -05:00
Markos Calderon
45aca72bc4 publish recording without slides 2012-01-30 09:39:03 -08:00
Markos Calderon
2f7a2afe9c fix for video processing in long meetings 2012-01-26 10:30:57 -08:00
Richard Alam
ef85442a1b - trim audio file when they overlap 2012-01-18 17:29:14 +00:00
Richard Alam
3659effee3 Fix http://code.google.com/p/bigbluebutton/issues/detail?id=982 
- if the length from header info is zero (corrupted header http://comments.gmane.org/gmane.comp.audio.sox/2637)
   determine length from file size and then fix the file to have proper length in header info.
 2012-01-16 21:03:04 +00:00
Markos Calderon
4a797ecdc1 Merge remote branch 'gugat/issue1106' 2012-01-06 09:17:06 -08:00
gugat
d685a5456a Return silence with lenght of the recording when there is not audio file. 2012-01-06 11:35:02 -05:00
gugat
ea2c453807 Add info log messages from each method of generators 
Add info log messages from publish script of slides. The log was empty before, was just created.
Add --check option to bbb-record. Taking same logic from bbb-conf and adding info about the failed task with each error.
 2012-01-05 17:07:34 -05:00
Markos Calderon
77f664c6bd checking dirs instead of done files 2011-12-07 13:18:21 -08:00
Markos Calderon
c95a8bc56a adding a checking in rap-worker 2011-12-06 12:22:35 -08:00
Fred Dixon
ae73711cd8 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-11-30 17:08:40 -08:00
Fred Dixon
4ab6c9e63e Removed the creation of index.html for slides (no longer needed for testing) 2011-11-30 17:08:29 -08:00
Markos Calderon
e5d511239a fixed issue 1074 2011-11-22 16:04:08 -08:00
gugat
381e120c65 Use ffmpeg to concatenate videos. Mencoder command hangs with popen. 2011-11-21 09:03:41 -08:00
Fred Dixon
a3849c9a52 Removed old comments from rap-worker.rb 2011-11-20 11:16:11 -08:00
Richard Alam
62c3b220a1 change silence limit from 10 to 60 minutes as some people join the meeting very early 
and thus prevents the recording from being processed.
 2011-11-15 10:19:12 -05:00
Markos Calderon
7b511015e2 fix for jpg images in playback 2011-11-10 08:59:41 -08:00
Fred Dixon
22c90a9ed4 Removed hard-coded URL from playback of slides 2011-10-07 13:27:48 -07:00
Marco Calderon
d91607b1d8 changes to the length 2011-09-28 12:37:26 -05:00
Fred Dixon
ccc87f0831 Temporarily disabled messages 'Skipping ... ' from record and playback scripts as they generate large log files 2011-09-27 08:49:06 -07:00
Marco Calderon
261707478b fixed recording time 2011-09-22 12:50:35 -05:00
gugat
46e6598cc3 Improve quality in images 2011-09-16 10:47:58 -07:00
gugat
175b7de6a1 ow message e when browser is IE 2011-09-12 13:29:23 -07:00
gugat
a1ce36485b Set audio file according to browser 
Copy wav file to publish repository
 2011-09-12 12:55:12 -07:00
Fred Dixon
dc1819b8ca Minor tweaks on the fotter for playback 2011-09-09 16:19:28 -07:00
Marco Calderon
2f3b0be692 fix bottom playback slide 2011-09-09 15:54:32 -05:00
Marco Calderon
423006d308 update to slides playback 2011-09-09 11:35:26 -05:00
Marco Calderon
903a503a2e updates to the slides playback 2011-09-08 19:37:42 -05:00
Richard Alam
5cb7eb6d8a - locate audio files in the process dir not in the original loc (/var/freeswitch/meetings) because 
if the admin cleans up that dir, determining recording length from file will fail.
 2011-09-08 15:43:39 +00:00
Richard Alam
162dd2226f - remove duplicate audio events 2011-09-07 20:51:07 +00:00
gugat
5f075eb9d5 Set chat to go down 2011-09-05 21:43:58 -07:00
Fred Dixon
1d9d646e36 Testing bbb-record-core with the latest version of Ruby. SystemTimer is not needed in 1.9.2 2011-09-05 12:37:34 -07:00
Fred Dixon
bae17db7a6 Small edit to playback.html (removed 'chat' as it's english specific). Keep the playback clean as a basis for customization. 2011-09-04 05:23:52 -07:00
gugat
70c8c92915 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-09-02 17:05:58 -07:00
gugat
e5849908a8 Remove float property to fix audio bar in the right of slides when doing playback 
Change comparison operator in timeline plugin
 2011-09-02 17:03:13 -07:00
Richard Alam
bf54da8be4 - remove duplicate audio events 2011-09-02 20:12:34 +00:00
Richard Alam
b59fc8d3aa - use start_record_timestamp, file, bridge to compare if 3 start events are eql? 2011-09-02 18:14:44 +00:00
Richard Alam
9921f9ef42 - make playback with chat work 2011-09-02 18:01:45 +00:00
Richard Alam
b95d3166ca - don't process duplicate audio events 2011-09-02 15:20:36 +00:00
Richard Alam
49a97e463b - update slides playback with chat 2011-09-02 13:44:35 +00:00
Fred Dixon
9efab14768 Fixed bug that prevented bbb-record from having bbb-record-core rebuilt a recording. 2011-08-31 14:45:38 -07:00
Richard Alam
0453a34767 - fix location of slides.xml 2011-08-31 19:54:32 +00:00
Richard Alam
b6bb24f00f - change size of display div 2011-08-31 15:58:36 +00:00
Richard Alam
beb4bbff9c - change css 
- remove old slides playback js scripts
 2011-08-31 14:09:59 +00:00
Richard Alam
ee3c6fbf53 - store copy of popcorn js files so playback still works even if there is no internet connection 2011-08-31 14:08:23 +00:00
Richard Alam
e9f4cc4ffb - replace slides playback with popcorn 2011-08-31 14:00:20 +00:00
Fred Dixon
5a43aba27a Ingest and processing slides.rb now logs to /var/log/bigbluebutton/slides. 2011-08-20 12:14:33 -07:00
Richard Alam
c660ab9651 - add more logging on padding issue 2011-08-18 11:01:24 -04:00
Richard Alam
9057cd79c1 -remove audio padding at the end of the recording 2011-08-18 10:46:03 -04:00
Marco Calderon
a32992946c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-08-16 08:18:09 +00:00
Marco Calderon
28ad4f6ce8 Cleanup script 2011-08-16 08:17:21 +00:00
Richard Alam
f6d7540ff5 - add some doc on why we limit length of silence file 2011-08-15 17:28:53 -04:00
Richard Alam
1c92d22b0d fix typo 2011-08-15 15:32:03 -04:00
Richard Alam
e59cb41e7f - raise exception when length of audio is 0 and when the silence is grater than 10 minutes. 2011-08-15 15:27:25 -04:00
Marco Calderon
f052b776d7 a temp solution for show the recording name 2011-08-10 14:33:04 +00:00
Richard Alam
f72589d1b7 - rename matterhorn properties and add comments 2011-08-05 18:25:44 +00:00
gugat
915acb8169 Overwrite eql? in AudioRecordingEvent class 
and use uniq! in the array start_events in the method
start_audio_recording_events
 2011-07-29 02:02:43 -05:00
Richard Alam
76dab31f61 - don't raise an exception when executing external command and some text gets printed on stderr. Just log the error and move on. 2011-08-05 16:48:19 +00:00
gugat
0593ebdc14 Avoid squished deskshare video 2011-07-24 19:17:53 -05:00
gugat
d2d711704e Fix bug while installing third party tools 2011-07-20 20:39:26 -05:00
gugat
59031812be Add logger in rap-worker.rb 2011-07-20 20:13:22 -05:00
Marco Calderon
d32110d36c api according to the latest spec 2011-06-30 02:33:12 +00:00
Richard Alam
3d3f6bbab1 - rename simple to slides 
- merge guga's work to pre-load images when playing back recording
 2011-07-21 11:58:22 -04:00
gugat
e7c78c3759 PreLoad Images in slides' playback 2011-07-20 18:19:17 -05:00
Richard Alam
c5f8aa9344 - rename simple playback to slides playback 2011-07-19 14:33:17 -04:00
Richard Alam
e97a57e813 - make imagemagick generate smaller PNG files.... 2011-07-19 11:36:03 -04:00
gugat
e721dd19a1 Require open4 in recordandplayback.rb 
Add open4 to Gemfile
 2011-07-15 17:09:11 -05:00
gugat
c56facd64c Change image presentations (gif, jpg) to png, so they will be played properly 2011-07-14 18:51:51 -05:00
gugat
89086ba54a Merge branch 'refactor' of github.com:gugat/bigbluebutton into respaldo 2011-07-14 10:30:06 -05:00
gugat
1010dc4cbf Add support for presentation images (jpg,png,gif) in simple processing 2011-07-14 09:49:26 -05:00
gugat
feeaf1bcb6 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into respaldo 2011-07-14 09:44:12 -05:00
gugat
21eed7e1d4 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into respaldo 2011-07-11 14:26:47 -05:00
Fred Dixon
76947a3cd6 use meetingID for index.html file for slides playback (this index.html file is for testing only and will soon disappear) 2011-07-10 11:33:22 -07:00
Fred Dixon
74dcf87466 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-07-10 08:38:19 -07:00
Fred Dixon
c431169bd7 Changed redis host for bigbluebutton.yml to 127.0.0.1 2011-07-10 08:38:12 -07:00
Richard Alam
8070f25bab - change permission of file so that it is readable by nginx 2011-07-10 10:32:20 -04:00
gugat
12bdbf8475 Add logi to check redis port an host 2011-07-04 20:01:41 -05:00
gugat
428dbe84f2 Create script with logic we need to add for record and playback 
Based in bbb-conf create functions to check errors in record and playback log files
 2011-06-30 21:17:01 -05:00
gugat
b247c749a8 Add log info to BigBlueButton.execute : exitstatus, succeed? , exited? 
Change IO.popen to  BigBlueButton.execute in /core/scripts/rap-worker.rb (2)
 2011-06-29 17:39:25 -05:00
gugat
1c45591583 Change BigBlueButton.execute to use Open4 2011-06-29 00:08:58 -05:00
gugat
b72e140be9 Execute mencoder command with BigBlueButton.execute in archive.rb 2011-06-28 19:35:45 +00:00
gugat
9526a5c713 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into respaldo 2011-06-28 15:34:21 +00:00
Richard Alam
41db771068 - change default matterhoen server 2011-06-26 11:17:47 -04:00
Richard Alam
7f4d38b5a6 - process metdata properly and simple playback 2011-06-26 10:56:03 -04:00
Richard Alam
15b29db03f - add playback format into metadata.xml 
- implement get recordings for a meeting id
 2011-06-22 16:35:11 -04:00
Richard Alam
d044221d70 - start implementing get recording api 2011-06-22 15:53:27 -04:00
gugat
794d419631 Substitute IO.popen by BigBlueButton.execute in presentation.rb and video.rb 2011-05-25 07:06:36 +00:00
gugat
25bb768026 Return output in BigBlueButton.execute 
Use BigBlueButton.execute in determine_length_of_audio_from_file in audio.rb
 2011-05-25 03:50:05 +00:00
gugat
9038522311 Change BigBlueButton.execute to log error properly 2011-05-25 00:43:48 +00:00
Richard Alam
ef40a1cb28 - cleanup 
- make the length of the blank video into a float instead of int. This way we hope to have
   a blank video with 8.74sec long instead of 8sec long.
 2011-06-15 12:20:10 -04:00
Richard Alam
181133ab9e - add matterhorn-install script. There is still a problme of it not starting on my machine. 2011-06-13 17:34:57 -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
1af29981fd - move the rap core god conf into default god/conf 2011-06-08 21:14:52 -04:00
Richard Alam
dfb6283e59 - don't prompt adding host to known_host 2011-06-08 20:28:12 -04:00
Richard Alam
f14085a487 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-06-08 19:40:54 -04:00
Richard Alam
2541b89464 - remove publish/matterhorn.rb as we now run it as a separate process 2011-06-08 19:40:19 -04:00
Fred Dixon
b5cd824a29 Added lsb-section to record and playback god init.d script 2011-06-08 15:28:22 -07:00
Richard Alam
e67534997b - move so that it gets built as part of bbb-record-core 2011-06-08 17:35:15 -04:00
Richard Alam
ef2eab978f - upgrade version of felix to 3.2.2 from 3.2.0 as 3.2.0 is not available anymore form the download link 2011-06-08 14:01:07 -04:00
Richard Alam
961ab6f402 - add some info on how to use matterhorn dopbox ingest feature 2011-06-08 13:55:26 -04:00
Richard Alam
8eb9f0266e - fix typo 2011-06-08 11:03:19 -04:00
Richard Alam
23c90f1af0 - put publishing to matterhorn on a different process since it needs to run as root 2011-06-08 10:57:52 -04:00
Richard Alam
f2c603c1a5 - create god scripts to manage record-and-processing script 2011-06-07 14:54:38 -04:00
Richard Alam
002460dc81 - change logic...it should publish recording when directory is NOT present 2011-06-06 16:59:55 -04:00
Richard Alam
350d71b53e - setup logger properly 2011-06-06 16:09:53 -04:00
Richard Alam
a66daaad8a - start automating publish part 2011-06-06 15:55:28 -04:00
Richard Alam
988da9b621 - fix typo and rename var 2011-06-06 15:26:46 -04:00
Richard Alam
f2b6b07112 - no need to "sudo -u tomcat6" as main script already runs as tomcat6 2011-06-06 14:58:16 -04:00
Richard Alam
9609de20a9 - run as tomcat6 user 2011-06-06 14:45:25 -04:00
Richard Alam
870acbf50e - start automating archive, ingest, publish 2011-06-06 14:42:38 -04:00
Richard Alam
87a53dce50 - archive only new recordings 2011-06-06 13:38:16 -04:00
Richard Alam
d5eaaee2b7 - ffmpeg that comes with Ubuntu 10.04 segfaults when using padbottom/top/left/right 
- need to upgrade to newest ffmpeg based on instructions in http://ubuntuforums.org/showpost.php?p=9868359&postcount=1289
 2011-06-06 12:08:05 -04:00
Richard Alam
e940b17982 - process properly matterhorn metadata 2011-06-03 12:18:54 -04:00
Richard Alam
c8e7c185b0 - simple cleanup 2011-06-03 12:18:36 -04:00
Richard Alam
6b6b5bea1f - look into recorded .done file to see if the meeting needs to be archived 2011-06-03 12:17:51 -04:00
Richard Alam
1bb6e20291 - renamed ingenst-and-processing script 
- log when saving metadata
 2011-06-03 11:15:24 -04:00
Richard Alam
92cc564d48 - change playback client url 2011-06-01 18:55:25 -04:00
Richard Alam
6d82190ba5 - paddings must be even 2011-06-01 18:27:27 -04:00
Richard Alam
d142763b58 - use pad_top/bottom/left/right options for ffmpeg that comes with Ubuntu 10.04 2011-06-01 18:16:50 -04:00
Fred Dixon
2ca6b2a541 support one slide presentation 2011-06-01 14:52:07 -07:00
Fred Dixon
2b8a054db8 Added simple.nginx to store in /etc/bigbluebutton/nginx to support multiple rewrite rules for nginx 2011-06-01 14:42:48 -07:00
Fred Dixon
05d33be6f1 Minor change to path for simple recordings 2011-06-01 14:00:21 -07:00
Richard Alam
282199e668 - publish simple recordings in /var/bigbluebutton/recordings/published/simple 2011-05-31 17:28:20 -04:00
Richard Alam
6208587706 - update SystemTimer to 1.2.3 2011-05-27 19:45:05 -04:00
Richard Alam
c7c69296f8 - scale webcams to fit 640x480 while maintaining aspect ratio 2011-05-26 09:56:59 -04:00
Richard Alam
6f314df412 - make the deskshare fit into 640x480 frame size while maintaining aspect ratio 2011-05-25 16:06:16 -04:00
Richard Alam
353b4e6868 - fix matching start and stop events 2011-05-25 13:20:03 -04:00
Richard Alam
26bf7f5344 - fix problem where event name isn't extracted from redis properly 2011-05-25 10:17:14 -04:00