BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,457 Commits 13 Branches 260 Tags 1.1 GiB
6588537bf4
Commit Graph

412 Commits

Author SHA1 Message Date
Guilherme Augusto Dias
00d4c69f78 Fix audio processing issue 
Fix an issue that occurs on processing recordings with no audio
 2013-09-27 19:26:33 +00:00
Felipe Cecagno
32b52fefb8 start and stop recording marks are being considered in all medias (audio, video and deskshare); still needs to figure out the inconsistency when the last participant leaves the conference while it's being recorded, but couple of seconds later another participant joins the meeting; the problem is that after the last user leaves the conference, the scope is deleted so the recording flag is lost, and when the scope is created again, the recording flag has the default value, that is false; also, what should we do if the user doesn't click on the recording button? how to differentiate recordings made in a version with or without the recording button? 2013-09-25 00:34:15 -03:00
Felipe Cecagno
cf8b31591c this commit is an unfinished work; the new code that generates the audio and video files in the recording is being adapted to take into account the recording marks; the audio is done, but video and desktop sharing is still missing 2013-09-24 18:03:12 -03:00
Felipe Cecagno
aa597fe985 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into record-button-client 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
	record-and-playback/core/lib/recordandplayback.rb
	record-and-playback/core/lib/recordandplayback/generators/audio_processor.rb
	record-and-playback/core/lib/recordandplayback/generators/events.rb
	record-and-playback/core/lib/recordandplayback/generators/video.rb
	record-and-playback/presentation/scripts/publish/presentation.rb
 2013-09-24 15:03:44 -03:00
Felipe Cecagno
33d98bbff2 implemented the record button both client-side and server-side; still needs more work on the processing scripts; still needs to update the record button icons 2013-09-23 18:33:30 -03:00
Felipe Cecagno
54a34b4475 Merge branch 'record-button' of github.com:fcecagno/bigbluebutton into record-button 
Conflicts:
	record-and-playback/core/lib/recordandplayback/generators/events.rb
 2013-09-18 18:02:18 -03:00
Calvin Walton
ca9a4c2b92 Bump the max difference for audio stretch up to 5% 2013-08-26 13:33:23 -04:00
Calvin Walton
c2884bdb9d Add missing license header to edl.rb 2013-08-26 11:44:22 -04:00
Calvin Walton
42e195bbe8 Rewrite the audio/video encoding components for BigBlueButton. 
I've been working on this for a while, and it's adapted from code that
has been fairly well-tested on a wide variety of recordings. I've found
it to do a more accurate job of combining multiple webcam files, and it
should be more accurate in the audio as well.

Another key feature is that it does fewer re-encoding steps during video
processing, which should both speed it up and hopefully improve quality.
The settings on the VP8 encoder have been tuned somewhat as well.
 2013-08-26 11:20:33 -04:00
Calvin Walton
0fa60e2bc3 Use the old sox trim syntax for the version on ubuntu lucid 2013-08-15 13:36:52 -04:00
Calvin Walton
6b56c4103d Correct variable name to refer to original audio length 2013-08-15 13:34:19 -04:00
Calvin Walton
d2afbe9383 Convert timestamps to numbers for subtraction 2013-08-15 13:30:36 -04:00
Calvin Walton
acbd0e5b7e Stretch freeswitch audio to match event timing 
This helps maintain audio sync with video and events when freeswitch's
internal timing differs from red5's.
 2013-08-14 17:25:10 -04:00
Guilherme Augusto Dias
daa32dab41 Fix slicing process 
Fix events timestamp and duration
 2013-08-01 13:59:02 +00:00
Guilherme Augusto Dias
dc249bf347 Slice timeline 
Slice timeline according to START/STOP record events
 2013-07-29 16:45:56 +00:00
Calvin Walton
a5091ba3e8 RaP: Remove the ffmpeg version check, hardcode arguments for 0.11+ 
For BigBlueButton 0.81, we just require that you install ffmpeg 0.11.x
for recordings to function correctly. I'll also add a check to bbb-conf
to verify that the correct ffmpeg is available.
 2013-07-23 15:46:47 -04:00
