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

20189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calvin Walton
cafa9fd822 Rework audio processing to avoid seeking past end of file 
In some cases when there is a slight mismatch between audio file
duration and event timestamp difference, and we have a record
status or chapter break event in a certain location, it could
trigger a seek past the end of an audio file. Detect this
condition and just render silence instead.

Also adjust the thresholds for the audio length scaling - they
were being triggered on short recordings that should be correct.
 2018-02-13 12:45:58 -08:00
Richard Alam
bca27c4838
Merge pull request #5136 from kepstin/segmented-recording 
Archive events.xml file in a concurrency-friendly way.
 2018-02-12 14:28:37 -05:00
Calvin Walton
c1258ed387 Archive events.xml file in a concurrency-friendly way. 
With the current segment processing, we might be processing one segment
while archiving a different segment from the same recording. To avoid
that the processing scripts see an incomplete events.xml file, write to
a temp file then rename.
 2018-02-12 14:04:46 -05:00
Richard Alam
ad5baaebe6
Merge pull request #5135 from ritzalam/red5-rec-fix 
Workaround video sync issue due to red5 timestamp offset
 2018-02-12 13:23:51 -05:00
Calvin Walton
c44d94b498 Workaround video sync issue due to red5 timestamp offset 
Red5 sometimes writes webcam video files with a large offset in the
video frame offsets, sometimes up to 30 or even 60 seconds. However,
the start event in the events.xml file corresponds to the time at
which red5 received the first keyframe (recorded frame) in the video.

The end result is that the video will sometimes appear to be
delayed (out of sync) in the processed recording.

The correction is simple: We're already reading video metadata,
including the timestamp of the first frame, so we just have to apply
a correction during video processing to undo the frame timestamp
offsets in the video file.
 2018-02-12 10:22:36 -08:00
Richard Alam
5e64d72384
Merge pull request #5130 from capilkey/imp-multiuser-cursor 
Improve the interaction between multiuser and cursors
 2018-02-12 13:19:18 -05:00
Chad Pilkey
8e5f3093e6 improve interaction between multiuser and cursors 2018-02-09 19:02:34 -05:00
Chad Pilkey
343c52a8a7
Merge pull request #5124 from capilkey/update-air-2.1 
Include missing classes in AIR client
 2018-02-08 16:02:32 -05:00
Chad Pilkey
99c5b2c8a0 [AIR] include missing RequestWelcomeMessage[Signal|Command] 2018-02-08 15:58:04 -05:00
Fred Dixon
3fbb8e6910
Merge pull request #5121 from capilkey/update-air-2.1 
Updates for the 2.1 AIR client
 2018-02-08 14:35:24 -05:00
Chad Pilkey
7c560ca9c3 [AIR] fix chat message display issues related to system messages 2018-02-08 14:27:41 -05:00
Chad Pilkey
8bd7f9c721 [AIR] fix exception when trying to scroll a short chat list 2018-02-08 14:26:40 -05:00
Chad Pilkey
7139777588 [AIR] add authToken to voice and video connections 2018-02-08 14:25:20 -05:00
Richard Alam
4a5d520b58
Merge pull request #5111 from ritzalam/drop-messages-on-rights-mgmt 
- drop whiteboard and cursor messages instead of enforcing rights ma…
 2018-02-07 17:07:54 -05:00
Richard Alam
253268ce58
Merge pull request #5113 from capilkey/update-air-2.1 
Minor AIR updates for 2.1 chat
 2018-02-07 17:07:43 -05:00
Richard Alam
09cf94cb8a - simplify check 2018-02-07 13:57:22 -08:00
Chad Pilkey
d0bc56972c [AIR] reset new messages when viewing chat and scroll to bottom 2018-02-07 16:45:38 -05:00
Richard Alam
72a310ecaf
Merge pull request #5112 from ritzalam/disable-broadcast-layout 
- hide broadcast layout button for viewers
 2018-02-07 16:43:25 -05:00
Richard Alam
c67cb19dd4 - exclude pencil draw update and end status from being dropped by rights management so that pencil lines will smooth out 2018-02-07 13:39:24 -08:00
Richard Alam
34bc824472 - hide broadcast layout button for viewers 2018-02-07 12:36:12 -08:00
Richard Alam
8a1a1fc3ce - clean up formatting 2018-02-07 12:34:39 -08:00
Richard Alam
d2fd54e6e9 - drop whiteboard and cursor messages instead of enforcing rights management 2018-02-07 11:31:36 -08:00
Richard Alam
7f9d5c8585
Merge pull request #5109 from ritzalam/prevent-duplicate-wav-files 
Prevent duplicate wav files
 2018-02-07 10:35:18 -05:00
