BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,502 Commits 13 Branches 260 Tags 1.1 GiB
31b9b495ba
Commit Graph

1474 Commits

Author SHA1 Message Date
Calvin Walton
80ceefa5ca presentation: Fix presentations which are images not pdfs 
This was broken by my earlier change to fallback the pdf filename for
really old recordings.

Rearrange the code so that the pdf logic is only used in the case when
the presentation is a pdf.
 2013-05-17 14:32:14 -04:00
Calvin Walton
366d5901a4 presentation: Support processing 0.80 rectangles and ellipses. 2013-05-17 14:29:49 -04:00
Calvin Walton
ff1e0e948a RaP: Presentation: Fix panzoom generation to handle no slides 
It's a pretty rare case, but I've seen some recorded meetings that had
no slides (not even the default pdf). Handle this without crashing.
 2013-05-14 14:11:53 -04:00
Calvin Walton
6083403631 RaP: Presentation: Support old recordings with '.pdf' in presentation name 
In some old recordings (0.80?) I've seen the default presentation pdf
located at the filename .../default.pdf/default.pdf. Support this old
location with fallback logic so the new scripts will work to reprocess
old recordings.

I've improved the error handling logic here a bit as well.
 2013-05-14 14:02:23 -04:00
Calvin Walton
a1946007a6 RaP: Presentation: Don't process audio twice when no video. 
The audio is unconditionally processed earlier in the script. Remove the
line that runs it again when there is no video in the recording.
 2013-05-14 13:59:14 -04:00
Chad Pilkey
58a718951e Fixed the ghost audio by pausing after duplication 2013-05-08 14:39:28 -07:00
Calvin Walton
4962cc713f Recording: Add a fake panzoom event if none are in the events xml 
This is required so that the 'presentation' recording format can
reprocess recordings from BigBlueButton 0.80
 2013-05-06 17:01:42 -04:00
Felipe Cecagno
31fa3ec7a1 if there's no panzoom events on the events.xml, the publish script of presentation was breaking 2013-03-04 12:52:16 -03:00
Felipe Cecagno
37c9149b85 check if the private key exists was incorrect 2013-03-04 12:51:36 -03:00
Felipe Cecagno
74c023de39 changed the playback logo to use the Mconf one, and some other stuff related to branding on the playback 2013-02-28 16:54:52 -03:00
Felipe Cecagno
213b9793a8 updating record-and-playback from master 2013-02-28 16:45:09 -03:00
Felipe Cecagno
dc27467490 check if the metadata passed in the create call is empty; raise an exception if the private key isn't found on the recording server; updated the deploy script using the ideas implemented on chef 2013-02-28 16:35:22 -03:00
Felipe Cecagno
744dfac699 fixing the xpath stuff on mconf-decrypt 2013-02-26 17:42:41 -03:00
Felipe Cecagno
650d43e0f4 only runs the decrypt script if the get_recordings_url is defined and not empty; removed the logs from the part before checking for the existence of archived/<meeting_id>.done 2013-02-22 22:20:55 -03:00
Felipe Cecagno
ccb857c7e5 fixed the nginx definition for the mconf format; 
the previous definition was making nginx load from /var/bigbluebutton/published the presentation mconf-default.pdf just because it starts with /mconf
 2013-02-22 22:19:03 -03:00
Felipe Cecagno
0afa3511ae included the fastimage gem to the record and playback Gemfile 2013-02-22 22:17:53 -03:00
Felipe Cecagno
2169dfd6b5 changed the public key metadata name to mconflb-rec-server-key to be compatible with the rest of the service 2013-02-15 14:52:58 -02:00
Felipe Cecagno
d8734f6606 fixing identation 2013-02-08 16:22:09 -02:00
Felipe Cecagno
5bb65fb5af improved the deploy script so if no parameters are passed, it will act as a recording server; if a text parameter is passed containing "mconf", the encryptor will be deployed 2013-02-08 16:12:27 -02:00
Felipe Cecagno
25c495d123 improved and tested both Mconf encryptor and decryptor 2013-02-08 16:10:28 -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
Gilson Souza
a402d10129 Merge branch 'encrypted-recording' of https://github.com/mconf/bigbluebutton into encrypted-recording 
Conflicts:
	record-and-playback/mconf/scripts/publish/mconf.rb
 2013-02-07 10:58:35 -02:00