Guilherme Augusto Dias
04ff2f2074 Slicing audio events list 
The event processing method slices the audio events list according to record events
 2013-07-18 14:53:33 +00:00
Guilherme Augusto Dias
f0a86a8ae9 Changed trim audio method 
The old audio file is kept and it's possible to set the start mark
 2013-07-18 13:41:29 +00:00
Guilherme Augusto Dias
d402f95776 Handling START/STOP record events 
Changed Events module: possible to retrieve and match record events
 2013-07-18 13:15:09 +00:00
Calvin Walton
ecfe8b7db4 RaP: Adjust the 'convert' command to make opaque images 
This forces a background colour of white on the generated png images for
slides in the slides and presentation recording formats. Fixes Issue
1588.
 2013-07-17 18:08:51 -04:00
Felipe Cecagno
6f7baabc3c starting to develop the record button using part of guga's code (https://github.com/gugat/bbb-record-button) 2013-06-17 14:23:45 -03:00
Felipe Cecagno
80a8792597 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into sync-playback 2013-07-12 22:23:52 -03:00
Gustavo Salazar
9b5e42223f Accept meeting id to create manifest.xml 2013-07-03 15:42:21 -05:00
Felipe Cecagno
e8b9ffab4d Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into sync-playback 2013-07-01 15:33:09 -03:00
Felipe Cecagno
b176ef090f fixing the incorrect handling of the last timeline event on video processing 2013-07-01 15:32:25 -03:00
Gustavo Salazar
d63fbac298 Create missing start events for webcam streams fix #1561 2013-06-20 15:45:26 -05:00
Felipe Cecagno
fea7486ae3 implemented the possibility to include the desktop sharing streams to the presentation playback; it composes the presentation video file just like the other video streams, with the difference that while the screen is being sharing, it appears as the unique video stream in the presentation video - when the presenter stops sharing his screen, the other videos populate the video display; 
also, the output video resolution is modified to the highest screen resolution shared during the conference, independently on the output video resolution set by the user; it was done to preserve the quality of the desktop sharing image; if there's no desktop sharing, the output video resolution is respected
 2013-06-14 17:50:39 -03:00
Felipe Cecagno
fda4e203f9 extracted FFMPEG_LOG_LEVEL to a module constant, and use it in all FFmpeg commands; now it's easy to increase the log level during development 2013-06-14 17:44:10 -03:00
Felipe Cecagno
8ca4e949aa modified the BigBlueButton.execute method so it can raise an exception when the command passed didn't finish successfully; you can optionally pass fail_on_error=false so it won't raise an exception 2013-06-14 17:39:29 -03:00
Felipe Cecagno
53c071ddc3 ref #1516 
Refactored the code that generates the video file used in the presentation playback. The problem with the sync of video sources was related to problems of precision inside FFmpeg (sometimes the script runs FFmpeg to trim video files, and the output video file trimmed sometimes was 3+ seconds bigger or smaller than the requested).
Also it's a little more modular, so it will be easier to expand functionality. The processing steps are more explicit now, and the logs are better now to understand the final output.
A new parameter on presentation.yml was added to enable the admin to add an offset for the audio stream - this is mainly useful when the session ran with h264, because the video takes longer for the client to encode, and then in the recording we can see the huge gap between audio and video.
 2013-06-13 17:10:52 -03:00
Gustavo Salazar
0aa1c9867c support ingest for matterhorn 1.4 2013-06-07 16:27:14 -05:00
Gustavo Salazar
4c60948ae0 Merge pull request #77 from fcecagno/fixing-video-processing 
fixing the start-stop camera events matches, so now even if there's no s...
 2013-04-28 17:40:50 -07:00