Richard Alam
47147056c4 - handle properly out of order recording started/stopped events from freeswitch 2018-02-07 07:30:33 -08:00
Chad Pilkey
cb59793703 [AIR] reposition chat send button 2018-02-06 18:52:33 -05:00
Chad Pilkey
9f7887e687 [AIR] add welcome and clear messages 2018-02-06 18:22:14 -05:00
Fred Dixon
00d0242111
Merge pull request #5105 from ffdixon/update-bbb-conf-2 
Fix updating of config.xml
 2018-02-06 17:35:06 -05:00
Fred Dixon
4b0e804dd6 Fix updating of config.xml 2018-02-06 16:34:23 -06:00
Richard Alam
4375ff1b37 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into fix-group-chat 2018-02-06 10:50:33 -08:00
Richard Alam
02a3586d9e
Merge pull request #5095 from ritzalam/fix-group-chat 
Fix group chat
 2018-02-06 11:52:31 -05:00
Richard Alam
916baa4597 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into fix-group-chat 2018-02-06 07:31:35 -08:00
Richard Alam
2fa91e3308 - silence log 2018-02-05 17:30:51 -08:00
Fred Dixon
799d17c7cf
Merge pull request #5098 from capilkey/update-air-2.1 
First pass at chat in the AIR client for 2.1
 2018-02-05 20:22:15 -05:00
Chad Pilkey
32df263d18 first pass at updating chat in AIR client for 2.1 2018-02-05 19:27:44 -05:00
Richard Alam
96a77ef9c6 - remove trace logs 2018-02-05 11:08:56 -08:00
Richard Alam
8188dff9dc - fix double welcome messages 2018-02-05 08:47:41 -08:00
Richard Alam
b91f2abde5 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master 2018-02-01 12:50:43 -08:00
Richard Alam
784d5cb6d9
Merge pull request #5080 from ritzalam/logos-folder 
- put logos into its own directory
 2018-02-01 11:49:16 -05:00
Richard Alam
5a5232d43d - put logos into its own directory 2018-02-01 08:47:36 -08:00
Richard Alam
1b8d0a06c1 Merge branch 'riadvice-moderator-message-ui' into v2.0.x-release 2018-02-01 08:26:28 -08:00
Richard Alam
6f7669c390 Merge branch 'moderator-message-ui' of https://github.com/riadvice/bigbluebutton into riadvice-moderator-message-ui 2018-02-01 08:26:15 -08:00
Richard Alam
9e62dfb979 Merge branch 'riadvice-2.0-updates' into v2.0.x-release 2018-02-01 08:00:21 -08:00
Richard Alam
d58f1ec5e7 Merge branch '2.0-updates' of https://github.com/riadvice/bigbluebutton into riadvice-2.0-updates 2018-02-01 07:40:27 -08:00
Fred Dixon
feff36a352
Merge pull request #5076 from riadvice/remove-spark 
Replace remnant spark labels by mx label and text
 2018-02-01 09:03:29 -05:00
Fred Dixon
4d9138300a
Merge pull request #5075 from riadvice/2.0-ui-fixes 
Show "Viewers Locked" when webcamsOnlyForModerator is on
 2018-02-01 09:03:07 -05:00
Ghazi Triki
26aa84c4cc Replace remnant spark labels by mx label and text. 2018-02-01 11:17:34 +01:00
Ghazi Triki
47cd5309b0 Show "Viewers Locked" when webcamsOnlyForModerator is on. 2018-02-01 10:26:09 +01:00
Fred Dixon
c0f0303051
Merge pull request #4027 from hakaz/patch-1 
Issue #3985: bbb-conf --debug incorrectly flags
 2018-01-31 20:08:08 -05:00
Fred Dixon
7617828770
Merge pull request #5064 from riadvice/microphone-highlight 
Highlight microphone icon in users list when microphone is locked
 2018-01-31 20:03:53 -05:00
Richard Alam
e34fa44ad3
Merge pull request #5072 from ritzalam/merge-20-with-master 
Merge 20 with master
 2018-01-31 17:49:32 -05:00