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

828 Commits

Author SHA1 Message Date
alexandre
ccd4bc4268 Removing timeline attribute for deskshare video 
We don't need it. This causes duplicate chat messages in recording playback.
 2017-02-16 17:24:33 -02:00
Pedro Beschorner Marin
7a4cd67fc3 Adjusting playback to work with old recordings 2017-02-14 13:52:44 +00:00
alexandre
dfa5a305cc Handling deskshare when closing meeting or stop recording 
Closing the room or stopping recording with an active deskshare was producing an incorrect recording
 2017-02-01 16:38:39 +00:00
Pedro Beschorner Marin
efb9082b9d Hiding deskshare cursor 2017-02-01 14:15:55 +00:00
Pedro Beschorner Marin
b91535741b Refactored canvas handling 2017-01-31 14:06:38 +00:00
Pedro Beschorner Marin
0647cdf3b1 Fixed NPE and did some cursor drawing refactoring at playback 2017-01-31 13:45:43 +00:00
Pedro Beschorner Marin
91092e066a Fixed playback when there is no deskshare canvas 2017-01-27 17:01:59 +00:00
Pedro Beschorner Marin
b89a31bb9a Merge remote-tracking branch 'playback-speedup' into mconf 
Conflicts:
	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
	record-and-playback/presentation_export/playback/presentation_export/lib/writing.js
 2017-01-26 18:10:20 +00:00
Pedro Beschorner Marin
e5f6ce8185 Make sure to create video element before running Popcorn 2017-01-03 13:13:36 +00:00
Pedro Beschorner Marin
adbb81e1c5 Cleanup 2016-12-21 18:35:21 +00:00
Pedro Beschorner Marin
85fdf9c79f Updated presentation_export with new deskshare features 2016-12-21 17:26:11 +00:00
Pedro Beschorner Marin
9646bd4cef Fixed annotations to work with Chrome 2016-12-21 16:47:42 +00:00
kreismann
4e2dc4077a Fixing deskshare video positioning 
This also fixes deskshare video/user video swap on playback.
 2016-12-20 13:36:02 -02:00
kreismann
f93114e207 Fixing deskshare panzooms 
- Getting slide dimensions to properly set the panzoom event when deskshare stops.
- Sometimes there's a panzoom event with the deskshare image dimension at time=stop_timestamp+0.1. We remove it.
- Little refactoring
 2016-12-19 15:11:32 -02:00
Pedro Beschorner Marin
0223faec5a Positioning cursor over deskshare whiteboard on the playback 2016-12-16 12:49:46 +00:00
Pedro Beschorner Marin
8ca6ecacee Merge remote-tracking branch 'alexandrekreis/mconf' into deskshare-whiteboard 2016-12-15 17:20:08 +00:00
Pedro Beschorner Marin
ac9504fdd2 Annotations over deskshare whiteboard at playback 2016-12-15 17:19:10 +00:00
kreismann
6a29fd832e Handling deskshare on processClearEvents 2016-12-14 14:50:34 -02:00
kreismann
37660e4e13 Fixing some bugs 
- Properly inserting deskshare panzoom events. We insert a panzoom event with the deskshare video dimensions and the deskshare start timestamp. Immediately, we insert another panzoom event with the previous slide dimensions and the deskshare stop timestamp, deleting any other panzoom event inside this interval of time.
- Handling when deskshare events occur in timestamp = 0.0
- For now, we are limiting the max dimensions to 1280x720
 2016-12-12 16:29:06 -02:00
kreismann
be87eeddbd Creating only one image for deskshare 
So we can retrieve deskshare history. Still need to adapt the size of annotations on different deskshare resolutions.
 2016-12-02 17:40:50 -02:00
kreismann
6aeabb9293 Correctly handling multiple deskshare events inside a slide interval of time 2016-12-02 15:34:49 -02:00
Pedro Beschorner Marin
5563e607fc Changed loading bar theme 2016-12-02 13:50:00 +00:00
Pedro Beschorner Marin
0248d42179 Updated presentation_export with new deskshare features, loading bar and JSON slides text file 2016-12-01 20:04:06 +00:00
Pedro Beschorner Marin
e5c48cb7be Replaced the playback spinner for a loading bar and included a not-found meeting fallback page 2016-12-01 18:13:26 +00:00
kreismann
fe9fde2330 Getting flv resolution to set deskshare image and pan/zoom dimensions 2016-11-30 16:31:19 -02:00
Pedro Beschorner Marin
b762795cc9 Cleanup 2016-11-29 17:33:05 +00:00
kreismann
e27c291ee0 Recording playback shows whiteboard annotations on deskshare video as well 
Pending issues:
- Image and ViewBox sizes are hardcoded (1280x720 - a full screen deskshare video). In order to work with region deskshare videos, we must get the flvs resolutions and set shapes.svg and panzooms accordingly.
- We're not considering the deskshare annotations history yet
 2016-11-29 15:08:28 -02:00
