BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/v2.6.x-release' into layout-tests-migration

Browse Source
This commit is contained in:
Anton Barboza 2023-04-26 15:14:24 -03:00
commit 860766b4cf
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bigbluebutton-html5/imports/ui/components/webcam/component.jsx
View File

@ -154,7 +154,13 @@ const WebcamComponent = ({
if (isRTL) {
draggableOffset.left = draggableOffset.left * -1;
}
const isIphone = !!(navigator.userAgent.match(/iPhone/i));
const mobileWidth = `${isDragging ? cameraSize.width : cameraDock.width}pt`;
const mobileHeight = `${isDragging ? cameraSize.height : cameraDock.height}pt`;
const isDesktopWidth = isDragging ? cameraSize.width : cameraDock.width;
const isDesktopHeight = isDragging ? cameraSize.height : cameraDock.height;
const camOpacity = isDragging ? 0.5 : undefined;
return (
<>
{isDragging ? <DropAreaContainer /> : null}
@ -236,9 +242,9 @@ const WebcamComponent = ({
role="region"
draggable={cameraDock.isDraggable && !isFullscreen ? 'true' : undefined}
style={{
width: `${isDragging ? cameraSize.width : cameraDock.width}pt`,
height: `${isDragging ? cameraSize.height : cameraDock.height}pt`,
opacity: isDragging ? 0.5 : undefined,
width: isIphone ? mobileWidth : isDesktopWidth,
height: isIphone ? mobileHeight : isDesktopHeight,
opacity: camOpacity,
background: isCameraSidebar ? colorContentBackground : null,
}}
>

4
docs/docs/administration/customize.md
View File

@ -640,9 +640,9 @@ HERE
Starting from version 2.4 BigBlueButton offers virtual background for webcams.
To use your own background images copy them into the directory
`/usr/share/meteor/bundle/programs/web.browser/app/resources/img/virtual-backgrounds`.
`/usr/share/meteor/bundle/programs/web.browser/app/resources/images/virtual-backgrounds`.
For each image copy a thumbnail of the image of 50x50 pixels size into
`/usr/share/meteor/bundle/programs/web.browser/app/resources/img/virtual-backgrounds/thumbnails`.
`/usr/share/meteor/bundle/programs/web.browser/app/resources/images/virtual-backgrounds/thumbnails`.
To generate thumbnails you can use the following shell snippet:

2
docs/docs/administration/turn-server.md
View File

@ -253,7 +253,7 @@ Ensure that the `coturn` has binded to port 443 with `netstat -antp | grep 443`.
## Configure BigBlueButton to use your TURN server
You must configure bbb-web so that it will provide the list of turn servers to the web browser. Edit the file `/usr/share/bbb-web/WEB-INF/classes/spring/turn-stun-servers.xml` using the contents below and make edits:
You must configure bbb-web so that it will provide the list of turn servers to the web browser. Edit the file `/etc/bigbluebutton/turn-stun-servers.xml` using the contents below and make edits:
- replace both instances of `<turn.example.com>` with the hostname of the TURN server, and
- replace `<secret_value>` with the secret you configured in `turnserver.conf`.