Gilson Souza
36f497e00b solving issues 2013-02-07 10:52:50 -02:00
Felipe Cecagno
d26f25f7fb many improvements on the process and published of the encrypted format; if a public key isn't provided as metadata, the key is passed in plain text using a .txt file, otherwise a .enc file is used to store the encrypted key; fixed identation; removing all files except the published ones; handling also the files stored on /var/bigbluebutton/{meetingId} - they are now included into the zip file and will be restored on the recording server 2013-02-06 17:47:33 -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
135c8fc463 updating the record-and-playback deployment script 2013-02-04 16:42:34 -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
Felipe Cecagno
08e07fb049 cleaning up 2013-02-04 15:23:50 -02:00
Gilson Souza
2ecd0f8a99 changing publish and uncrypt files to be according to the new API specification 2013-02-04 13:34:11 -02:00
Gilson Souza
8c759146ab uncrypting files according to new xml structure 2013-02-04 13:34:10 -02:00
Gilson Souza
7fc5db4b21 changing API to add the new object download into the getrecordings XML reply 2013-02-04 13:34:05 -02:00
Gilson Souza
8dd38bc4be Changes to be according to specification 2013-02-04 13:34:03 -02:00
Gilson Souza
7a8fa905b6 Creating MD5 checksum file to publish 2013-02-04 13:34:02 -02:00
Gilson Souza
e1207b60e4 corrected some issues 2013-02-04 13:34:00 -02:00
Gilson Souza
61db8fe143 adding god-process to uncrypt/unzip files encrypted 2013-02-04 13:33:58 -02:00
Gilson Souza
c7d4146c25 Adding mconf scripts to process and publish records. 2013-02-04 13:31:57 -02:00
Gustavo Salazar
2ae224765e a log file by meeting in archive phase 2013-04-29 16:03:21 -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
Fred Dixon
cd4939d44a Modified bbb.playback.css to hide border lines 2013-04-12 21:56:28 -04:00
Gustavo Salazar
0166939205 use the 'Crop Box' of pdf page 2013-04-05 14:00:13 -05:00
Gustavo Salazar
7fe05d349f sanity check for webcam and deskshare 2013-04-04 15:08:49 -05:00
gustavo salazar
338ed2bc6c store error messages in the script log file. Fix #1281 2013-04-02 18:53:08 -05:00
gustavo salazar
93ed54795e process last 'pan and zoom' event. Fix #1451 2013-04-02 17:35:57 -05:00
gustavo salazar
25ef021b7c Fix errors in playback with IE, fix #1342 2013-04-01 18:40:01 -05:00
Chad Pilkey
7fdbcb5152 cleaned up playback.js 2013-03-24 12:30:05 -07:00
Chad Pilkey
ccecba6374 Added button to the control bar that swaps the video and presentation area in the playback 2013-03-24 12:26:53 -07:00
Gustavo Salazar
256a9dc200 set text file only when it exists 2013-02-13 17:13:55 -05:00
Gustavo Salazar
406e467c8b set audio sample rate according to the recorded audio file 2013-02-13 14:42:23 -05:00
Chad Pilkey
6bf3e1c6e5 fixed my botched playback merge from 3 months ago 2013-02-09 14:13:06 -05:00
Gustavo Salazar
cb07415807 load jquery from server 2013-02-08 16:19:15 -05:00
Richard Alam
93311e6464 Merge branch 'master' into merge-master-into-polling-module 
Conflicts:
	bigbluebutton-client/build.xml
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/src/BigBlueButton.mxml
 2013-02-04 19:34:23 +00:00
Markos Calderon
16ef060da3 Merge remote-tracking branch 'fcecagno/playback-in-time' 2013-02-04 11:04:19 -05:00
Gustavo Salazar
c761ef0bf1 generate tail padding when processing audio 2013-01-23 12:44:20 -05:00
Gustavo Salazar
d6a5b78299 accept image extensions in uppercase 2013-01-23 12:40:01 -05:00
Chad Pilkey
9df127d339 updated popcorn.js to 1.3 2012-12-08 11:14:38 -05:00
Felipe Cecagno
4ad891293c now you can specify &t=0h0m0s on the playback url so the presentation will start from there just like on youtube; also fixed the generation of thumbnails, that was not working properly 2012-12-06 21:31:48 -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
821e8c823d fix 'clear page' action in playback 2012-11-28 11:42:25 -05:00
Gustavo Salazar
8f973cd1f4 fix playback of whiteboard for slides in 'portrait' mode 2012-11-27 17:41:14 -05:00
Gustavo Salazar
99ef5f4875 Increase z-index of cursor in playback 2012-10-30 10:56:38 -05:00
Chad Pilkey
0c6e5a0632 Merge remote branch 'origin/master' into poll-access 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/core/managers/UserManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	record-and-playback/presentation/playback/presentation/acornmediaplayer/acornmediaplayer.base.css
	record-and-playback/presentation/playback/presentation/acornmediaplayer/jquery.acornmediaplayer.js
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-captions-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-captions.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-exit-fullscreen-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-exit-fullscreen.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-fullscreen-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-fullscreen.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-pause-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-pause.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-play-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-play.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-transcript-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-transcript.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume-full-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume-full.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/acorn.access.css
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/button-background-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/button-background-light.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/controls-background-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/controls-background-light.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/barebones/acorn.barebones.css
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/acorn.darkglass.css
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-caption.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-exit-fullscreen.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-fullscreen.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-pause.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-play.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-transcript.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-volume-full.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-volume.png
	record-and-playback/presentation/playback/presentation/css/bbb.playback.css
	record-and-playback/presentation/playback/presentation/playback.html
 2012-10-29 16:03:09 -04:00
