Commit Graph

68 Commits

Author SHA1 Message Date
Anton Georgiev
8cc8474655 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into 08-26-merge 2020-08-27 19:09:07 +00:00
Anton Georgiev
4476df6f09
Merge pull request #10318 from prlanzarin/upstream-2.2-vpeg-pagination
video-provider: prioritise presenter in pagination ordering, restore pre-.22 full mesh ordering
2020-08-24 17:14:43 -04:00
Anton Georgiev
b8959be312
Merge pull request #10304 from pedrobmarin/individual-video-record-control
Add individual video record control
2020-08-24 16:58:16 -04:00
prlanzarin
f3674335a4 video-provider: prioritise presenter in pagination ordering
Also restore the old full mesh, pre-.22 ordering where outbound streams were put first
2020-08-24 19:55:29 +00:00
Anton Georgiev
89319787f8
Merge pull request #10317 from prlanzarin/upstream-2.2-vpeg-pagination
video-provider: fix dynamic profile accounting when using pagination
2020-08-24 15:14:00 -04:00
prlanzarin
e7323ee6a5 video-provider: fix dynamic profile accounting when using pagination 2020-08-24 18:30:24 +00:00
Anton Georgiev
59ab8e215d
Merge pull request #10315 from prlanzarin/upstream-2.2-vpeg-pagination
video-provider: fix pagination edge case
2020-08-24 10:42:07 -04:00
prlanzarin
2e6627b820 video-provider: fix pagination edge case where pages would be calculated as NaN 2020-08-24 14:35:28 +00:00
Pedro Beschorner Marin
8b54c01898 Add hack to avoid recording viewers video stream
If, at the time the video is shared, the user has a viewer role and
meta_hack-record-viewer-video is false this user won't have this video
stream recorded.
2020-08-22 21:00:31 -03:00
Pedro Beschorner Marin
95bc7cd59e Add individual video record control
This adds bbb_record_video userdata that, when is set to false, signals
bbb-webrtc-sfu to avoid generating the stream recording assets for a
particular user.

