diff --git a/interface_config.js b/interface_config.js index b0b8e78bd..bb02e3f6b 100644 --- a/interface_config.js +++ b/interface_config.js @@ -5,6 +5,12 @@ var interfaceConfig = { // methods allowing to use variables both in css and js. DEFAULT_BACKGROUND: '#474747', + /** + * Whether or not the blurred video background for large video should be + * displayed on browsers that can support it. + */ + DISABLE_VIDEO_BACKGROUND: false, + INITIAL_TOOLBAR_TIMEOUT: 20000, TOOLBAR_TIMEOUT: 4000, TOOLBAR_ALWAYS_VISIBLE: false, @@ -142,17 +148,7 @@ var interfaceConfig = { * * @type {boolean} */ - 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' + VIDEO_QUALITY_LABEL_DISABLED: false /** * Specify custom URL for downloading android mobile app. diff --git a/modules/UI/videolayout/VideoContainer.js b/modules/UI/videolayout/VideoContainer.js index e323b16eb..271022cf9 100644 --- a/modules/UI/videolayout/VideoContainer.js +++ b/modules/UI/videolayout/VideoContainer.js @@ -7,8 +7,7 @@ import ReactDOM from 'react-dom'; import { browser } from '../../../react/features/base/lib-jitsi-meet'; import { ORIENTATION, - LargeVideoBackground, - LargeVideoBackgroundCanvas + LargeVideoBackground } from '../../../react/features/large-video'; /* eslint-enable no-unused-vars */ @@ -689,21 +688,17 @@ export class VideoContainer extends LargeContainer { */ _updateBackground() { // Do not the background display on browsers that might experience - // performance issues from the presence of the background. - if (interfaceConfig._BACKGROUND_BLUR === 'off' + // performance issues from the presence of the background or if + // explicitly disabled. + if (interfaceConfig.DISABLE_VIDEO_BACKGROUND || browser.isFirefox() || browser.isSafariWithWebrtc() || browser.isTemasysPluginUsed()) { return; } - // eslint-disable-next-line no-unused-vars - const Background = interfaceConfig._BACKGROUND_BLUR === 'canvas' - ? LargeVideoBackgroundCanvas - : LargeVideoBackground; - ReactDOM.render( -