Gustavo Salazar
93a1f2f2a1 Increase height of text box in playback 2012-10-26 14:15:11 -05:00
Gustavo Salazar
66e8fbbdbb Draw squares properly in the playback 2012-10-26 13:44:06 -05: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
033e76f5c4 Detect and draw circles in playback 2012-10-22 13:55:44 -05:00
Chad Pilkey
ba26a3697a fixed the firefox fullscreen bug from Issue 1345 2012-10-22 17:01:07 +00:00
Gustavo Salazar
41b9467c77 Align and wrap text 2012-10-20 15:28:20 -05:00
Gustavo Salazar
1a8d263da4 Set color in played text 2012-10-19 15:06:52 -05:00
Gustavo Salazar
d18a677bef Fix playback of straight line 2012-10-19 13:10:37 -05:00
Gustavo Salazar
46b0f56fe8 Wrap text in playback. 2012-10-19 13:09:16 -05:00
Gustavo Salazar
bc1382cf79 Merge pull request #68 from capilkey/add-seperate-playback-controls 
Add seperate playback controls
 2012-10-18 14:48:00 -07:00
Chad Pilkey
ecd09f1f2b in firefox the media can actually load before the jquery is called to add listeners. I fixed it 2012-10-18 18:42:11 +00:00
Chad Pilkey
a81800f822 alternate control theme 2012-10-16 20:02:30 +00:00
Chad Pilkey
451647baf8 fixed controls not displaying for audio source 2012-10-15 20:23:19 +00:00
Chad Pilkey
39bd72f7ce acorn controls working properly 2012-10-15 19:09:56 +00:00
Chad Pilkey
e82a3efed8 initial implementation of controls 2012-10-15 16:11:10 +00:00
Felipe Cecagno
df37f484d7 insert the scroll bar on the chat automatically instead of grow the div indefinitely; little improvement on the deploy script for the recordings 2012-10-11 13:45:14 -03:00
Chad Pilkey
abad84542d fixed new playback controls 2012-10-09 17:33:59 +00:00
Gustavo Salazar
51fe50a811 Do not play video file according to audio file. 2012-10-02 12:22:14 -05:00
Gustavo Salazar
487cf1b51f Align components in playback. 2012-10-02 09:58:27 -05:00
Chad Pilkey
0a7ab07727 Merge remote branch 'upstream/master' 
Conflicts:
	record-and-playback/presentation/playback/presentation/playback.js
 2012-10-01 21:00:32 +00: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
Chad Pilkey
14b7b5500f Merge remote branch 'upstream/master' 2012-09-24 19:01:04 +00:00
Gustavo Salazar
2462802d54 Change ffmpeg commands to support version 0.11.2 2012-09-21 17:27:11 -05:00
Chad Pilkey
97bfcbb068 Merge remote branch 'upstream/master' 
Conflicts:
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/BigBlueButton.mxml
	record-and-playback/presentation/playback/presentation/css/bbb.playback.css
	record-and-playback/presentation/playback/presentation/playback.html
	record-and-playback/presentation/playback/presentation/playback.js
 2012-09-21 21:27:23 +00:00
Gustavo Salazar
f8510d749b Always set a value to "title" in dublincore.xml 2012-09-21 15:22:23 -05:00
Chad Pilkey
a787c7c2c3 trying to implement accessibility pauses 2012-09-17 16:31:28 +00:00
Gustavo Salazar
b0cb319bf1 Set width to chat container 2012-09-16 14:38:18 -05:00
Gustavo Salazar
e2fbbef7de Remove dependency on slides scripts 2012-09-15 21:27:10 -05:00
Gustavo Salazar
79b9cf1cab Validate bounds in cursor events 2012-09-15 20:42:31 -05:00
Gustavo Salazar
5067940818 Validate bounds before drawing cursor 2012-09-15 20:40:23 -05:00
gustavo salazar
6d90e31b85 Set playback_host in bigbluebutton.yml 2012-09-10 16:12:10 -05:00
gustavo salazar
140376e084 "Audio" tag created in html. 2012-09-10 14:40:51 -05:00
Gustavo Salazar
6a8319ba9e Show chat when audio is played. 2012-09-07 17:21:00 -05:00
Chad Pilkey
969824d29b Merge remote branch 'upstream/master' 2012-09-07 18:11:18 +00:00
Gustavo Salazar
2b48e2e4cb Increase count of text shapes. 2012-09-06 16:19:51 -05:00
Gustavo Salazar
91960e5d3f Increase size of chat window when playing audio. 2012-09-06 15:36:25 -05:00
Gustavo Salazar
4a492c214a Process and draw straight lines for plaback. 2012-09-06 14:21:55 -05:00
Chad Pilkey
008b3ccf35 Merge remote branch 'upstream/master' 2012-09-06 15:37:12 +00:00
Gustavo Salazar
2517405692 Load writing.js after that audio or video are chosen. 2012-09-05 15:35:23 -05:00
Gustavo Salazar
f5ee8b6cbf Update license. 2012-09-04 16:42:13 -05:00
Gustavo Salazar
a96fbc82bc Remove processed files for matterhorn. 2012-09-04 16:20:09 -05:00
Gustavo Salazar
803be3b3be Play audio file if video was not recorded. 2012-09-04 16:14:07 -05:00
Gustavo Salazar
baaac401d6 Process triangles. 2012-09-03 20:14:29 -05:00
Chad Pilkey
35704cbdb9 Merge remote branch 'upstream/master' 2012-09-03 23:46:13 +00:00
Gustavo Salazar
20c6bb3722 Resize font of text events. 2012-08-30 18:55:15 -05:00
Gustavo Salazar
f5c2b9cdc5 Remove processed and published files. 2012-08-30 03:42:11 -05:00
Gustavo Salazar
4a0c27d6ca Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-08-30 03:28:18 -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
85d66d5203 Use the event "ModifyTextEvent" to draw text. 2012-08-29 23:29:11 -05:00
Gustavo Salazar
eeca99f294 Get dataPoints for every event of "AddShapeEvent". 2012-08-29 16:05:44 -05:00
Gustavo Salazar
a8fae3bbf9 Ask if duration of video is 0. 2012-08-28 14:38:23 -05:00
Gustavo Salazar
27dd7da721 Get attributes according to the type of event. 2012-08-28 14:31:14 -05:00
Gustavo Salazar
63c421abd5 Remove options used by libx264. 2012-08-27 17:34:08 -05:00
Felipe Cecagno
96d4037ab0 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2012-08-27 16:23:59 -03:00
Felipe Cecagno
7be21e5e53 only copies the slides text files if they exist; this is to keep the script compatible with old recordings 2012-08-27 16:23:12 -03:00
Gustavo Salazar
efc52ca936 Merge pull request #60 from mconf/master 
Video file generation for presentation playback format
 2012-08-27 09:18:42 -07: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
