BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,433 Commits 13 Branches 260 Tags 1.1 GiB
2c3c10115e
Commit Graph

503 Commits

Author SHA1 Message Date
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
Leonardo Crauss Daronco
c6da73272b Hide unnecessary scroll bars in the playback html 2013-06-19 17:22:07 -03:00
Felipe Cecagno
e53ea59abe Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into playback-improvements 2013-06-19 12:44:38 -03:00
Leonardo Crauss Daronco
ab73b54fb3 Fix position of elements in the playback after swapping video/presentation 
The media controls area (acorn controls) was placed in the wrong position
after swapping video and presentation in the recording playback (and was
still wrong if swapping them again).
 2013-06-18 23:19:08 -03:00
Leonardo Crauss Daronco
ce668c55b0 Fix the position of media controls in the playback with video 
The media controls area (acorn controls) was being displayed at the
wrong place in the playback of a recording with video. Now it's always
displayed right below the presentation area, doesn't matter if the
recording has video or not.
 2013-06-17 22:56:08 -03:00
Leonardo Crauss Daronco
891ae0be49 Reposition auto scroll option and audio bar in the playback html 
Audio control bar is bigger and aligns with the presentation. The auto scroll
checkbox is aligned with the thumbnails area.
 2013-06-16 01:35:39 -03: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
bf554b75a8 enabling audio_offset tested for h264 2013-06-13 17:24:37 -03:00
Felipe Cecagno
ced61d3fba rap-worker now keeps track of the processing time of a recording; a file called processing_time is generated during the process phase, and this information is added to metadata.xml when the recording is published - this information isn't retrieved by getRecordings because no modification was done on bbb-web to include this information, but at least it's there so the sysadmin can check how long does a recording take to get processed 2013-06-13 17:13:20 -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
2483f76ee6 create audio.webm to play it in IE 2013-06-11 17:20:34 -05:00
Gustavo Salazar
e89bb22e9f no need to publish events.xml 2013-06-11 17:02:12 -05:00
Gustavo Salazar
f1cd2f071e publish audio files only if video is not available 2013-06-11 17:00:08 -05:00
Felipe Cecagno
ac66d49812 Create the auto scroll feature on the slides thumbnails. The idea is that everytime the slide changes because of the synchronized playback, the thumbnails div will scroll to keep the current thumbnail centered in the div. The feature can be disabled using a checkbox. 2013-06-09 15:11:50 -03:00
Felipe Cecagno
c8f2079e64 When the user clicks on a slide thumbnail, the URL changes to index that moment so if the user copies and shares the URL after click on a slide thumbnail, the URL copied will go directly to the correct moment. 2013-06-09 14:51:38 -03:00
Chad Pilkey
e6a93de055 custom start time of recording now works in firefox 2013-06-05 14:05:15 -07:00
Felipe Cecagno
6779e219b2 added the proper mconf logo on the presentation playback page 2013-06-05 15:42:45 -03:00
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
Fred Dixon
cd4939d44a Modified bbb.playback.css to hide border lines 2013-04-12 21:56:28 -04: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
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
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
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
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
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
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
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
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
27dd7da721 Get attributes according to the type of event. 2012-08-28 14:31:14 -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
Chad Pilkey
f81849ae4f added third party presentation playback controls (acornmediaplayer) 2012-08-21 16:44:54 +00: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
Chad Pilkey
599f16863d chat, slides, and thumbnails are all accessible now 2012-08-10 19:31:36 +00:00
Gustavo Salazar
a85e8c144e Use webm for webcam in playback. 2012-08-07 16:36:52 -05:00
Gustavo Salazar
a25a5710a1 Change id of video recording. 2012-08-07 13:16:02 -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
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