Commit Graph

17552 Commits

Author SHA1 Message Date
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
Calvin Walton
321119a79e Create a new 2.0 recording playback directory, revert 0.9.0 to old shapes code.
The new shapes code, required for handling smooth shape updates & multi-user
whiteboard in the 2.0 BigBlueButton, hits a bug in old recordings where
the pencil tool incorrectly used "line" in its shape names, meaning that
there could be both a pencil mark and a line with the same shape name.

The old recording code didn't rely on the shape name to match shapes, since
there was no chance of concurrent shapes. As this is an incompatible playback
change, we need to make a new playback directory for the updated files.
2017-08-18 11:34:15 -04:00
Calvin Walton
d24c8f8af2 RnP: BBB <0.9 also had off-by-one on the undo and clear messages 2017-08-17 15:44:13 -04:00
Calvin Walton
04002f687f Revert to the pre-2.0 capitalization of 'userid' in presenter event 2017-08-17 14:29:54 -04:00
Calvin Walton
af4217c53e Set cursor opacity to match BBB flash client 2017-08-17 13:54:42 -04:00
Calvin Walton
50bf20f726 Rewrite recording processing handling of shapes, panzooms, cursor
The old code was very difficult to follow, and I couldn't figure out
a good way to retrofit the BigBlueButton 2.0 undo by shape id and clear
by user id into it - so I rewrote the entire thing instead.

It now generates the shapes.svg, panzooms.xml and cursor.xml all at the
same time during a single pass through the event.xml file. The result
is compatible with the existing recording javascript (at least once a few
minor issues in writing.js were fixed by earlier commits).
2017-08-17 13:33:00 -04:00
Calvin Walton
f0304a120a Handle panzoom at same time as slide change correctly.
Because of the >=, a panzoom at the same time as a slide change was matching
the previous slide rather than the expected new slide.
2017-08-17 11:59:06 -04:00
Calvin Walton
0087139f0d rnp: Fix playback to handle shape updates correctly.
The previous code would cause shapes to "blink" during updating if
the updates weren't continuous - in a gap between updates, the shape
would disappear.

Rework the logic for looking up "current" shapes to return the
nearest previous update rather than only exact matching timestamps,
and simplify the logic that decides whether to make a shape visible
or hidden.
2017-08-14 18:18:16 -04:00
Calvin Walton
aac50a077e Fix dot thickness for degenerate pencil shapes 2017-08-09 14:04:17 -04:00
Richard Alam
2903ece51d Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into bbb-2x-mconf 2017-08-09 07:21:50 -07:00
Richard Alam
9a88fbbbe3 Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-08-09 07:21:17 -07:00
Anton Georgiev
5944cb183a Merge pull request #4209 from Klauswk/html5-toggle-mute
[HTML5 2.0] Add Mute/Unmute methods
2017-08-09 10:15:17 -04:00
Ghazi Triki
14e10ce862 Updated text formatting icon for shared notes. 2017-08-09 10:50:05 +01:00
Ghazi Triki
733f122953 Use default selection and rollover colours for lists. 2017-08-09 10:36:45 +01:00
Ghazi Triki
46dc367be3 Fix MediaItemRenderer icons. 2017-08-09 09:19:27 +01:00
Richard Alam
cbb157b16f Merge branch 'antobinary-fix-webcam-state' into bbb-2x-mconf 2017-08-08 14:42:41 -07:00
Richard Alam
131c67def3 Merge branch 'fix-webcam-state' of https://github.com/antobinary/bigbluebutton into antobinary-fix-webcam-state 2017-08-08 14:41:51 -07:00
Richard Alam
f00e8010c6 Merge pull request #4214 from ritzalam/implement-ping-pong-with-bbb-web
- set also the status response
2017-08-08 17:08:06 -04:00
Richard Alam
3fe435668d - set also the status response 2017-08-08 14:06:53 -07:00
Richard Alam
0aec7c88a5 Merge pull request #4213 from ritzalam/implement-ping-pong-with-bbb-web
- return the following response when api service is unavailable.
2017-08-08 16:53:21 -04:00
Richard Alam
fae9dfdf14 - return the following response when api service is unavailable.
<response>
  <returncode>503</returncode>
  <reason>API Service Unavailable</reason>
