Remove legacy signaling and legacy SS mode. (jitsi#12499)

* fix(connection-status): remove unused participant connectionStatus. Always use trackStreamingStatus now that legacy endpoint based signaling has been removed. * remove the check for source-name signaling. Default to source-name signaling always. * Remove the check for multi-stream mode. Make that the default mode and remove the support for legacy SS mode. * Remove presenter mode. * update latest@lib-jitsi-meet
chipechop · Nov 8, 2022 · f3e4c57 · f3e4c57
1 parent 1731d51
commit f3e4c57
Show file tree

Hide file tree

Showing 61 changed files with 299 additions and 1,698 deletions.
diff --git a/conference.js b/conference.js
diff --git a/config.js b/config.js
@@ -79,15 +79,6 @@ var config = {
         // This is useful when the client runs on a host with limited resources.
         // noAutoPlayVideo: false,
 
-        // Enable / disable 500 Kbps bitrate cap on desktop tracks. When enabled,
-        // simulcast is turned off for the desktop share. If presenter is turned
-        // on while screensharing is in progress, the max bitrate is automatically
-        // adjusted to 2.5 Mbps. This takes a value between 0 and 1 which determines
-        // the probability for this to be enabled. This setting has been deprecated.
-        // desktopSharingFrameRate.max now determines whether simulcast will be enabled
-        // or disabled for the screenshare.
-        // capScreenshareBitrate: 1, // 0 to disable - deprecated.
-
         // Whether to use fake constraints (height: 99999, width: 99999) when calling getDisplayMedia on
         // Chromium based browsers. This is intended as a workaround for
         // https://bugs.chromium.org/p/chromium/issues/detail?id=1056311
@@ -99,20 +90,6 @@ var config = {
         // callStatsThreshold: 5, // enable callstats for 5% of the users.
     },
 
-    // Feature Flags.
-    flags: {
-        // Enables source names in the signaling.
-        // sourceNameSignaling: false,
-
-        // Enables sending multiple video streams, i.e., camera and desktop tracks can be shared in the conference
-        // separately as two different streams instead of one composite stream.
-        // sendMultipleVideoStreams: false,
-
-        // Signal that this client supports receiving multiple video streams. Without this flag jicofo will enable
-        // multi-stream backward compatibility.
-        // receiveMultipleVideoStreams: true,
-    },
-
     // Disables moderator indicators.
     // disableModeratorIndicator: false,
 
@@ -523,9 +500,6 @@ var config = {
     //        720: 'high',
     //    },
     //
-    //    // Provides a way to resize the desktop track to 720p (if it is greater than 720p) before creating a canvas
-    //    // for the presenter mode (camera picture-in-picture mode with screenshare).
-    //    resizeDesktopForPresenter: false,
     // },
 
     // Notification timeouts

diff --git a/modules/UI/videolayout/LargeVideoManager.js b/modules/UI/videolayout/LargeVideoManager.js
@@ -10,10 +10,6 @@ import { Provider } from 'react-redux';
 import { createScreenSharingIssueEvent, sendAnalytics } from '../../../react/features/analytics';
 import { Avatar } from '../../../react/features/base/avatar';
 import theme from '../../../react/features/base/components/themes/participantsPaneTheme.json';
-import {
-    getMultipleVideoSupportFeatureFlag,
-    getSourceNameSignalingFeatureFlag
-} from '../../../react/features/base/config';
 import { i18next } from '../../../react/features/base/i18n';
 import { JitsiTrackEvents } from '../../../react/features/base/lib-jitsi-meet';
 import { VIDEO_TYPE } from '../../../react/features/base/media';
@@ -29,9 +25,6 @@ import {
 } from '../../../react/features/base/tracks';
 import { CHAT_SIZE } from '../../../react/features/chat';
 import {
-    isParticipantConnectionStatusActive,
-    isParticipantConnectionStatusInactive,
-    isParticipantConnectionStatusInterrupted,
     isTrackStreamingStatusActive,
     isTrackStreamingStatusInactive,
     isTrackStreamingStatusInterrupted
@@ -161,19 +154,16 @@ export default class LargeVideoManager {
      * @returns {void}
      */
     destroy() {
-        this.videoContainer.removeResizeListener(
-            this._onVideoResolutionUpdate);
-
-        if (getSourceNameSignalingFeatureFlag(APP.store.getState())) {
-            // Remove track streaming status listener.
-            // TODO: when this class is converted to a function react component,
-            // use a custom hook to update a local track streaming status.
-            if (this.videoTrack && !this.videoTrack.local) {
-                this.videoTrack.jitsiTrack.off(JitsiTrackEvents.TRACK_STREAMING_STATUS_CHANGED,
-                    this.handleTrackStreamingStatusChanged);
-                APP.store.dispatch(trackStreamingStatusChanged(this.videoTrack.jitsiTrack,
-                    this.videoTrack.jitsiTrack.getTrackStreamingStatus()));
-            }
+        this.videoContainer.removeResizeListener(this._onVideoResolutionUpdate);
+
+        // Remove track streaming status listener.
+        // TODO: when this class is converted to a function react component,
+        // use a custom hook to update a local track streaming status.
+        if (this.videoTrack && !this.videoTrack.local) {
+            this.videoTrack.jitsiTrack.off(JitsiTrackEvents.TRACK_STREAMING_STATUS_CHANGED,
+                this.handleTrackStreamingStatusChanged);
+            APP.store.dispatch(trackStreamingStatusChanged(this.videoTrack.jitsiTrack,
+                this.videoTrack.jitsiTrack.getTrackStreamingStatus()));
         }
 
         this.removePresenceLabel();
@@ -263,58 +253,47 @@ export default class LargeVideoManager {
             const isVideoMuted = !stream || stream.isMuted();
             const state = APP.store.getState();
             const participant = getParticipantById(state, id);
-            const connectionStatus = participant?.connectionStatus;
-
-            let isVideoRenderable;
-
-            if (getSourceNameSignalingFeatureFlag(state)) {
-                const videoTrack = getVideoTrackByParticipant(state, participant);
-
-                // Remove track streaming status listener from the old track and add it to the new track,
-                // in order to stop updating track streaming status for the old track and start it for the new track.
-                // TODO: when this class is converted to a function react component,
-                // use a custom hook to update a local track streaming status.
-                if (this.videoTrack?.jitsiTrack?.getSourceName() !== videoTrack?.jitsiTrack?.getSourceName()) {
-                    if (this.videoTrack && !this.videoTrack.local) {
-                        this.videoTrack.jitsiTrack.off(JitsiTrackEvents.TRACK_STREAMING_STATUS_CHANGED,
-                            this.handleTrackStreamingStatusChanged);
-                        APP.store.dispatch(trackStreamingStatusChanged(this.videoTrack.jitsiTrack,
-                            this.videoTrack.jitsiTrack.getTrackStreamingStatus()));
-                    }
+            const videoTrack = getVideoTrackByParticipant(state, participant);
 
-                    this.videoTrack = videoTrack;
+            // Remove track streaming status listener from the old track and add it to the new track,
+            // in order to stop updating track streaming status for the old track and start it for the new track.
+            // TODO: when this class is converted to a function react component,
+            // use a custom hook to update a local track streaming status.
+            if (this.videoTrack?.jitsiTrack?.getSourceName() !== videoTrack?.jitsiTrack?.getSourceName()) {
+                if (this.videoTrack && !this.videoTrack.local) {
+                    this.videoTrack.jitsiTrack.off(JitsiTrackEvents.TRACK_STREAMING_STATUS_CHANGED,
+                        this.handleTrackStreamingStatusChanged);
+                    APP.store.dispatch(trackStreamingStatusChanged(this.videoTrack.jitsiTrack,
+                        this.videoTrack.jitsiTrack.getTrackStreamingStatus()));
+                }
 
-                    if (this.videoTrack && !this.videoTrack.local) {
-                        this.videoTrack.jitsiTrack.on(JitsiTrackEvents.TRACK_STREAMING_STATUS_CHANGED,
-                            this.handleTrackStreamingStatusChanged);
-                        APP.store.dispatch(trackStreamingStatusChanged(this.videoTrack.jitsiTrack,
-                            this.videoTrack.jitsiTrack.getTrackStreamingStatus()));
-                    }
+                this.videoTrack = videoTrack;
+
+                if (this.videoTrack && !this.videoTrack.local) {
+                    this.videoTrack.jitsiTrack.on(JitsiTrackEvents.TRACK_STREAMING_STATUS_CHANGED,
+                        this.handleTrackStreamingStatusChanged);
+                    APP.store.dispatch(trackStreamingStatusChanged(this.videoTrack.jitsiTrack,
+                        this.videoTrack.jitsiTrack.getTrackStreamingStatus()));
                 }
-                const streamingStatusActive = isTrackStreamingStatusActive(videoTrack);
-
-                isVideoRenderable = !isVideoMuted
-                    && (APP.conference.isLocalId(id)
-                        || isLocalScreenshareParticipant(participant)
-                        || streamingStatusActive
-                    );
-                this.videoTrack?.jitsiTrack?.getVideoType() === VIDEO_TYPE.DESKTOP
-                    && logger.debug(`Remote track ${videoTrack?.jitsiTrack}, isVideoMuted=${isVideoMuted},`
-                    + ` streamingStatusActive=${streamingStatusActive}, isVideoRenderable=${isVideoRenderable}`);
-            } else {
-                isVideoRenderable = !isVideoMuted
-                    && (APP.conference.isLocalId(id) || isParticipantConnectionStatusActive(participant));
             }
+            const streamingStatusActive = isTrackStreamingStatusActive(videoTrack);
+            const isVideoRenderable = !isVideoMuted
+                && (APP.conference.isLocalId(id)
+                    || isLocalScreenshareParticipant(participant)
+                    || streamingStatusActive
+                );
+
+            this.videoTrack?.jitsiTrack?.getVideoType() === VIDEO_TYPE.DESKTOP
+                && logger.debug(`Remote track ${videoTrack?.jitsiTrack}, isVideoMuted=${isVideoMuted},`
+                + ` streamingStatusActive=${streamingStatusActive}, isVideoRenderable=${isVideoRenderable}`);
 
             const isAudioOnly = APP.conference.isAudioOnly();
 
             // Multi-stream is not supported on plan-b endpoints even if its is enabled via config.js. A virtual
             // screenshare tile is still created when a remote endpoint starts screenshare to keep the behavior
             // consistent and an avatar is displayed on the original participant thumbnail as long as screenshare is in
             // progress.
-            const legacyScreenshare = getMultipleVideoSupportFeatureFlag(state)
-                                        && videoType === VIDEO_TYPE.DESKTOP
-                                        && !isScreenShareParticipant(participant);
+            const legacyScreenshare = videoType === VIDEO_TYPE.DESKTOP && !isScreenShareParticipant(participant);
 
             const showAvatar
                 = isVideoContainer
@@ -345,7 +324,6 @@ export default class LargeVideoManager {
                         // send the event
                         sendAnalytics(createScreenSharingIssueEvent({
                             source: 'large-video',
-                            connectionStatus,
                             isVideoMuted,
                             isAudioOnly,
                             isVideoContainer,
@@ -366,15 +344,7 @@ export default class LargeVideoManager {
                 this.updateLargeVideoAudioLevel(0);
             }
 
-            let messageKey;
-
-            if (getSourceNameSignalingFeatureFlag(state)) {
-                const videoTrack = getVideoTrackByParticipant(state, participant);
-
-                messageKey = isTrackStreamingStatusInactive(videoTrack) ? 'connection.LOW_BANDWIDTH' : null;
-            } else {
-                messageKey = isParticipantConnectionStatusInactive(participant) ? 'connection.LOW_BANDWIDTH' : null;
-            }
+            const messageKey = isTrackStreamingStatusInactive(videoTrack) ? 'connection.LOW_BANDWIDTH' : null;
 
             // Do not show connection status message in the audio only mode,
             // because it's based on the video playback status.
@@ -620,20 +590,11 @@ export default class LargeVideoManager {
         if (typeof show !== 'boolean') {
             const participant = getParticipantById(APP.store.getState(), this.id);
             const state = APP.store.getState();
+            const videoTrack = getVideoTrackByParticipant(state, participant);
 
-            if (getSourceNameSignalingFeatureFlag(state)) {
-                const videoTrack = getVideoTrackByParticipant(state, participant);
-
-                // eslint-disable-next-line no-param-reassign
-                show = !APP.conference.isLocalId(this.id)
-                    && (isTrackStreamingStatusInterrupted(videoTrack)
-                        || isTrackStreamingStatusInactive(videoTrack));
-            } else {
-                // eslint-disable-next-line no-param-reassign
-                show = !APP.conference.isLocalId(this.id)
-                    && (isParticipantConnectionStatusInterrupted(participant)
-                        || isParticipantConnectionStatusInactive(participant));
-            }
+            // eslint-disable-next-line no-param-reassign
+            show = !APP.conference.isLocalId(this.id)
+                && (isTrackStreamingStatusInterrupted(videoTrack) || isTrackStreamingStatusInactive(videoTrack));
         }
 
         if (show) {

diff --git a/modules/UI/videolayout/VideoLayout.js b/modules/UI/videolayout/VideoLayout.js
@@ -2,17 +2,15 @@
 
 import Logger from '@jitsi/logger';
 
-import { getMultipleVideoSupportFeatureFlag } from '../../../react/features/base/config';
 import { MEDIA_TYPE, VIDEO_TYPE } from '../../../react/features/base/media';
 import {
     getParticipantById,
     getPinnedParticipant,
-    isScreenShareParticipant,
     isScreenShareParticipantById
 } from '../../../react/features/base/participants';
 import {
     getTrackByMediaTypeAndParticipant,
-    getVirtualScreenshareParticipantTrack
+    getVideoTrackByParticipant
 } from '../../../react/features/base/tracks';
 
 import LargeVideoManager from './LargeVideoManager';
@@ -98,7 +96,7 @@ const VideoLayout = {
             return VIDEO_TYPE.CAMERA;
         }
 
-        if (getMultipleVideoSupportFeatureFlag(state) && isScreenShare) {
+        if (isScreenShare) {
             return VIDEO_TYPE.DESKTOP;
         }
 
@@ -113,23 +111,6 @@ const VideoLayout = {
         return id || null;
     },
 
-    /**
-     * Shows/hides warning about a user's connectivity issues.
-     *
-     * @param {string} id - The ID of the remote participant(MUC nickname).
-     * @returns {void}
-     */
-    onParticipantConnectionStatusChanged(id) {
-        if (APP.conference.isLocalId(id)) {
-
-            return;
-        }
-
-        // We have to trigger full large video update to transition from
-        // avatar to video on connectivity restored.
-        this._updateLargeVideoIfDisplayed(id, true);
-    },
-
     /**
      * On last N change event.
      *
@@ -189,16 +170,7 @@ const VideoLayout = {
         const isOnLarge = this.isCurrentlyOnLarge(id);
         const state = APP.store.getState();
         const participant = getParticipantById(state, id);
-        const tracks = state['features/base/tracks'];
-
-        let videoTrack;
-
-        if (getMultipleVideoSupportFeatureFlag(state) && isScreenShareParticipant(participant)) {
-            videoTrack = getVirtualScreenshareParticipantTrack(tracks, id);
-        } else {
-            videoTrack = getTrackByMediaTypeAndParticipant(tracks, MEDIA_TYPE.VIDEO, id);
-        }
-
+        const videoTrack = getVideoTrackByParticipant(state, participant);
         const videoStream = videoTrack?.jitsiTrack;
 
         if (videoStream && forceStreamToReattach) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -79,7 +79,7 @@
     "js-md5": "0.6.1",
     "js-sha512": "0.8.0",
     "jwt-decode": "2.2.0",
-    "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1530.0.0+f2af389e/lib-jitsi-meet.tgz",
+    "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1533.0.0+7b257686/lib-jitsi-meet.tgz",
     "lodash": "4.17.21",
     "moment": "2.29.4",
     "moment-duration-format": "2.2.2",

diff --git a/react/features/analytics/middleware.ts b/react/features/analytics/middleware.ts
@@ -159,10 +159,9 @@ MiddlewareRegistry.register(store => next => action => {
         const state = getState();
         const { localTracksDuration } = state['features/analytics'];
 
-        if (localTracksDuration.conference.startedTime === -1 || action.mediaType === 'presenter') {
+        if (localTracksDuration.conference.startedTime === -1) {
             // We don't want to track the media duration if the conference is not joined yet because otherwise we won't
             // be able to compare them with the conference duration (from conference join to conference will leave).
-            // Also, do not track media duration for presenter tracks.
             break;
         }
         dispatch({

diff --git a/react/features/app/functions.any.ts b/react/features/app/functions.any.ts
@@ -1,7 +1,7 @@
 import { IStateful } from '../base/app/types';
 import { MEDIA_TYPE } from '../base/media/constants';
 import { toState } from '../base/redux/functions';
-import { isLocalCameraTrackMuted, isLocalTrackMuted } from '../base/tracks/functions';
+import { isLocalTrackMuted } from '../base/tracks/functions';
 import { addHashParamsToURL } from '../base/util/uri';
 
 /**
@@ -14,7 +14,7 @@ import { addHashParamsToURL } from '../base/util/uri';
 export function addTrackStateToURL(url: string, stateful: IStateful) {
     const state = toState(stateful);
     const tracks = state['features/base/tracks'];
-    const isVideoMuted = isLocalCameraTrackMuted(tracks);
+    const isVideoMuted = isLocalTrackMuted(tracks, MEDIA_TYPE.VIDEO);
     const isAudioMuted = isLocalTrackMuted(tracks, MEDIA_TYPE.AUDIO);
 
     return addHashParamsToURL(new URL(url), { // use new URL object in order to not pollute the passed parameter.

diff --git a/react/features/av-moderation/constants.ts b/react/features/av-moderation/constants.ts
@@ -26,6 +26,5 @@ export const CS_MODERATION_NOTIFICATION_ID = 'screensharing-moderation';
 export const MODERATION_NOTIFICATIONS = {
     [MEDIA_TYPE.AUDIO]: AUDIO_MODERATION_NOTIFICATION_ID,
     [MEDIA_TYPE.SCREENSHARE]: CS_MODERATION_NOTIFICATION_ID,
-    [MEDIA_TYPE.VIDEO]: VIDEO_MODERATION_NOTIFICATION_ID,
-    [MEDIA_TYPE.PRESENTER]: CS_MODERATION_NOTIFICATION_ID
+    [MEDIA_TYPE.VIDEO]: VIDEO_MODERATION_NOTIFICATION_ID
 };