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

feat(web) Add defaults and env variables for codec preference. (#1978)

Browse Source 
* feat(web) Add defaults and env variables for codec preference.

* Update web/rootfs/defaults/settings-config.js

---------

Co-authored-by: Aaron van Meerten <aaron.van.meerten@gmail.com>
This commit is contained in:
Jaya Allamsetty
2024-12-11 15:03:49 -05:00
committed by GitHub
parent 6ae3414ff2
commit 95275454cf
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docker-compose.yml
View File

@@ -24,6 +24,10 @@ services:
- BRANDING_DATA_URL - BRANDING_DATA_URL
- BOSH_RELATIVE - BOSH_RELATIVE
- CHROME_EXTENSION_BANNER_JSON - CHROME_EXTENSION_BANNER_JSON
- CODEC_ORDER_JVB
- CODEC_ORDER_JVB_MOBILE
- CODEC_ORDER_P2P
- CODEC_ORDER_P2P_MOBILE
- COLIBRI_WEBSOCKET_PORT - COLIBRI_WEBSOCKET_PORT
- COLIBRI_WEBSOCKET_JVB_LOOKUP_NAME - COLIBRI_WEBSOCKET_JVB_LOOKUP_NAME
- COLIBRI_WEBSOCKET_REGEX - COLIBRI_WEBSOCKET_REGEX
@@ -57,6 +61,7 @@ services:
- DROPBOX_APPKEY - DROPBOX_APPKEY
- DROPBOX_REDIRECT_URI - DROPBOX_REDIRECT_URI
- DYNAMIC_BRANDING_URL - DYNAMIC_BRANDING_URL
- ENABLE_ADAPTIVE_MODE
- ENABLE_AUDIO_PROCESSING - ENABLE_AUDIO_PROCESSING
- ENABLE_AUTH - ENABLE_AUTH
- ENABLE_AUTH_DOMAIN - ENABLE_AUTH_DOMAIN

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

@@ -1,4 +1,5 @@
{{ $DEPLOYMENTINFO_USERREGION := .Env.DEPLOYMENTINFO_USERREGION | default "" -}} {{ $DEPLOYMENTINFO_USERREGION := .Env.DEPLOYMENTINFO_USERREGION | default "" -}}
{{ $ENABLE_ADAPTIVE_MODE := .Env.ENABLE_ADAPTIVE_MODE | default "true" | toBool -}}
{{ $ENABLE_AUDIO_PROCESSING := .Env.ENABLE_AUDIO_PROCESSING | default "true" | toBool -}} {{ $ENABLE_AUDIO_PROCESSING := .Env.ENABLE_AUDIO_PROCESSING | default "true" | toBool -}}
{{ $ENABLE_BREAKOUT_ROOMS := .Env.ENABLE_BREAKOUT_ROOMS | default "true" | toBool -}} {{ $ENABLE_BREAKOUT_ROOMS := .Env.ENABLE_BREAKOUT_ROOMS | default "true" | toBool -}}
{{ $ENABLE_CALENDAR := .Env.ENABLE_CALENDAR | default "false" | toBool -}} {{ $ENABLE_CALENDAR := .Env.ENABLE_CALENDAR | default "false" | toBool -}}
@@ -63,6 +64,10 @@
{{ $DISABLE_PROFILE := .Env.DISABLE_PROFILE | default "false" | toBool -}} {{ $DISABLE_PROFILE := .Env.DISABLE_PROFILE | default "false" | toBool -}}
{{ $ROOM_PASSWORD_DIGITS := .Env.ROOM_PASSWORD_DIGITS | default "false" -}} {{ $ROOM_PASSWORD_DIGITS := .Env.ROOM_PASSWORD_DIGITS | default "false" -}}
{{ $WHITEBOARD_ENABLED := or (.Env.WHITEBOARD_COLLAB_SERVER_PUBLIC_URL | default "" | toBool) (.Env.WHITEBOARD_COLLAB_SERVER_URL_BASE | default "" | toBool) }} {{ $WHITEBOARD_ENABLED := or (.Env.WHITEBOARD_COLLAB_SERVER_PUBLIC_URL | default "" | toBool) (.Env.WHITEBOARD_COLLAB_SERVER_URL_BASE | default "" | toBool) }}
{{ $CODEC_ORDER_JVB := .Env.CODEC_ORDER_JVB | default "[\"AV1\", \"VP9\", \"VP8\", \"H264\"]" -}}
{{ $CODEC_ORDER_JVB_MOBILE := .Env.CODEC_ORDER_JVB_MOBILE | default "[\"VP8\", \"VP9\", \"H264\", \"AV1\"]" -}}
{{ $CODEC_ORDER_P2P := .Env.CODEC_ORDER_JVB | default "[\"AV1\", \"VP9\", \"VP8\", \"H264\"]" -}}
{{ $CODEC_ORDER_P2P_MOBILE := .Env.CODEC_ORDER_JVB_MOBILE | default "[\"VP8\", \"VP9\", \"H264\", \"AV1\"]" -}}
// Video configuration. // Video configuration.
// //
@@ -125,7 +130,9 @@ config.enableNoisyMicDetection = {{ $ENABLE_NOISY_MIC_DETECTION }};
// //
config.p2p = { config.p2p = {
enabled: {{ $ENABLE_P2P }} enabled: {{ $ENABLE_P2P }};
codecPreferenceOrder: {{ $CODEC_ORDER_P2P }};
mobileCodecPreferenceOrder: {{ $CODEC_ORDER_P2P_MOBILE }}
}; };
@@ -405,6 +412,10 @@ config.p2p.preferredCodec = '{{ .Env.P2P_PREFERRED_CODEC }}';
// //
config.videoQuality = {}; config.videoQuality = {};
config.videoQuality.codecPreferenceOrder = {{ $CODEC_ORDER_JVB }};
config.videoQuality.mobileCodecPreferenceOrder = {{ $CODEC_ORDER_JVB_MOBILE }};
config.videoQuality.enableAdaptiveMode = {{ $ENABLE_ADAPTIVE_MODE }};
{{ if .Env.VIDEOQUALITY_PREFERRED_CODEC -}} {{ if .Env.VIDEOQUALITY_PREFERRED_CODEC -}}
config.videoQuality.preferredCodec = '{{ .Env.VIDEOQUALITY_PREFERRED_CODEC }}'; config.videoQuality.preferredCodec = '{{ .Env.VIDEOQUALITY_PREFERRED_CODEC }}';
{{ end -}} {{ end -}}
@@ -611,3 +622,8 @@ config.whiteboard.collabServerBaseUrl = 'https://eght-excalidraw-backend.cloudfl
{{ end -}} {{ end -}}
config.whiteboard.userLimit = 25; config.whiteboard.userLimit = 25;
{{ end -}} {{ end -}}
// Testing
config.testing = {
enableCodecSelectionAPI: true
};