</response>
2017-08-08 13:50:08 -07:00
Richard Alam
cd2ca71ff9 Merge pull request #4211 from ritzalam/implement-ping-pong-with-bbb-web
- implement check to see if akka-apps is alive from bbb-web so we ca…
2017-08-08 16:12:56 -04:00
Anton Georgiev
6b4c9ea8a4 drop camera for leaving user 2017-08-08 15:22:21 -04:00
Richard Alam
1a698058e1 - implement check to see if akka-apps is alive from bbb-web so we can return an
error to API requests
2017-08-08 12:16:00 -07:00
Klauswk
0ce41afabb Merge branch 'bbb-2x-mconf' into html5-toggle-mute 2017-08-08 13:59:00 -03:00
Richard Alam
9c50aa4280 Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-08-08 08:38:41 -07:00
Richard Alam
5648f7ef8a Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-08-08 08:34:21 -07:00
Anton Georgiev
34a3afc26b Merge pull request #4157 from oswaldoacauan/userlist-2x-design
[HTML5 2.0] User-list Redesign
2017-08-08 10:56:56 -04:00
Oswaldo Acauan
716ee5902f Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design 2017-08-08 11:52:26 -03:00
Ghazi Triki
d8278c24da Revert back dark style when video chat layout is selected. 2017-08-08 13:30:18 +01:00
Ghazi Triki
3462c716be Make SlideView background white. 2017-08-08 11:22:29 +01:00
Ghazi Triki
5b8ae10d3c Updated chat options style, default radio button and checkbox styles. 2017-08-08 11:09:46 +01:00
Ghazi Triki
1f001ee0cb Update BBBSettings title position and style. 2017-08-07 21:15:16 +01:00
Ghazi Triki
b5bffb0816 Remove unused code in TabSkin class. 2017-08-07 21:14:47 +01:00
Ghazi Triki
35cc113996 Added new sking for the Tab component and updated chat list style. 2017-08-07 18:21:43 +01:00
Ghazi Triki
9a1553f95e Show presentation download button only when there is at least one downloadable presentation. 2017-08-07 14:07:47 +01:00
Fred Dixon
b2aa0fbc91 Merge pull request #4208 from OZhurbenko/ff-55-56-flash-hanging-2.0
Fixes hanging Flash on tab switch in Firefox 55-56
2017-08-06 07:37:18 -04:00
Oleksandr Zhurbenko
db1b8c3ecb Added a check for Windows 2017-08-04 16:01:43 -07:00
Klaus
526518e740 Remove duplicate lines 2017-08-04 17:20:24 -03:00
Klaus
0807960da4 Fix missing method for mute user 2017-08-04 17:05:18 -03:00
Oleksandr Zhurbenko
02a1855650 Added a check to detect a 32 bit version of Firefox only 2017-08-04 12:46:34 -07:00
Oleksandr Zhurbenko
dd671737f7 Fixes hanging Flash on tab switch in Firefox 55-56 2017-08-04 12:18:38 -07:00
Oswaldo Acauan
e07c8b41af Add autofocus when switching/entering chat 2017-08-04 15:32:21 -03:00
Oswaldo Acauan
78e88c8189 Fix unread counter 2017-08-04 15:20:54 -03:00
Oswaldo Acauan
720dddec24 Fix chat styles 2017-08-04 15:17:15 -03:00
Oswaldo Acauan
0022c121d3 Fix chat bug and styles 2017-08-04 14:58:55 -03:00
Richard Alam
fa02af1559 Merge pull request #4206 from ritzalam/fix-listen-on-breakout
Fix listen on breakout
2017-08-04 12:35:01 -04:00
Richard Alam
5cfc55eb94 Merge pull request #4205 from ritzalam/breakout-time-remaining
- display breakout room time remaining
2017-08-04 12:34:19 -04:00
Richard Alam
05054e4875 - need to notify parent meeting of user join and leave to get listen in to work 2017-08-04 09:32:52 -07:00
Richard Alam
b1b00aa070 - display breakout room time remaining 2017-08-04 08:14:48 -07:00