By default, bbb_record_video is true.
2020-08-21 19:10:25 -03:00
Anton Georgiev
4fb301c48b
Merge pull request #10293 from prlanzarin/upstream-2.2-vpeg-pagination
video-provider: first tackle at video pagination
2020-08-20 15:24:57 -04:00
prlanzarin
0b29b5a812 video-provider: enrich pagination enabled checks 2020-08-20 17:26:32 +00:00
prlanzarin
a98c476239 video-provider: remove page change lock in favor of a debounced approach 2020-08-20 15:43:02 +00:00
prlanzarin
5f72cecf4f video-provider: fix mirrorOwnWebcam behaviour (regression from #10208) 2020-08-20 01:12:56 +00:00
prlanzarin
bc4ce58251 video-provider: make pagination circular 2020-08-19 22:27:47 +00:00
prlanzarin
2d436977cb video-provider: add pagination page change timer to prevent spamming 2020-08-19 13:56:22 +00:00
prlanzarin
28e826118a video-provider: first version of video pagination 2020-08-18 17:00:47 +00:00
Anton Georgiev
5be5aed1d9 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2020-08-12 2020-08-12 17:12:58 +00:00
prlanzarin
c524abf05b video-provider: normalize hidden cameraProfiles constraints
Also add some inlined docs to settings.yml
2020-08-11 14:51:50 +00:00
prlanzarin
1d52b158f8 video-provider: fix safari resolution change on applyConstraints, only reapply bitrate when needed 2020-08-05 16:56:18 +00:00
prlanzarin
642de5076a video-provider: first, simplified version of dynamic camera profile control 2020-08-05 16:55:41 +00:00
Pedro Beschorner Marin
7b3505acff Enumerating devices after video preview gUM 2020-08-05 15:06:44 +00:00
Pedro Beschorner Marin
40908a51a8 Postponing get from user settings 2020-08-05 14:56:20 +00:00
prlanzarin
fab6d96769 video-provider: reimplement PR #9407
Some weird merged regressed #9407 when merging 2.2 in 2.3, and backporting the VP from 2.3 to 2.2 reintroduced the issue, so I reimplemented it
2020-08-05 14:35:08 +00:00
Pedro Beschorner Marin
b74bd0283e Fix webcamsOnlyForModerator 2020-08-05 14:32:51 +00:00
prlanzarin
dac3259c48 Merge remote-tracking branch 'pedrobmarin/bbb-multiple-webcams' into upstream-2.2-vpeg-base 2020-08-05 14:20:58 +00:00
Joao Siebel
6987ab988c Restore activity check modal.
If activity check was enabled in server, the activity check modal wasn't showed
to users and after a given time the user was disconnect, also fix the meeting-end
and error-screen messages, informing the user the reason why he was kicked.
2020-08-03 09:44:21 -03:00
Pedro Beschorner Marin
526f79e8f2 Merge remote-tracking branch 'bigbluebutton/v2.2.x-release' into bigbluebutton/develop 2020-06-30 18:15:18 -03:00
mw781
2da9028c0b Extract constant for convenience 2020-06-15 21:51:46 +01:00
mw781
f4dc8d9d69 Fix critical issue with video-preview arguments
After the code to mirror the video-preview component was added
I noticed that I improperly used the userId property of an undefined
argument as the video-preview does not have a user as a prop. This
commit decouples the logic to verify if the webcam should be mirrored
and whether the webcam belongs to that user. In the latter, we verify
if the user parameter exists and use it in a conditional, otherwise
we simply return true (applies with the video preview component),
where there is only one video stream.
2020-06-15 21:49:00 +01:00
mw781
bf68d2c76f Refactor code and implement mirroring for video-preview 2020-06-14 20:13:47 +01:00
Pedro Beschorner Marin
362317e8d0 Enumerating devices after video preview gUM 2020-05-08 13:43:29 -03:00
KDSBrowne
741455aeba remove hideUserList() from video-provider service 2020-05-06 15:14:07 +00:00
KDSBrowne
e82e0f5be9 fix see views in user list lock affecting webcams 2020-05-02 16:50:40 +00:00
Pedro Beschorner Marin
ef48ea2e8c Postponing get from user settings 2020-03-26 19:31:08 -03:00
Pedro Beschorner Marin
66878174bb Fix webcamsOnlyForModerator 2020-03-26 15:28:58 -03:00
Chad Pilkey
0853298c49 fix client crash when client is unsecured 2020-03-09 17:47:47 +00:00
Pedro Beschorner Marin
9b450ae1d9 Check Safari before listening for ondevicechange 2019-12-20 17:21:40 -03:00
Pedro Beschorner Marin
78b0d0276a Avoid multiple cameras sharing in mobile and safari 2019-12-20 17:21:23 -03:00
Pedro Beschorner Marin
8e129fb961 Included multiple cameras UI 2019-12-18 14:44:56 -03:00
Pedro Beschorner Marin
5c71e2d0bb Included new getStats monitor for audio and video 2019-12-10 09:07:06 -03:00
Pedro Beschorner Marin
a434f61052 Reverting file mode changes 2019-12-10 09:05:04 -03:00
Pedro Beschorner Marin
f5d7be7f00 Making the interface functional for the multiple webcams. This must change after thinking on a design 2019-12-10 09:05:03 -03:00
Pedro Beschorner Marin
3b591a086b Unified video providers 2019-12-10 09:02:16 -03:00
prlanzarin
4e55145381 Change VideoService userName fetch to Auth and pass it again to video-provider 2019-11-28 18:49:20 +00:00
Tainan Felipe
957225fabf Rename collection to video-streams 2019-09-06 13:50:31 -03:00
Tainan Felipe
c27ff18958 Merge remote-tracking branch 'upstream/master' into video-performance 2019-09-06 10:16:22 -03:00
Tainan Felipe
3d8e0be9fe Filter user collection fields 2019-09-05 17:03:22 -03:00
Tainan Felipe
060e82dddf Move hasStream to video-users collection 2019-09-05 15:29:30 -03:00
Anton Georgiev
ea18b09311 add a few more collection lookups "fields" delimiters 2019-08-29 12:26:07 -04:00