Fred Dixon
347f0be656 Display initial slides correctly 2012-08-27 09:10:45 -04:00
Fred Dixon
3c70cf500b Fixed syntax error for path to presenttion folder 2012-08-21 19:08:48 -04:00
Fred Dixon
bd16b27667 Removed execute permissions from slides.yml 2012-08-21 19:04:29 -04:00
Markos Calderon
0c9e45682e added failed status 2012-08-21 16:55:41 -05:00
Chad Pilkey
f81849ae4f added third party presentation playback controls (acornmediaplayer) 2012-08-21 16:44:54 +00:00
Markos Calderon
d75ca5dca4 finish testing of sanity check 2012-08-20 18:12:58 -05:00
Fred Dixon
ee29a96b6a changed logging for publish/preentation.rb to /var/log/bigbluebutton/presenetation/publish-* 2012-08-19 17:20:15 -04:00
Fred Dixon
f2f75067ec Changed logging for presentation.rb to /var/log/bigbluebutton/presentation/ 2012-08-19 17:17:11 -04:00
Markos Calderon
9d9bf10e81 pending changes in rap-worker 2012-08-15 19:10:29 -05:00
Markos Calderon
7fb265e756 adding sanity check 2012-08-13 15:22:53 -05:00
Chad Pilkey
599f16863d chat, slides, and thumbnails are all accessible now 2012-08-10 19:31:36 +00:00
Chad Pilkey
52371cf10a Merge remote branch 'upstream/master' 2012-08-08 14:22:57 +00:00
Gustavo Salazar
a85e8c144e Use webm for webcam in playback. 2012-08-07 16:36:52 -05:00
Chad Pilkey
cfd3446123 Merge remote branch 'upstream/master' 
Conflicts:
	README
	bigbluebutton-client/.gitignore
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
 2012-08-07 19:56:23 +00:00
Gustavo Salazar
a25a5710a1 Change id of video recording. 2012-08-07 13:16:02 -05:00
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
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
52462ebdbf - modify simple playback client 2011-05-24 13:07:08 -04:00
Richard Alam
758156e64f - cleanup simple playback 2011-05-24 12:56:01 -04:00
Richard Alam
705f849a64 - make script dir part of core instead of separate bin dir for easier triggering of build/packaging of bbb-record-core package 2011-05-22 17:10:22 -04:00
Richard Alam
e25d803a5a - cleanup 2011-05-22 16:42:28 -04:00
Richard Alam
aa1708c1c2 - change paths to locate bigbluebutton.yml and the core/lib directory 2011-05-22 16:41:44 -04:00
Richard Alam
a1c956ff0b - accidentally renamed simple.rb to process.rb 2011-05-22 16:23:15 -04:00
Richard Alam
60a03364ee move this around to separate simple, matterhorn, and core rec-and-playback for packaging 2011-05-22 16:21:29 -04:00
Richard Alam
6bca8db210 - rename rap to core record and playback 2011-05-22 16:02:46 -04:00
Richard Alam
5078dcdb93 - change playback-client-js to simple playback 2011-05-22 16:02:00 -04:00
Richard Alam
491e2af437 - cleanup and move webminer into labs 2011-05-22 15:59:33 -04:00
Richard Alam
78f71ccc45 - remove playback-web 2011-05-22 14:48:26 -04:00
Richard Alam
7fcbc49a2e - cleanup 2011-05-22 14:39:36 -04:00
Richard Alam
01fb6a1c9b - cleanup 2011-05-22 14:25:19 -04:00
Richard Alam
1b5e8c196e - extract webcam and desktop sharing processing from spec into video.rb 2011-05-22 13:28:37 -04:00
Richard Alam
d1413a26e9 Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2011-05-22 11:52:42 -04:00
Richard Alam
83cc233ac4 - rename master.rb to archive.rb 2011-05-22 11:52:17 -04:00
Richard Alam
98dd37199d - refactor to easily test 2011-05-22 01:03:00 +00:00
Richard Alam
9d448738b2 - pad video properly when video is portrait or landscape...need to create tests for these 2011-05-21 20:13:33 +00:00
Richard Alam
3b9abd43bf - scale deskshare videos to 640x480...need more work to handle different cases 2011-05-20 17:53:51 -04:00
Richard Alam
0f9c0f07c7 - process multiple deskshare files 2011-05-19 15:21:29 -04:00
Richard Alam
28c7c48833 - process multiple raw webcam files 2011-05-19 12:33:18 -04:00
Richard Alam
13c84f4c28 - change start and stop webcam event to new format 2011-05-19 11:10:28 -04:00
Richard Alam
87463698cb - modify webcam sharing xml format 2011-05-17 17:23:14 -04:00
Richard Alam
52aee62366 - there seems to be a problem with using popen3 when the pdf conversion runs into a problem. IO.popen is more tolerant of errors. 2011-05-17 11:06:02 -04:00
Richard Alam
001fcb6feb - an example recording with multiple raw webcam and deskshare files 2011-05-16 13:02:57 -04:00
Richard Alam
8335c4df52 - cleanup and start logging into /var/log/bigbluebutton 2011-05-16 11:22:11 -04:00
Richard Alam
7aa0cf4835 - write simple script to look for the recorded <meeting-id>.done file and archive->process->publish it 2011-05-13 17:45:59 -04:00
Richard Alam
e9f9079827 - add script to query matterhorn for status on ingest and processing 
- add sample cron script to process matterhorn
 2011-05-13 15:01:11 -04:00
