Interanet/jitsi-meet-deployment
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

web,jvb: add option to enable multi-stream

Browse Source
This commit is contained in:
Daniel McAssey
2022-06-17 18:35:17 +01:00
committed by GitHub
parent 701dadfcad
commit 8f38fe60f7
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.yml
View File

@@ -79,6 +79,7 @@ services:
- ENABLE_TRANSCRIPTIONS - ENABLE_TRANSCRIPTIONS
- ENABLE_XMPP_WEBSOCKET - ENABLE_XMPP_WEBSOCKET
- ENABLE_JAAS_COMPONENTS - ENABLE_JAAS_COMPONENTS
- ENABLE_MULTI_STREAM
- ETHERPAD_PUBLIC_URL - ETHERPAD_PUBLIC_URL
- ETHERPAD_URL_BASE - ETHERPAD_URL_BASE
- E2EPING_NUM_REQUESTS - E2EPING_NUM_REQUESTS
@@ -288,6 +289,7 @@ services:
- DOCKER_HOST_ADDRESS - DOCKER_HOST_ADDRESS
- ENABLE_COLIBRI_WEBSOCKET - ENABLE_COLIBRI_WEBSOCKET
- ENABLE_OCTO - ENABLE_OCTO
- ENABLE_MULTI_STREAM
- JVB_AUTH_USER - JVB_AUTH_USER
- JVB_AUTH_PASSWORD - JVB_AUTH_PASSWORD
- JVB_BREWERY_MUC - JVB_BREWERY_MUC

4
jvb/rootfs/defaults/jvb.conf
View File

@@ -1,6 +1,7 @@
{{ $COLIBRI_REST_ENABLED := .Env.COLIBRI_REST_ENABLED | default "false" | toBool }} {{ $COLIBRI_REST_ENABLED := .Env.COLIBRI_REST_ENABLED | default "false" | toBool }}
{{ $ENABLE_COLIBRI_WEBSOCKET := .Env.ENABLE_COLIBRI_WEBSOCKET | default "1" | toBool }} {{ $ENABLE_COLIBRI_WEBSOCKET := .Env.ENABLE_COLIBRI_WEBSOCKET | default "1" | toBool }}
{{ $ENABLE_OCTO := .Env.ENABLE_OCTO | default "0" | toBool }} {{ $ENABLE_OCTO := .Env.ENABLE_OCTO | default "0" | toBool }}
{{ $ENABLE_MULTI_STREAM := .Env.ENABLE_MULTI_STREAM | default "0" | toBool }}
{{ $JVB_DISABLE_STUN := .Env.JVB_DISABLE_STUN- | default "0" | toBool }} {{ $JVB_DISABLE_STUN := .Env.JVB_DISABLE_STUN- | default "0" | toBool }}
{{ $JVB_STUN_SERVERS := .Env.JVB_STUN_SERVERS | default "meet-jit-si-turnrelay.jitsi.net:443" -}} {{ $JVB_STUN_SERVERS := .Env.JVB_STUN_SERVERS | default "meet-jit-si-turnrelay.jitsi.net:443" -}}
{{ $JVB_AUTH_USER := .Env.JVB_AUTH_USER | default "jvb" -}} {{ $JVB_AUTH_USER := .Env.JVB_AUTH_USER | default "jvb" -}}
@@ -60,6 +61,9 @@ videobridge {
tls = true tls = true
server-id = "{{ $WS_SERVER_ID }}" server-id = "{{ $WS_SERVER_ID }}"
} }
multi-stream {
enabled = {{ $ENABLE_MULTI_STREAM }}
}
http-servers { http-servers {
private { private {
host = 0.0.0.0 host = 0.0.0.0

6
web/rootfs/defaults/settings-config.js
View File

@@ -22,6 +22,7 @@
{{ $ENABLE_TCC := .Env.ENABLE_TCC | default "true" | toBool -}} {{ $ENABLE_TCC := .Env.ENABLE_TCC | default "true" | toBool -}}
{{ $ENABLE_TRANSCRIPTIONS := .Env.ENABLE_TRANSCRIPTIONS | default "false" | toBool -}} {{ $ENABLE_TRANSCRIPTIONS := .Env.ENABLE_TRANSCRIPTIONS | default "false" | toBool -}}
{{ $ENABLE_JAAS_COMPONENTS := .Env.ENABLE_JAAS_COMPONENTS | default "0" | toBool }} {{ $ENABLE_JAAS_COMPONENTS := .Env.ENABLE_JAAS_COMPONENTS | default "0" | toBool }}
{{ $ENABLE_MULTI_STREAM := .Env.ENABLE_MULTI_STREAM | default "0" | toBool }}
{{ $HIDE_PREJOIN_DISPLAY_NAME := .Env.HIDE_PREJOIN_DISPLAY_NAME | default "false" | toBool -}} {{ $HIDE_PREJOIN_DISPLAY_NAME := .Env.HIDE_PREJOIN_DISPLAY_NAME | default "false" | toBool -}}
{{ $PUBLIC_URL := .Env.PUBLIC_URL | default "https://localhost:8443" -}} {{ $PUBLIC_URL := .Env.PUBLIC_URL | default "https://localhost:8443" -}}
{{ $RESOLUTION := .Env.RESOLUTION | default "720" -}} {{ $RESOLUTION := .Env.RESOLUTION | default "720" -}}
@@ -70,6 +71,11 @@ config.startWithVideoMuted = {{ $START_WITH_VIDEO_MUTED }};
config.startBitrate = '{{ .Env.START_BITRATE }}'; config.startBitrate = '{{ .Env.START_BITRATE }}';
{{ end -}} {{ end -}}
if (!config.hasOwnProperty('flags')) config.flags = {};
config.flags.sourceNameSignaling = {{ $ENABLE_MULTI_STREAM }};
config.flags.sendMultipleVideoStreams = {{ $ENABLE_MULTI_STREAM }};
// ScreenShare Configuration. // ScreenShare Configuration.
// //
config.desktopSharingFrameRate = { min: {{ $DESKTOP_SHARING_FRAMERATE_MIN }}, max: {{ $DESKTOP_SHARING_FRAMERATE_MAX }} }; config.desktopSharingFrameRate = { min: {{ $DESKTOP_SHARING_FRAMERATE_MIN }}, max: {{ $DESKTOP_SHARING_FRAMERATE_MAX }} };