Gustavo Salazar
0166939205 use the 'Crop Box' of pdf page 2013-04-05 14:00:13 -05:00
Felipe Cecagno
213b9793a8 updating record-and-playback from master 2013-02-28 16:45:09 -03:00
Gustavo Salazar
406e467c8b set audio sample rate according to the recorded audio file 2013-02-13 14:42:23 -05:00
Felipe Cecagno
d8734f6606 fixing identation 2013-02-08 16:22:09 -02:00
Felipe Cecagno
ee1bfee1fb changed the behavior of BigBlueButton.execute so the caller can check if the execution was successfully or not 2013-02-08 16:07:52 -02:00
Felipe Cecagno
420f5c976b adding a patch waiting to be pulled on BigBlueButton master (https://github.com/bigbluebutton/bigbluebutton/pull/77) 2013-02-06 17:44:07 -02:00
Felipe Cecagno
8531534bc7 copied the entire record-and-playback module of BigBlueButton master (pre 0.81) to the v0.8 tag; the only file merged is record-and-playback/core/lib/recordandplayback.rb 2013-02-04 15:34:54 -02:00
Gilson Souza
e1207b60e4 corrected some issues 2013-02-04 13:34:00 -02:00
Gilson Souza
c7d4146c25 Adding mconf scripts to process and publish records. 2013-02-04 13:31:57 -02:00
Gustavo Salazar
c761ef0bf1 generate tail padding when processing audio 2013-01-23 12:44:20 -05:00
Felipe Cecagno
5176e508dd fixing the start-stop camera events matches, so now even if there's no stop video event, the video processing will run smoothly 2012-12-06 21:28:13 -02:00
Gustavo Salazar
5d53bdfd4a Send one video stream(webcam OR deskshare) to Matterhorn server 2012-10-24 13:40:41 -05:00
Gustavo Salazar
ac32c59029 Extract pdf page in a temp dir 2012-10-23 13:53:43 -05:00
Gustavo Salazar
f3c8477b27 Fixed frame rate in mpg file 2012-09-28 11:52:35 -05:00
Gustavo Salazar
aa3350115d Ask for ffmpeg version before using loop parameter. 2012-09-25 20:08:52 -05:00
Gustavo Salazar
2462802d54 Change ffmpeg commands to support version 0.11.2 2012-09-21 17:27:11 -05:00
Gustavo Salazar
f5ee8b6cbf Update license. 2012-09-04 16:42:13 -05:00
Markos Calderon
5bb870b385 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into add-sanity-check 2012-08-30 16:13:44 -05:00
Gustavo Salazar
a8fae3bbf9 Ask if duration of video is 0. 2012-08-28 14:38:23 -05:00
Gustavo Salazar
63c421abd5 Remove options used by libx264. 2012-08-27 17:34:08 -05:00
Felipe Cecagno
f9d7f11d63 reverted the code used to process the video for the matterhorn integration; many fixes on the video processing for the new playback format "presentation"; now it's possible to set the output video resolution for the presentation playback - it's VGA by default but could be set to HD 2012-08-27 12:41:26 -03:00
Markos Calderon
9d9bf10e81 pending changes in rap-worker 2012-08-15 19:10:29 -05:00
Gustavo Salazar
a85e8c144e Use webm for webcam in playback. 2012-08-07 16:36:52 -05: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
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
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
6c85a36005 Convert timestamp to float so when dividing the result will contain 
decimals
 2012-02-17 13:02:52 -05: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
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
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
gugat
46e6598cc3 Improve quality in images 2011-09-16 10:47:58 -07: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
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
b95d3166ca - don't process duplicate audio events 2011-09-02 15:20:36 +00: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
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
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
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
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
7f4d38b5a6 - process metdata properly and simple playback 2011-06-26 10:56:03 -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
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
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
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
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
Richard Alam
d5149a168c have metadata as attribs instead of nodes 2011-05-24 18:29:16 -04:00
Richard Alam
0c128872ea - extract metadata from events.xml and generate index.html in publish dir for simple playback 2011-05-24 18:16:54 -04:00
Richard Alam
c89cc5b777 - fix so that logs are written in /var/log/bigbluebutton/ using the ff convention 
<playback-type>-process-<meeting-id>.log
 2011-05-24 13:58:56 -04:00
Richard Alam
442e510953 - minor changes to make xml attrib names consistent 2011-05-24 13:27:32 -04:00
Richard Alam
e25d803a5a - cleanup 2011-05-22 16:42:28 -04:00
Richard Alam
6bca8db210 - rename rap to core record and playback 2011-05-22 16:02:46 -04:00