Pedro Beschorner Marin
c8acfbf65a Getting slides associated text from a single JSON file 2016-11-29 14:00:19 +00:00
kreismann
c3b0bd46b2 Deskshare video positioning 
Applying slide resizing algorithm to deskshare video as well. Also, removing deskshare-video-area.
 2016-11-01 17:39:06 -02:00
kreismann
73603d5d68 Presentation area of the recording playback also shows deskshare video 
This is a demo. Some issues:

- When sharing desktop, cursor is still relative to slides, and not to deskshare video;
- Need to show whiteboard canvas on top of deskshare video as well;
- Need more testing (audio/video sync, playback perfomance, multiple presenters and multiple deskshare events).
 2016-10-20 17:39:35 -02:00
Felipe Cecagno
ab8eb279a0 Merge pull request #342 from pedrobmarin/recording-events-improvments 
Recording events improvments
 2016-09-29 15:19:50 -03:00
Pedro Beschorner Marin
694c9564a5 Added record_id to redis recording events 2016-09-21 20:12:57 +00:00
Pedro Beschorner Marin
49d5f9c41c Refactored redis recording events 2016-09-21 16:32:11 +00:00
Felipe Cecagno
79c3c12256 Merge branch 'merge-presentation-deskshare' into mconf 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
	record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js
 2016-09-14 14:49:48 -03:00
kreismann
b961e197c5 Not showing annotation canvas while sharing desktop in recording 
1. We create a deskshare.xml with start and stop timestamps of each deskshare event
2. We read it in playback e use its information to hide the annotation canvas and cursor accordingly
 2016-09-09 18:31:27 -03:00
Felipe Cecagno
4aa2a732e2 Merge branch 'mconf-live0.7.5' of github.com:mconf/bigbluebutton into mconf 
Conflicts:
	record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js
 2016-09-01 18:00:43 -03:00
Felipe Cecagno
c2a2b7c87a enable mconf-decrypter to fetch the recordings even if mconf-live is using a self-signed certificate 2016-09-01 17:56:55 -03:00
Felipe Cecagno
c5917f6a92 update presentation_export playback to be responsive as the playback format 2016-09-01 14:07:33 -03:00
Felipe Cecagno
d884264852 update Gemfile and Gemfile.lock, will start to deploy Gemfile.lock and execute ruby using bundler 2016-08-18 16:23:33 -03:00
Felipe Cecagno
714aba46ef set to debug some of the new log messages on mconf-decrypter 2016-08-18 16:22:40 -03:00
Leonardo Crauss Daronco
d860d166df Make mconf-decrypter work with HTTPS and redirects 
It now works with HTTPS URLs and will follow one redirect. The redirect is
useful for when the server being requested redirects HTTP to HTTPS.
 2016-08-16 13:09:19 -03:00
Felipe Cecagno
f44c25f3f6 do not use hardcoded http to load resources in the playback 2016-08-01 23:53:49 -03:00
Pedro Beschorner Marin
abebee010f Merge branch 'daronco/responsive-playback' into mconf 
Conflicts:
	record-and-playback/presentation/playback/presentation/0.9.0/logo.png
	record-and-playback/presentation/playback/presentation/0.9.0/playback.html
 2016-07-12 16:26:47 +00:00
Pedro Beschorner Marin
fac305f8f6 Merge commit '427a288dfe61cfdb28cc1c20a11a36c84f3a33d9' from daronco/responsive-playback into bigbluebutton/v1.0.x-release 
Conflicts:
	record-and-playback/presentation/playback/presentation/0.9.0/playback.html
 2016-07-12 14:21:04 +00:00
Pedro Beschorner Marin
4c432ee5bd Merge branch 'feature-1931' into rafafp-branches-merged-1.0 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatToolbar.mxml
	record-and-playback/presentation/scripts/publish/presentation.rb
 2016-06-22 13:06:51 +00:00
Leonardo Crauss Daronco
427a288dfe Fix clicks on the thumbnails in the playback page 
Wasn't binding to events in the proper order, causing cliks in a thumbnail
not to behave properly.
 2016-04-29 16:11:48 -04:00
Leonardo Crauss Daronco
0d5bda9d73 Improve playback buttons and update colors in the playback page 
Bigger and more well spaced buttons, specially in small screens.
Also updated the colors to match the latest design definitions.
 2016-04-29 15:59:45 -04:00
Leonardo Crauss Daronco
af27a69ef8 Fix playback of recordings not loading on firefox mobile 
The event "loadeddata" is only triggered on firefox mobile once the
video/audio is played, so it requires the user to click on the play button
for it to be triggered.
The playback page was waiting for the event to be triggered before
removing the "loading" page, and that would never happen on firefox mobile.

Now we don't wait anymore for the video to be loaded, we just wait for
the slides and the initial setup.
 2016-04-28 18:55:09 -04:00
Leonardo Crauss Daronco
6094c8ceee Stack recording playback components when in portrait mode 2016-04-28 14:35:47 -04:00
Leonardo Crauss Daronco
2b20824b99 Small fix/protection in the js of the playback page 2016-04-28 10:36:39 -04:00