Commit Graph

42 Commits

Author SHA1 Message Date
Calvin Walton
ab1019bf14 Set up rap publish/process scripts for segments 2017-11-07 11:50:28 -05:00
Calvin Walton
0affb6a36e Make progressive archiving of media files work.
Switch to using rsync to archive video directories, with the -t option
so it'll only update modified/new files.
2017-10-30 15:04:30 -04:00
Calvin Walton
dba5cd9196 Various recording script fixes & cleanups
This is just a bundle of a few things I've been fixing up in the past
while.

= Workaround for BBB 1.1 beta deskshare timestamp bug

This is unlikely to be used, but I have the code for it, might as
well merge it in.

= Rework video tiling code for ffmpeg

Render video using the 'hstack' and 'vstack' filters rather than the
'overlay' filter. This is somewhat faster, particularly with lots of
videos.

= Etc.

- Remove usage of the streamio-ffmpeg gem.
  The video rendering code has some stuff to directly read 'ffprobe'
  output, so re-use that instead of this gem (which is kind of old and
  has issues with newer ffmpeg versions).

- Don't hardcode the deskshare video area size, pull it from the
  properties file

- Remove some code that worked around missing video end events.
  In some cases this could cause flickering or strange video issues.
  It's no longer strictly needed, the new tiling code doesn't break if
  the seekpoint is after the end of the video.
2017-08-18 15:24:54 -04:00
Pedro Beschorner Marin
719ef1377a Merge remote-tracking branch 'mconf' into merging-into-bbb-1.1
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
	bbb-video/src/main/java/org/bigbluebutton/app/video/converter/VideoRotator.java
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/resources/prod/MconfLive.html
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/BrowserCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
	bigbluebutton-config/bin/bbb-conf
	record-and-playback/core/lib/recordandplayback/generators/audio_processor.rb
	record-and-playback/core/lib/recordandplayback/generators/video.rb
	record-and-playback/core/scripts/rap-worker.rb
	record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js
	record-and-playback/presentation/scripts/process/presentation.rb
	record-and-playback/presentation/scripts/publish/presentation.rb
2017-06-07 19:31:15 +00:00
Pedro Beschorner Marin
c74cc682c4 Merge remote-tracking branch 'mconf/mconf' 2017-03-20 19:45:59 +00:00
Calvin Walton
f112be7638 Fix errors in recording scripts.
Logger was apparently imported by the matterhorn stuff ?! so move that
to the main library.

Fix a variable reference in sanity.
2016-09-03 16:08:32 -04:00
Calvin Walton
8ede6d06ee Remove a few matterhorn references that were missed. 2016-09-02 17:45:10 -04:00
Calvin Walton
b589c25831 Fix reference to deleted 'webrtc_deskshare_archiver' 2016-08-02 14:31:20 -04:00
Calvin Walton
d4e7605f42 RnP: Fix use of deprecated IO#lines in logging functions 2016-08-02 10:58:42 -04:00
Felipe Cecagno
de75b79eab changed the method of pack and unpack the encrypted format, from zip to tar, and making it by an external command instead of doing it in ruby (more efficient) 2015-12-15 16:45:22 -02:00
Felipe Cecagno
7a182e67b6 Merge branch 'feature-1734' into mconf-live0.7.3 (refs #1734) 2015-10-23 12:47:08 -02:00
Felipe Cecagno
c3c4a9c64c extracted the custom hash class to a different file, loaded by recordandplayback.rb; removed the hardcoded path to /var/bigbluebutton/published/presentation because it can change, and it's always different depending on the playback format (refs #1734) 2015-10-23 12:46:26 -02:00
Anton Georgiev
366b01fff7 webrtc deskshare work on recording scripts 2015-09-25 18:05:54 +00:00
Felipe Cecagno
ed366e6b21 Merge branch '090-recordings-size' into mconf-live0.7.3
Conflicts:
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Recording.java
2015-09-08 17:43:20 -03:00
Felipe Cecagno
32957898f6 refactored part of the bbb-0.9-recording-size code in order to include the size on the download size for mconf_encrypted and the playback size for the others; included raw_size for all available formats 2015-09-08 17:18:02 -03:00
Pedro Beschorner Marin
cbfe8b8859 Added an update script for sizes injection in old recordings metadata and some refactoring 2015-06-10 17:07:11 +00:00
Pedro Beschorner Marin
9932a4c4fe Fixing metadata.xml identation 2015-06-10 00:39:55 +00:00
Pedro Beschorner Marin
f8ff4a6725 Injecting format size in metadata.xml 2015-06-09 21:06:57 +00:00
Pedro Beschorner Marin
6ef2bf6b27 Getting playback and full meeting published sizes 2015-06-09 14:39:35 +00:00
Pedro Beschorner Marin
4225a87abd Refactoring and cleanup 2015-06-04 16:03:20 +00:00
Felipe Cecagno
8e12c909c5 Merge branch '090-encrypted-recording' into HEAD
Conflicts:
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	record-and-playback/core/Gemfile
	record-and-playback/deploy.sh
2015-01-21 15:51:29 -02:00
Felipe Cecagno
0cefee5534 now the rap scripts publish to redis pubsub (channel bigbluebutton:from-rap) when a rap phase begins and ends - it includes archive, sanity, post_archive, process, post_process, publish and post_publish; if there's more than one workflow, it should work without any modification 2014-11-12 17:28:33 -02:00
Felipe Cecagno
dd97b8f80c Merge branch 'encrypted-recording' into 090-encrypted-recording
Conflicts:
	bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2014-09-01 16:46:03 -03:00
Felipe Cecagno
9a2c605866 Merge branch 'master' into multicamera-0.81
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
2013-09-29 21:19:29 -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
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
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
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
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
c7d4146c25 Adding mconf scripts to process and publish records. 2013-02-04 13:31:57 -02: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
f5ee8b6cbf Update license. 2012-09-04 16:42:13 -05: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
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
e721dd19a1 Require open4 in recordandplayback.rb
Add open4 to Gemfile
2011-07-15 17:09:11 -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
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
6bca8db210 - rename rap to core record and playback 2011-05-22 16:02:46 -04:00