Richard Alam
d31cb4d258 - publish smple playback 2011-05-13 13:36:53 -04:00
Richard Alam
92ab5e6ecf - publish simple playback to a directory 2011-05-13 13:35:23 -04:00
Richard Alam
b60952917a - change from popen to open3 for executing external commnds 2011-05-13 13:34:31 -04:00
Richard Alam
97ba7e3510 - remove some files we don't need 
- break down properties file for bbb core and matterhorn
 2011-05-12 11:58:48 -04:00
Richard Alam
83d681262a - publish to matterhorn by scp'ing to matterhorn's inbox to trigger ingest and processing 2011-05-12 11:29:59 -04:00
Richard Alam
22204336b5 - process deskstop sharing (still assumes there is only one raw media) 2011-05-11 18:08:43 -04:00
Richard Alam
2fb51af979 - change "name" to "eventname" in events.xml 
- processing for matterhonr now works (except it assumes there is only one raw media for webcam and deskshare)
 2011-05-11 17:45:45 -04:00
Richard Alam
64c6579f2f - can now run archiver script to archive raw recordings for events, audio, webcam, presentation, and deskhare 2011-05-11 13:52:39 -04:00
Richard Alam
62f40fcf1e - complete recording with presentation, events, deskshare, audio, webcam 
- will be used to write testcases
 2011-05-11 13:48:23 -04:00
Richard Alam
f2f6e44f37 - process video by creating fillers and concating them 2011-05-11 10:13:52 -04:00
Richard Alam
5eb474be51 - write tests to process webcam video 2011-05-10 20:17:57 +00:00
Richard Alam
b2ba4dbd9f - get start and stop events for deskshare and webcam 2011-05-10 18:28:46 +00:00
Richard Alam
d9a3ac986b - add tests for presentation simple playback 2011-05-10 16:31:49 +00:00
Richard Alam
591dcc8919 - process presentation for simple playback 2011-05-09 18:50:54 -04:00
Richard Alam
1e1dd4918d - put all archive steps in master.rb 
- add rescue and log when archiving fails
 2011-05-09 17:24:41 -04:00
Richard Alam
7cc30ca49b - put audio processor under BigBlueButton module 2011-05-09 14:46:05 -04:00
Richard Alam
bd1b93df2b - remane audio archiver file 2011-05-09 14:24:15 -04:00
Richard Alam
0d2fbaebbf - separate each media into each own file and cleanup 2011-05-09 14:20:35 -04:00
Richard Alam
6337713fb8 - move things a bit and add Guga's Open3.popen3 method 2011-05-06 17:26:22 -04:00
Richard Alam
be757afc87 - add link to thin doc 2011-05-03 17:31:52 -04:00
Richard Alam
e0452bb372 - cleanup 2011-05-03 17:31:27 -04:00
Richard Alam
74b8d98fe6 - cleanup 2011-05-03 11:53:38 -04:00
Richard Alam
9863ecf45a - cleanup unneeded dirs 2011-05-03 11:51:56 -04:00
Richard Alam
6dc0a0aa89 - move the matterhorn webapp 2011-05-03 11:50:05 -04:00
Richard Alam
5c1815504d - cleanup 2011-05-03 10:33:40 -04:00
Marco Calderon
f72fed1566 added bundle.setup and metadata to sinatra app 2011-04-29 09:10:59 +00:00
Richard Alam
6dd49331dc - script to concatenate deskshare 2011-04-29 16:50:24 -04:00
Richard Alam
948ade0773 Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2011-04-29 12:36:37 -04:00
Marco Calderon
ffa2a48d21 fixing proxy pass for the matterhorn sinatra app 2011-04-28 23:20:23 +00:00
Marco Calderon
48029bf469 update thin instructions and layout 2011-04-28 20:28:33 +00:00
Gustavo Salazar
5eaee6af6c Add Matterhorn1.1 installation steps 2011-04-27 00:51:24 +00:00
Richard Alam
c90e9ae19a - add way to do logging 2011-04-26 16:38:10 -04:00
Richard Alam
d244105867 - create cucumber step to test video processing 2011-04-26 12:11:53 -04:00
Richard Alam
2b665ecb50 - add presentation processing 2011-04-26 12:04:52 -04:00
Richard Alam
58f51268a7 - process video and presentation 2011-04-25 17:04:10 -04:00
Richard Alam
02b5c9f773 - add logger 2011-04-25 15:29:33 -04:00
Richard Alam
dd66bd9d1a Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2011-04-25 14:10:00 -04:00
Richard Alam
4ed3cda5d8 - fix paths so we can run the script without failing on "require" 
should run scripts in the script dir (i.e. script> ruby archive/master.rb)
 2011-04-25 14:06:32 -04:00
