From 9adeab8039d4ad0bed2e5e7385feeb9c977f7e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Tue, 17 Jul 2018 10:39:54 +0200 Subject: [PATCH] web: update config.js and interface_config.js --- web/rootfs/defaults/config.js | 51 +++++++++++++++---------- web/rootfs/defaults/interface_config.js | 26 +++++++++---- 2 files changed, 48 insertions(+), 29 deletions(-) diff --git a/web/rootfs/defaults/config.js b/web/rootfs/defaults/config.js index f2e2084..0614861 100644 --- a/web/rootfs/defaults/config.js +++ b/web/rootfs/defaults/config.js @@ -57,6 +57,9 @@ var config = { // P2P test mode disables automatic switching to P2P when there are 2 // participants in the conference. p2pTestMode: false + + // Enables the test specific features consumed by jitsi-meet-torture + // testMode: false }, // Disables ICE/UDP by filtering out local and remote UDP candidates in @@ -111,6 +114,11 @@ var config = { // Enable / disable simulcast support. // disableSimulcast: false, + // Enable / disable layer suspension. If enabled, endpoints whose HD + // layers are not in use will be suspended (no longer sent) until they + // are requested again. + // enableLayerSuspension: false, + // Suspend sending video if bandwidth estimation is too low. This may cause // problems with audio playback. Disabled until these are fixed. disableSuspendVideo: true, @@ -150,23 +158,9 @@ var config = { // Required version of Chrome extension desktopSharingChromeMinExtVersion: '0.1', - // The ID of the jidesha extension for Firefox. If null, we assume that no - // extension is required. - desktopSharingFirefoxExtId: null, - // Whether desktop sharing should be disabled on Firefox. desktopSharingFirefoxDisabled: false, - // The maximum version of Firefox which requires a jidesha extension. - // Example: if set to 41, we will require the extension for Firefox versions - // up to and including 41. On Firefox 42 and higher, we will run without the - // extension. - // If set to -1, an extension will be required for all versions of Firefox. - desktopSharingFirefoxMaxVersionExtRequired: 51, - - // The URL to the Firefox extension for desktop sharing. - desktopSharingFirefoxExtensionURL: null, - // Optional desktop sharing frame rate options. Default value: min:5, max:5. // desktopSharingFrameRate: { // min: 5, @@ -178,11 +172,11 @@ var config = { // Recording - // Whether to enable recording or not. - // enableRecording: false, + // Whether to enable file recording or not. + // fileRecordingsEnabled: false, - // Type for recording: one of jibri or jirecon. - // recordingType: 'jibri', + // Whether to enable live streaming or not. + // liveStreamingEnabled: false, // Misc @@ -192,6 +186,23 @@ var config = { // Disables or enables RTX (RFC 4588) (defaults to false). // disableRtx: false, + // Disables or enables TCC (the default is in Jicofo and set to true) + // (draft-holmer-rmcat-transport-wide-cc-extensions-01). This setting + // affects congestion control, it practically enables send-side bandwidth + // estimations. + // enableTcc: true, + + // Disables or enables REMB (the default is in Jicofo and set to false) + // (draft-alvestrand-rmcat-remb-03). This setting affects congestion + // control, it practically enables recv-side bandwidth estimations. When + // both TCC and REMB are enabled, TCC takes precedence. When both are + // disabled, then bandwidth estimations are disabled. + // enableRemb: false, + + // Defines the minimum number of participants to start a call (the default + // is set in Jicofo and set to 2). + // minParticipants: 2, + // Use XEP-0215 to fetch STUN and TURN servers. // useStunTurn: true, @@ -333,11 +344,8 @@ var config = { // userRegion: "asia" } - // List of undocumented settings used in jitsi-meet /** - alwaysVisibleToolbar - autoEnableDesktopSharing autoRecord autoRecordToken debug @@ -353,6 +361,7 @@ var config = { etherpad_base externalConnectUrl firefox_fake_device + googleApiApplicationClientID iAmRecorder iAmSipGateway peopleSearchQueryTypes diff --git a/web/rootfs/defaults/interface_config.js b/web/rootfs/defaults/interface_config.js index 1cc57ff..5cc8772 100644 --- a/web/rootfs/defaults/interface_config.js +++ b/web/rootfs/defaults/interface_config.js @@ -13,6 +13,7 @@ var interfaceConfig = { DESKTOP_SHARING_BUTTON_DISABLED_TOOLTIP: null, INITIAL_TOOLBAR_TIMEOUT: 20000, TOOLBAR_TIMEOUT: 4000, + TOOLBAR_ALWAYS_VISIBLE: false, DEFAULT_REMOTE_DISPLAY_NAME: 'Fellow Jitster', DEFAULT_LOCAL_DISPLAY_NAME: 'me', SHOW_JITSI_WATERMARK: true, @@ -37,16 +38,15 @@ var interfaceConfig = { AUTHENTICATION_ENABLE: true, /** - * the toolbar buttons line is intentionally left in one line, to be able - * to easily override values or remove them using regex + * The name of the toolbar buttons to display in the toolbar. If present, + * the button will display. Exceptions are "livestreaming" and "recording" + * which also require being a moderator and some values in config.js to be + * enabled. Also, the "profile" button will not display for user's with a + * jwt. */ TOOLBAR_BUTTONS: [ - - // main toolbar 'microphone', 'camera', 'desktop', 'fullscreen', 'fodeviceselection', 'hangup', - - // extended toolbar - 'profile', 'info', 'chat', 'recording', 'etherpad', + 'profile', 'info', 'chat', 'recording', 'livestreaming', 'etherpad', 'sharedvideo', 'settings', 'raisehand', 'videoquality', 'filmstrip', 'invite', 'feedback', 'stats', 'shortcuts' ], @@ -148,7 +148,17 @@ var interfaceConfig = { * * @type {boolean} */ - VIDEO_QUALITY_LABEL_DISABLED: false + VIDEO_QUALITY_LABEL_DISABLED: false, + + /** + * Temporary feature flag to debug performance with the large video + * background blur. On initial implementation, blur was always enabled so a + * falsy value here will be used to keep blur enabled, as will the value + * "video", and will render the blur over a video element. The value + * "canvas" will display the blur over a canvas element, while the value + * "off" will prevent the background from rendering. + */ + _BACKGROUND_BLUR: 'canvas' /** * Specify custom URL for downloading android mobile app.