From f78fb40f6431115aa8106c5d43a6de440578dff1 Mon Sep 17 00:00:00 2001 From: Cedric Roijakkers Date: Tue, 19 Dec 2023 11:41:33 +0100 Subject: [PATCH] Allow desktop framerate to be automatically determined by the browser (Fixes #1668) --- docker-compose.yml | 1 + web/rootfs/defaults/settings-config.js | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index e25752fd23..5819c3ef4a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -34,6 +34,7 @@ services: - DEPLOYMENTINFO_REGION - DEPLOYMENTINFO_SHARD - DEPLOYMENTINFO_USERREGION + - DESKTOP_SHARING_FRAMERATE_AUTO - DESKTOP_SHARING_FRAMERATE_MIN - DESKTOP_SHARING_FRAMERATE_MAX - DIALIN_NUMBERS_URL diff --git a/web/rootfs/defaults/settings-config.js b/web/rootfs/defaults/settings-config.js index be2d79f8d6..ed2c3ccb6a 100644 --- a/web/rootfs/defaults/settings-config.js +++ b/web/rootfs/defaults/settings-config.js @@ -47,6 +47,7 @@ {{ $ENABLE_NOISY_MIC_DETECTION := .Env.ENABLE_NOISY_MIC_DETECTION | default "true" | toBool -}} {{ $START_VIDEO_MUTED := .Env.START_VIDEO_MUTED | default 10 -}} {{ $START_WITH_VIDEO_MUTED := .Env.START_WITH_VIDEO_MUTED | default "false" | toBool -}} +{{ $DESKTOP_SHARING_FRAMERATE_AUTO := .Env.DESKTOP_SHARING_FRAMERATE_AUTO | default "true" | toBool -}} {{ $DESKTOP_SHARING_FRAMERATE_MIN := .Env.DESKTOP_SHARING_FRAMERATE_MIN | default 5 -}} {{ $DESKTOP_SHARING_FRAMERATE_MAX := .Env.DESKTOP_SHARING_FRAMERATE_MAX | default 5 -}} {{ $TESTING_OCTO_PROBABILITY := .Env.TESTING_OCTO_PROBABILITY | default "0" -}} @@ -92,11 +93,12 @@ config.flags.sourceNameSignaling = true; config.flags.sendMultipleVideoStreams = true; config.flags.receiveMultipleVideoStreams = true; - +{{ if not $DESKTOP_SHARING_FRAMERATE_AUTO }} // ScreenShare Configuration. // config.desktopSharingFrameRate = { min: {{ $DESKTOP_SHARING_FRAMERATE_MIN }}, max: {{ $DESKTOP_SHARING_FRAMERATE_MAX }} }; +{{ end }} // Audio configuration. //