Richard Alam
a30e0b0926 - add Process.wait so that external commands are processed sequentially 2011-04-24 22:12:50 +00:00
Richard Alam
8c99450dda - process video recording for matterhorn 2011-04-24 21:44:19 +00:00
Marco Calderon
532314751f Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2011-03-27 22:16:29 +00:00
Richard Alam
63e69a9ef2 - setup record and playback scripts in a directory layout convention. This convention makes it easy to extend the 
different steps it takes to process the recorded meeting through the different phases. Having a convention also
   allows us to add more ways of creating different playback outputs in the future.
 2011-04-20 14:34:15 -04:00
Richard Alam
9bb96f4131 - experiment with running scripts in a directory 2011-04-17 13:59:13 +00:00
Richard Alam
65d6e61890 - call the ruby scripts from bbb-web 2011-04-15 18:19:51 -04:00
Richard Alam
d1ac451fd3 - add process matterhorn recording script 2011-04-15 16:44:30 -04:00
Richard Alam
b9e6c42e5d - add archiver script that reads properties from a yaml file 2011-04-15 15:34:28 -04:00
Richard Alam
76814ea561 - add trollop gem 2011-04-15 14:31:38 -04:00
Richard Alam
f84f682d9e - add upload to matterhorn method 2011-04-15 13:38:28 -04:00
Richard Alam
3986864e49 - recording sample with webcam flv file that can be processed by ffmpeg 
- need to upgrade to latest Red5 to make this work
 2011-04-15 11:43:53 -04:00
Marco Calderon
7deb164175 adding nginx proxy pass to matterhorn app 2011-03-27 22:14:37 +00:00
Marco Calderon
0620e11a51 adding a couple of things for matterhorn 2011-03-27 09:42:59 +00:00
Richard Alam
c6dfd54717 - strip out the path of media from manifest.xml 2011-04-13 17:58:09 -04:00
Richard Alam
f605fe5e6a - process matterhorn 2011-04-13 17:16:20 -04:00
Richard Alam
cc91fb41b1 - new resources for matterhorn recording 
- problem with the webcam which chokes ffmpeg and cuts the resulting video file
 2011-04-13 17:15:26 -04:00
Richard Alam
446a2d8216 - add ruby zip and curl/curb gems 2011-04-13 17:14:49 -04:00
Richard Alam
e40ec9840a - add mime-types gem 2011-04-13 10:36:01 -04:00
Richard Alam
d7b6358933 Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2011-04-13 02:31:31 +00:00
Richard Alam
0c164b90ff - cleanup, formatting, and rearranging processing of matterhorn artifacts 2011-04-13 01:40:33 +00:00
Richard Alam
5a7a7f8792 - process matterhorn media 2011-04-13 00:59:52 +00:00
Marco Calderon
591add6966 using sinatra as middleware and added logger 2011-03-27 05:57:42 +00:00
Marco Calderon
1b183754ca Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2011-03-27 01:17:30 +00:00
Richard Alam
fd11cb249b - process matterhorn recordings 2011-04-11 18:02:24 -04:00
Richard Alam
c1af26fa65 - change path so we can run script from command line 2011-04-11 17:07:49 -04:00
Richard Alam
3f47a84a17 - process audio recordings 2011-04-11 16:46:52 -04:00
Richard Alam
ca837285c1 - consolidate Audio and AudioEvents classes 2011-04-11 11:09:44 -04:00
Richard Alam
3d5c4e244d - store audio events into xml 2011-04-10 17:51:58 +00:00
Richard Alam
9836b902a3 - fix rspec tests 2011-04-10 16:58:53 +00:00
Richard Alam
9a252b7cc0 - archive raw recordings 2011-04-10 16:48:49 +00:00
Richard Alam
bcb50bdf51 - cleanup 2011-04-10 15:06:33 +00:00
Richard Alam
d831369188 - generated sorted audio events 2011-04-08 21:12:56 +00:00
Richard Alam
1702710ce1 - generate audio paddng 2011-04-08 20:33:22 +00:00
Richard Alam
b27e36755c - implement and add tests to handle unmatched audio events 2011-04-08 19:41:57 +00:00
Richard Alam
66767d6754 - rearrange test fixtures 2011-04-08 19:40:50 +00:00
Richard Alam
ab32a54d92 - add more event processing 2011-04-08 18:44:44 -04:00
Richard Alam
f4f41afc18 - change events to recording tag 2011-04-08 16:52:53 -04:00
Richard Alam
05f6e85c34 - get events from redis and store 2011-04-08 16:48:11 -04:00
Richard Alam
acc09414dd - put Guga's script into version control 2011-04-08 16:33:58 -04:00
Richard Alam
d291745248 - start getting events from redis 2011-04-07 17:48:44 -04:00
Richard Alam
11f9844c35 Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2011-04-06 13:57:18 -04:00
Richard Alam
e56b3185e4 - new fixtures for matterhorn recording 
- write some cukes tests
 2011-04-06 13:56:28 -04:00
