From 1cba0b580318e077ca2e2385ead0858875dba67d Mon Sep 17 00:00:00 2001 From: Jaya Allamsetty Date: Wed, 10 Jan 2024 17:22:28 -0500 Subject: [PATCH] web: Fix the maxbitrates config setting. Also, remove the 'enforcePreferredCodec' setting which is no longer supported. --- docker-compose.yml | 5 ++- web/rootfs/defaults/settings-config.js | 61 ++++++++++++++++++-------- 2 files changed, 47 insertions(+), 19 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index dd3b35c..39fc548 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -141,16 +141,19 @@ services: - VIDEOQUALITY_BITRATE_H264_LOW - VIDEOQUALITY_BITRATE_H264_STANDARD - VIDEOQUALITY_BITRATE_H264_HIGH + - VIDEOQUALITY_BITRATE_H264_SS_HIGH - VIDEOQUALITY_BITRATE_VP8_LOW - VIDEOQUALITY_BITRATE_VP8_STANDARD - VIDEOQUALITY_BITRATE_VP8_HIGH + - VIDEOQUALITY_BITRATE_VP8_SS_HIGH - VIDEOQUALITY_BITRATE_VP9_LOW - VIDEOQUALITY_BITRATE_VP9_STANDARD - VIDEOQUALITY_BITRATE_VP9_HIGH + - VIDEOQUALITY_BITRATE_VP9_SS_HIGH - VIDEOQUALITY_BITRATE_AV1_LOW - VIDEOQUALITY_BITRATE_AV1_STANDARD - VIDEOQUALITY_BITRATE_AV1_HIGH - - VIDEOQUALITY_ENFORCE_PREFERRED_CODEC + - VIDEOQUALITY_BITRATE_AV1_SS_HIGH - VIDEOQUALITY_PREFERRED_CODEC - XMPP_AUTH_DOMAIN - XMPP_BOSH_URL_BASE diff --git a/web/rootfs/defaults/settings-config.js b/web/rootfs/defaults/settings-config.js index 5deb8b7..a11d8b6 100644 --- a/web/rootfs/defaults/settings-config.js +++ b/web/rootfs/defaults/settings-config.js @@ -50,7 +50,6 @@ {{ $XMPP_DOMAIN := .Env.XMPP_DOMAIN | default "meet.jitsi" -}} {{ $XMPP_RECORDER_DOMAIN := .Env.XMPP_RECORDER_DOMAIN | default "recorder.meet.jitsi" -}} {{ $DISABLE_DEEP_LINKING := .Env.DISABLE_DEEP_LINKING | default "false" | toBool -}} -{{ $VIDEOQUALITY_ENFORCE_PREFERRED_CODEC := .Env.VIDEOQUALITY_ENFORCE_PREFERRED_CODEC | default "false" | toBool -}} {{ $DISABLE_POLLS := .Env.DISABLE_POLLS | default "false" | toBool -}} {{ $DISABLE_REACTIONS := .Env.DISABLE_REACTIONS | default "false" | toBool -}} {{ $DISABLE_REMOTE_VIDEO_MENU := .Env.DISABLE_REMOTE_VIDEO_MENU | default "false" | toBool -}} @@ -406,30 +405,56 @@ config.disableDeepLinking = {{ $DISABLE_DEEP_LINKING }}; config.p2p.preferredCodec = '{{ .Env.P2P_PREFERRED_CODEC }}'; {{ end -}} -// Enable preferred video Codec -if (!config.hasOwnProperty('videoQuality')) config.videoQuality = {}; +// Video quality settings. +// + +config.videoQuality = {}; {{ if .Env.VIDEOQUALITY_PREFERRED_CODEC -}} config.videoQuality.preferredCodec = '{{ .Env.VIDEOQUALITY_PREFERRED_CODEC }}'; {{ end -}} -config.videoQuality.enforcePreferredCodec = {{ $VIDEOQUALITY_ENFORCE_PREFERRED_CODEC }}; +{{ if and .Env.VIDEOQUALITY_BITRATE_AV1_LOW .Env.VIDEOQUALITY_BITRATE_AV1_STANDARD .Env.VIDEOQUALITY_BITRATE_AV1_HIGH .Env.VIDEOQUALITY_BITRATE_AV1_SS_HIGH -}} +config.videoQuality.av1 = { + maxBitratesVideo: { + low: {{ .Env.VIDEOQUALITY_BITRATE_AV1_LOW }}, + standard: {{ .Env.VIDEOQUALITY_BITRATE_AV1_STANDARD }}, + high: {{ .Env.VIDEOQUALITY_BITRATE_AV1_HIG }}, + ssHigh: {{ .Env.VIDEOQUALITY_BITRATE_AV1_SS_HIGH }} + } +} +{{ end -}} -if (!config.videoQuality.hasOwnProperty('maxBitratesVideo')) config.videoQuality.maxBitratesVideo = null; -{{ if and .Env.VIDEOQUALITY_BITRATE_H264_LOW .Env.VIDEOQUALITY_BITRATE_H264_STANDARD .Env.VIDEOQUALITY_BITRATE_H264_HIGH -}} -config.videoQuality.maxBitratesVideo = config.videoQuality.maxBitratesVideo || {} -config.videoQuality.maxBitratesVideo.H264 = { low: {{ .Env.VIDEOQUALITY_BITRATE_H264_LOW }}, standard: {{ .Env.VIDEOQUALITY_BITRATE_H264_STANDARD }}, high: {{ .Env.VIDEOQUALITY_BITRATE_H264_HIGH }} }; +{{ if and .Env.VIDEOQUALITY_BITRATE_H264_LOW .Env.VIDEOQUALITY_BITRATE_H264_STANDARD .Env.VIDEOQUALITY_BITRATE_H264_HIGH .Env.VIDEOQUALITY_BITRATE_H264_SS_HIGH -}} +config.videoQuality.h264 = { + maxBitratesVideo: { + low: {{ .Env.VIDEOQUALITY_BITRATE_H264_LOW }}, + standard: {{ .Env.VIDEOQUALITY_BITRATE_H264_STANDARD }}, + high: {{ .Env.VIDEOQUALITY_BITRATE_H264_HIGH }}, + ssHigh: {{ .Env.VIDEOQUALITY_BITRATE_H264_SS_HIGH }} + } +} {{ end -}} -{{ if and .Env.VIDEOQUALITY_BITRATE_VP8_LOW .Env.VIDEOQUALITY_BITRATE_VP8_STANDARD .Env.VIDEOQUALITY_BITRATE_VP8_HIGH -}} -config.videoQuality.maxBitratesVideo = config.videoQuality.maxBitratesVideo || {} -config.videoQuality.maxBitratesVideo.VP8 = { low: {{ .Env.VIDEOQUALITY_BITRATE_VP8_LOW }}, standard: {{ .Env.VIDEOQUALITY_BITRATE_VP8_STANDARD }}, high: {{ .Env.VIDEOQUALITY_BITRATE_VP8_HIGH }} }; + +{{ if and .Env.VIDEOQUALITY_BITRATE_VP8_LOW .Env.VIDEOQUALITY_BITRATE_VP8_STANDARD .Env.VIDEOQUALITY_BITRATE_VP8_HIGH .Env.VIDEOQUALITY_BITRATE_VP8_SS_HIGH -}} +config.videoQuality.vp8 = { + maxBitratesVideo: { + low: {{ .Env.VIDEOQUALITY_BITRATE_VP8_LOW }}, + standard: {{ .Env.VIDEOQUALITY_BITRATE_VP8_STANDARD }}, + high: {{ .Env.VIDEOQUALITY_BITRATE_VP8_HIGH }}, + ssHigh: {{ .Env.VIDEOQUALITY_BITRATE_VP8_SS_HIGH }} + } +} {{ end -}} -{{ if and .Env.VIDEOQUALITY_BITRATE_VP9_LOW .Env.VIDEOQUALITY_BITRATE_VP9_STANDARD .Env.VIDEOQUALITY_BITRATE_VP9_HIGH -}} -config.videoQuality.maxBitratesVideo = config.videoQuality.maxBitratesVideo || {} -config.videoQuality.maxBitratesVideo.VP9 = { low: {{ .Env.VIDEOQUALITY_BITRATE_VP9_LOW }}, standard: {{ .Env.VIDEOQUALITY_BITRATE_VP9_STANDARD }}, high: {{ .Env.VIDEOQUALITY_BITRATE_VP9_HIGH }} }; -{{ end -}} -{{ if and .Env.VIDEOQUALITY_BITRATE_AV1_LOW .Env.VIDEOQUALITY_BITRATE_AV1_STANDARD .Env.VIDEOQUALITY_BITRATE_AV1_HIGH -}} -config.videoQuality.maxBitratesVideo = config.videoQuality.maxBitratesVideo || {} -config.videoQuality.maxBitratesVideo.AV1 = { low: {{ .Env.VIDEOQUALITY_BITRATE_AV1_LOW }}, standard: {{ .Env.VIDEOQUALITY_BITRATE_AV1_STANDARD }}, high: {{ .Env.VIDEOQUALITY_BITRATE_AV1_HIGH }} }; + +{{ if and .Env.VIDEOQUALITY_BITRATE_VP9_LOW .Env.VIDEOQUALITY_BITRATE_VP9_STANDARD .Env.VIDEOQUALITY_BITRATE_VP9_HIGH .Env.VIDEOQUALITY_BITRATE_VP9_SS_HIGH -}} +config.videoQuality.vp9 = { + maxBitratesVideo: { + low: {{ .Env.VIDEOQUALITY_BITRATE_VP9_LOW }}, + standard: {{ .Env.VIDEOQUALITY_BITRATE_VP9_STANDARD }}, + high: {{ .Env.VIDEOQUALITY_BITRATE_VP9_HIGH }}, + ssHigh: {{ .Env.VIDEOQUALITY_BITRATE_VP9_SS_HIGH }} + } +} {{ end -}} // Reactions