Richard Alam
e534a3c56d - cleanup and add tests 2011-04-05 17:30:03 -04:00
Richard Alam
d24cf648af Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2011-04-05 16:17:41 -04:00
Richard Alam
11123423b1 - add rspec tests to audio generator 2011-04-05 16:17:16 -04:00
Richard Alam
a81f4e4eaa - parse audio length from sox stat result 2011-04-05 12:14:14 -04:00
Richard Alam
1b00d0a95f - add streamio-ffmpeg gem 2011-04-05 12:13:44 -04:00
Richard Alam
1fad16f73c - add scripts to create dublin-core.xml and manifest.xml 2011-04-05 10:34:44 -04:00
Richard Alam
2d81b95556 - process audio recording events 2011-04-04 18:03:53 -04:00
Richard Alam
5e99acd8d7 - use the passed in sampling rate to generate silence 2011-04-04 11:03:39 -04:00
Richard Alam
b01211d8f2 Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 
Conflicts:
	record-and-playback/rap/lib/recordandplayback/collectors/audio.rb
 2011-04-04 09:12:08 -04:00
Richard Alam
c5526c1df3 - add video collector 2011-04-04 09:07:59 -04:00
Richard Alam
6237913c44 - match start and stop events 2011-04-04 01:28:29 +00:00
Richard Alam
b93e3d9892 - parse events.xml 2011-04-03 23:19:32 +00:00
Richard Alam
b15b209320 - convert some of the python scripts to ruby 2011-04-02 17:29:04 +00:00
Richard Alam
520040e890 - add collectors for presentation and deskshare...need to be DRYer 2011-04-02 14:16:13 +00:00
Richard Alam
1f0cf9d23e - add video stream collector 2011-04-01 17:27:32 -04:00
Richard Alam
2ba47e1d17 - stub out file actions in audio collect rspec step 2011-04-01 14:01:41 -04:00
Richard Alam
a155a0c6c3 - modify rspec test 2011-03-31 16:13:27 -04:00
Richard Alam
8e7a1836cb - rename archiver_audio.rb to audio_collector.rb 2011-03-31 10:30:01 -04:00
Richard Alam
03eb374938 - copy example resqueu app. We'll use this as the base where we can send record processing jobs. 2011-03-30 17:12:52 -04:00
Richard Alam
adf7ee56fa - add resque gem 2011-03-30 15:45:30 -04:00
Richard Alam
e8f95d9436 - add some raw recordings we can use for unit testing 2011-03-30 14:34:42 -04:00
Marco Calderon
de0b9ed39f Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2011-03-28 02:36:47 +00:00
Marco Calderon
c29dc34e00 added redis support to matterhorn app 2011-03-28 02:35:24 +00:00
Marco Calderon
f30ab7d6b5 matterhorn sinatra app 2011-03-28 00:10:13 +00:00
Marco Calderon
39f10baf17 added bigbluebutton-ruby-api gem 2011-03-27 01:15:19 +00:00
Marco Calderon
58b0530f17 added ruby script for concat videos 2011-03-23 04:16:00 +00:00
Richard Alam
60d5362627 - add nokogiri gem 2011-02-28 16:25:01 -05:00
Richard Alam
c0462031ce - add redis-rb client into Gemfile 2011-02-28 16:01:16 -05:00
Richard Alam
df77f0f8e8 - cleanup 2011-02-26 15:33:47 -05:00
Richard Alam
732edcee31 - testing out cucumber and rspec 2011-02-25 18:03:39 -05:00
Richard Alam
c1bbc382a6 - add title into index.html and pass in playback host 2011-02-16 17:50:01 -05:00
Richard Alam
5f535d386f - make location of scripts configurable and playback url 2011-02-16 17:48:30 -05:00
Richard Alam
6b2eb72933 - add meeting title into event.xml. Later on we can add more metadata about the meeting (e.g. course, prof., etc.) 2011-02-16 17:47:10 -05:00
Richard Alam
7dbc32c9a6 - generate a higher quality png image 2011-02-16 17:46:30 -05:00
Richard Alam
f3bcc572fa - fix so that it displays the last slide 2011-02-16 17:45:25 -05:00
Richard Alam
1e27b3e1fe - generate index.html of recorded meetings 2011-02-14 14:23:56 -05:00
Richard Alam
53517feb90 - modify scripts to be called from bbb-web 2011-02-11 15:34:37 -05:00
Richard Alam
f2ed78bf70 - add more comments 2011-02-09 11:02:21 -05:00
Richard Alam
bb4265e2eb - add pulish script which take a processed recording and move it to the recordings directory 2011-02-09 10:47:27 -05:00
Richard Alam
2ec0b64bbf - a little bit of cleanup 2011-02-08 15:04:47 -05:00
Richard Alam
0a655b7cbc - refactor audio processing scripts. Handle failures properly. Create xml info file for audio recordings. 2011-02-08 14:20:16 -05:00
Richard Alam
eb367392d4 - start handling failure conditions when processing audio 2011-02-07 17:37:53 -05:00
Richard Alam
b8a8722d03 - refactor script to make it understandable 2011-02-07 14:40:40 -05:00
Richard Alam
4e12c542ae - wrap up other scripts with ingestandproc.py script 2011-02-04 16:18:04 -05:00
Richard Alam
b9c8f36f83 - scripts to process record and playback 2011-02-04 11:22:16 -05:00
Richard Alam
38af89450e - changed to handle new event names 
- modified so that it handles multiple presentations properly
 2011-02-02 11:41:31 -05:00
Richard Alam
346a1fc47b - can now create audio files automatically 
- need to handle failure conditions
 2011-02-01 12:30:19 -05:00
Richard Alam
76baeaf090 - remove audio files 
- commit script to do ingest (not complete yet)
 2011-01-31 16:57:10 -05:00
deniszgonjanin
7988931593 Deleted old Flash-based playback client 2011-01-25 02:57:00 +00:00
deniszgonjanin
aafb098700 Minor changes to the playback client to show the BBB logo at the start 2011-01-25 02:55:29 +00:00
deniszgonjanin
5f74073965 Playback for slides and audio, for xml events. 2011-01-20 08:22:46 +00:00
deniszgonjanin
bda1776772 Changes to the generateAudio script to generate .ogg files instead of .mp3 2011-01-19 06:13:35 +00:00
BigBlueButton
ebd60d8695 Script to generate PNGs from slides for record and playback 2011-01-19 05:12:38 +00:00
Richard Alam
0a36dc8f37 - upgrade bbb-commons to 0.8 2011-01-14 02:25:24 -05:00
Richard Alam
1115986cd3 - just formatting changes 2011-01-12 10:18:01 -05:00
@deniszgonjanin
1edb303d39 Created a script to automatically generate an audio file of the same length as the conference. Should be easily convertible to a script we can use to pad the beginning and end of audio files generated by asterisk/freeswitch. 2010-12-28 11:05:28 +00:00
Marco Calderon
346ae2db39 add xml stream to playback web 2010-11-19 08:15:29 +00:00
Marco Calderon
71630e8482 Demo page for playback web 2010-11-10 09:27:18 +00:00
Marco Calderon
e5021abe91 changes to playback client and web 2010-11-10 05:51:09 +00:00
Marco Calderon
d186288749 added record conference call to BBB API 2010-10-24 08:59:23 +00:00
Marco Calderon
4fed45a444 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2010-10-14 17:03:04 +00:00
Marco Calderon
828d1766d6 Support for record directly in files 2010-10-04 23:23:26 +00:00
deniszgonjanin
efd378f403 Fix for a participant being able to join the voice conference multiple times 2010-09-28 05:21:45 +00:00
deniszgonjanin
89ec87d657 Fix for new chat UI flickering 2010-09-24 10:15:22 +00:00
deniszgonjanin
bdf857b56e Chat History fix for 0.71 2010-09-24 09:12:35 +00:00
deniszgonjanin
d93ffd1f71 Playback client improvements 2010-09-17 03:59:04 +00:00
Marco Calderon
37ed5c5429 added participants module 2010-09-02 15:38:57 +00:00
Marco Calderon
6a15a2c4c8 changes to the playback-client 2010-09-02 13:29:46 +00:00
Marco Calderon
2f69b4e48b javadoc recorder module - logs updated to java code, playback-web update and playback-client update 2010-08-16 17:41:05 +00:00
Marco Calderon
6c84e2c561 Changes: bbb-apps from groovy to java, add recording module and updated events-recorder and bbb-commons 2010-08-02 10:33:36 +00:00
Richard Alam
04eabdacbb - rename package 2010-07-20 11:35:03 -04:00
Richard Alam
1bde953703 - setup dependencies 2010-07-20 11:31:57 -04:00
Richard Alam
2e2ba473fe - ignore eclipse IDE files and dir 2010-07-20 11:28:32 -04:00
Richard Alam
6d007a64fd - rename message-recorder to events-recorder 2010-07-19 13:04:39 -04:00
Richard Alam
736514e9b0 - renaming to playback-client 2010-07-19 12:17:46 -04:00
Richard Alam
a9679acbcf - cleanup unused folder 2010-07-19 12:16:53 -04:00
Richard Alam
c1edb67290 - moved the record-and-playback folder from labs 2010-07-19 12:16:11 -04:00