fix(virtual-backgrounds) add segmentation model license information

Fixes: https://github.com/jitsi/jitsi-meet/issues/8792

ios/app/src/AppDelegate.m

@@ -35,6 +35,7 @@
 
     jitsiMeet.defaultConferenceOptions = [JitsiMeetConferenceOptions fromBuilder:^(JitsiMeetConferenceOptionsBuilder *builder) {
         [builder setFeatureFlag:@"resolution" withValue:@(360)];
+        [builder setFeatureFlag:@"ios.screensharing.enabled" withBoolean:YES];
         builder.serverURL = [NSURL URLWithString:@"https://meet.jit.si"];
         builder.welcomePageEnabled = YES;
 

lang/main-nl.json

@@ -204,9 +204,6 @@
         "done": "Gereed",
         "e2eeDescription": "Eind-tot-Eind-Versleuteling is momenteel EXPERIMENTEEL. Houd er rekening mee dat inschakelen van eind-tot-eind-versleuteling de door de server geleverde services zal uitschakelen zoals: opnemen, livestreamen en deelname via telefoon. Houd er ook rekening mee dat de vergadering alleen zal werken voor personen die deelnemen vanaf browsers met ondersteuning voor insertable streams.",
         "e2eeLabel": "Sleutel",
-        "e2eeNoKey": "Geen",
-        "e2eeToggleSet": "Sleutel instellen",
-        "e2eeSet": "Instellen",
         "e2eeWarning": "WAARSCHUWING: Niet alle deelnemers in deze vergadering lijken ondersteuning te hebben voor eind-tot-eind-versleuteling. Als u het inschakelt zullen zij u niet kunnen zien of horen.",
         "enterDisplayName": "Voer hier uw naam in",
         "error": "Fout",
@@ -268,7 +265,6 @@
         "readMore": "meer",
         "recording": "Opnemen",
         "recordingDisabledBecauseOfActiveLiveStreamingTooltip": "Niet mogelijk tijdens een livestream",
-        "recordingDisabledForGuestTooltip": "Gasten kunnen geen opnamen starten.",
         "recordingDisabledTooltip": "Opname starten uitgeschakeld.",
         "rejoinNow": "Nu opnieuw deelnemen",
         "remoteControlAllowedMessage": "{{user}} heeft uw verzoek om extern beheer geaccepteerd.",
@@ -301,7 +297,6 @@
         "shareVideoTitle": "Een video delen",
         "shareYourScreen": "Uw scherm delen",
         "shareYourScreenDisabled": "Schermdeling is uitgeschakeld.",
-        "shareYourScreenDisabledForGuest": "Gasten kunnen hun scherm niet delen.",
         "startLiveStreaming": "Livestream starten",
         "startRecording": "Opname starten",
         "startRemoteControlErrorMessage": "Er is een fout opgetreden tijdens het starten van de sessie van extern beheer.",
@@ -322,7 +317,6 @@
         "videoLink": "Video link",
         "WaitForHostMsg": "De vergadering <b>{{room}}</b> is nog niet gestart. Authenticeer uzelf als u de host bent. Anders wacht u tot de host aanwezig is.",
         "WaitForHostMsgWOk": "De vergadering <b>{{room}}</b> is nog niet gestart. Als u de host bent, drukt u op 'OK' om uzelf te authenticeren. Anders wacht u tot de host aanwezig is.",
-        "WaitingForHost": "Wachten op de host...",
         "Yes": "Ja",
         "yourEntireScreen": "Uw gehele scherm"
     },
@@ -420,8 +414,7 @@
         "toggleFilmstrip": "Videominiaturen weergeven of verbergen",
         "toggleScreensharing": "Wisselen tussen camera en schermdeling",
         "toggleShortcuts": "Sneltoetsen weergeven of verbergen",
-        "videoMute": "Uw camera starten of stoppen",
-        "videoQuality": "Kwaliteit van gesprek beheren"
+        "videoMute": "Uw camera starten of stoppen"
     },
     "liveStreaming": {
         "limitNotificationDescriptionWeb": "Vanwege een grote vraag zal uw stream beperkt worden tot {{limit}} min. Voor ongelimiteerd streamen, probeer <a href={{url}} rel='noopener noreferrer' target='_blank'>{{app}}</a>.",
@@ -701,7 +694,7 @@
             "chat": "Chatvenster in- of uitschakelen",
             "document": "Gedeeld document in- of uitschakelen",
             "download": "Download onze apps",
-            "e2ee": "Eind-tot-eind-versleuteling",
+            "embedMeeting": "Vergadering inbedden",
             "feedback": "Feedback achterlaten",
             "fullScreen": "Volledig scherm in- of uitschakelen",
             "grantModerator": "Moderatorrechten verlenen",
@@ -735,9 +728,10 @@
             "toggleCamera": "Camera wisselen",
             "toggleFilmstrip": "Filmstrip in- of uitschakelen",
             "videomute": "Video dempen in- of uitschakelen",
-            "videoblur": "Video vervagen in- of uitschakelen"
+            "selectBackground": "Achtergrond selecteren"
         },
         "addPeople": "Personen aan uw gesprek toevoegen",
+        "audioSettings": "Audio-instellingen",
         "audioOnlyOff": "Lage bandbreedte-modus uitschakelen",
         "audioOnlyOn": "Lage bandbreedte-modus inschakelen",
         "audioRoute": "Het afspeelapparaat selecteren",
@@ -749,6 +743,7 @@
         "documentOpen": "Gedeeld document openen",
         "download": "Download onze apps",
         "e2ee": "Eind-tot-eind-versleuteling",
+        "embedMeeting": "Vergadering inbedden",
         "enterFullScreen": "Volledig scherm weergeven",
         "enterTileView": "Tegelweergave openen",
         "exitFullScreen": "Volledig scherm sluiten",
@@ -766,6 +761,7 @@
         "moreOptions": "Meer opties",
         "mute": "Dempen / Dempen opheffen",
         "muteEveryone": "Iedereen dempen",
+        "muteEveryonesVideo": "Camera's van iedereen uitzetten",
         "noAudioSignalTitle": "Er komt geen invoer van uw microfoon!",
         "noAudioSignalDesc": "Als u niet met opzet hebt gedempt vanuit systeeminstellingen of hardware, overweeg dan van apparaat te wisselen.",
         "noAudioSignalDescSuggestion": "Als u niet met opzet hebt gedempt vanuit systeeminstellingen of hardware, overweeg dan over te schakelen naar het gesuggereerde apparaat.",
@@ -794,7 +790,8 @@
         "tileViewToggle": "Tegelweergave in- of uitschakelen",
         "toggleCamera": "Camera in- of uitschakelen",
         "videomute": "Camera starten / stoppen",
-        "startvideoblur": "Vervaag mijn achtergrond",
+        "videoSettings": "Instellingen van camera",
+        "selectBackground": "Achtergrond selecteren",
         "stopvideoblur": "Achtergrond vervagen uitschakelen"
     },
     "transcribing": {
@@ -843,8 +840,6 @@
         "ld": "LD",
         "ldTooltip": "U bekijkt video in lage resolutie",
         "lowDefinition": "Lage resolutie",
-        "onlyAudioAvailable": "Alleen audio is beschikbaar",
-        "onlyAudioSupported": "In deze browser wordt alleen audio ondersteund.",
         "sd": "SD",
         "sdTooltip": "U bekijkt video in standaard resolutie",
         "standardDefinition": "Standaard resolutie"
@@ -879,6 +874,8 @@
         "getHelp": "Hulp krijgen",
         "go": "GAAN",
         "goSmall": "GAAN",
+        "headerTitle": "Jitsi Meet",
+        "headerSubtitle": "Veilige vergaderingen van hoge kwaliteit",
         "info": "Informatie",
         "join": "AANMAKEN / DEELNEMEN",
         "moderatedMessage": "Of <a href=\"{{url}}\" rel=\"noopener noreferrer\" target=\"_blank\">boek een vergadering URL</a> van tevoren waar u de enige moderator bent.",
@@ -891,6 +888,7 @@
         "roomname": "Voer naam van ruimte in",
         "roomnameHint": "Voer de naam of URL in van de ruimte die u wilt betreden. U kunt een naam verzinnen, maar laat deze wel weten aan de andere deelnemers, zodat zij dezelfde naam invoeren.",
         "sendFeedback": "Feedback versturen",
+        "startMeeting": "Vergadering starten",
         "terms": "Voorwaarden",
         "title": "Veilige, volledig uitgeruste en geheel gratis videovergaderingen"
     },

package-lock.json

@@ -10513,8 +10513,8 @@
       }
     },
     "lib-jitsi-meet": {
-      "version": "github:jitsi/lib-jitsi-meet#2b94da12e81626c7b9deb24dd95f8ca2038a2f5a",
-      "from": "github:jitsi/lib-jitsi-meet#2b94da12e81626c7b9deb24dd95f8ca2038a2f5a",
+      "version": "github:jitsi/lib-jitsi-meet#cd53f249c532fdceb296c37facc4acc846677a9e",
+      "from": "github:jitsi/lib-jitsi-meet#cd53f249c532fdceb296c37facc4acc846677a9e",
       "requires": {
         "@jitsi/js-utils": "1.0.2",
         "@jitsi/sdp-interop": "1.0.3",

package.json

@@ -54,7 +54,7 @@
     "jquery-i18next": "1.2.1",
     "js-md5": "0.6.1",
     "jwt-decode": "2.2.0",
-    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#2b94da12e81626c7b9deb24dd95f8ca2038a2f5a",
+    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#cd53f249c532fdceb296c37facc4acc846677a9e",
     "libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
     "lodash": "4.17.21",
     "moment": "2.29.1",

react/features/base/flags/constants.js

@@ -86,6 +86,12 @@ export const INVITE_ENABLED = 'invite.enabled';
  */
 export const IOS_RECORDING_ENABLED = 'ios.recording.enabled';
 
+/**
+ * Flag indicating if screen sharing should be enabled in iOS.
+ * Default: disabled (false).
+ */
+export const IOS_SCREENSHARING_ENABLED = 'ios.screensharing.enabled';
+
 /**
  * Flag indicating if kickout is enabled.
  * Default: enabled (true).

react/features/base/modal/components/JitsiModal.js

@@ -1,7 +1,7 @@
 // @flow
 
 import React, { PureComponent } from 'react';
-import { KeyboardAvoidingView, SafeAreaView } from 'react-native';
+import { KeyboardAvoidingView, Platform, SafeAreaView } from 'react-native';
 
 import { ColorSchemeRegistry } from '../../color-scheme';
 import { HeaderWithNavigation, SlidingView } from '../../react';
@@ -106,7 +106,12 @@ class JitsiModal extends PureComponent<Props> {
                 position = { position }
                 show = { _show }>
                 <KeyboardAvoidingView
-                    behavior = 'height'
+                    behavior =
+                        {
+                            Platform.OS === 'ios'
+                                ? 'padding' : 'height'
+                        }
+                    enabled = { true }
                     style = { [
                         _headerStyles.page,
                         _styles.page,

react/features/base/premeeting/components/web/PreMeetingScreen.js

@@ -3,6 +3,8 @@
 import React, { PureComponent } from 'react';
 
 import { AudioSettingsButton, VideoSettingsButton } from '../../../../toolbox/components/web';
+import { VideoBackgroundButton } from '../../../../virtual-background';
+import { checkBlurSupport } from '../../../../virtual-background/functions';
 import { Avatar } from '../../../avatar';
 import { allowUrlSharing } from '../../functions';
 
@@ -114,6 +116,7 @@ export default class PreMeetingScreen extends PureComponent<Props> {
                             <div className = 'toolbox-content-items'>
                                 <AudioSettingsButton visible = { true } />
                                 <VideoSettingsButton visible = { true } />
+                                <VideoBackgroundButton visible = { checkBlurSupport() } />
                             </div>
                         </div>
                     </div>

react/features/settings/components/web/MoreTab.js

@@ -10,6 +10,7 @@ import React from 'react';
 import { AbstractDialogTab } from '../../../base/dialog';
 import type { Props as AbstractDialogTabProps } from '../../../base/dialog';
 import { translate } from '../../../base/i18n';
+import TouchmoveHack from '../../../chat/components/web/TouchmoveHack';
 
 /**
  * The type of the React {@code Component} props of {@link MoreTab}.
@@ -185,21 +186,23 @@ class MoreTab extends AbstractDialogTab<Props, State> {
                     { t('settings.language') }
                 </div>
                 <div className = 'dropdown-menu'>
-                    <DropdownMenu
-                        isOpen = { this.state.isLanguageSelectOpen }
-                        onOpenChange = { this._onLanguageDropdownOpenChange }
-                        shouldFitContainer = { true }
-                        trigger = { currentLanguage
-                            ? t(`languages:${currentLanguage}`)
-                            : '' }
-                        triggerButtonProps = {{
-                            shouldFitContainer: true
-                        }}
-                        triggerType = 'button'>
-                        <DropdownItemGroup>
-                            { languageItems }
-                        </DropdownItemGroup>
-                    </DropdownMenu>
+                    <TouchmoveHack isModal = { true }>
+                        <DropdownMenu
+                            isOpen = { this.state.isLanguageSelectOpen }
+                            onOpenChange = { this._onLanguageDropdownOpenChange }
+                            shouldFitContainer = { true }
+                            trigger = { currentLanguage
+                                ? t(`languages:${currentLanguage}`)
+                                : '' }
+                            triggerButtonProps = {{
+                                shouldFitContainer: true
+                            }}
+                            triggerType = 'button'>
+                            <DropdownItemGroup>
+                                { languageItems }
+                            </DropdownItemGroup>
+                        </DropdownMenu>
+                    </TouchmoveHack>
                 </div>
             </div>
         );

react/features/stream-effects/virtual-background/vendor/README.md

@@ -21,4 +21,16 @@ How to test on SIMD:
 More details:
 - [WebAssembly](https://webassembly.org/)
 - [WebAssembly SIMD](https://github.com/WebAssembly/simd)
-- [TFLite](https://blog.tensorflow.org/2020/07/accelerating-tensorflow-lite-xnnpack-integration.html)
+- [TFLite](https://blog.tensorflow.org/2020/07/accelerating-tensorflow-lite-xnnpack-integration.html)
+
+## LICENSE
+
+The mdoels vendored here were downloaded early January (they were available as early as the 4th), before Google switched the license away from Apache 2. Thus we understand they are not covered by the new license which according to the [model card](https://drive.google.com/file/d/1lnP1bRi9CSqQQXUHa13159vLELYDgDu0/view) dates from the 21st of January.
+
+We are not lawyers so do get legal advise if in doubt.
+
+References:
+
+- Model license discussion: https://github.com/tensorflow/tfjs/issues/4177
+- Current vendored model is discovered: https://github.com/tensorflow/tfjs/issues/4177#issuecomment-753934631
+- License change is noticed: https://github.com/tensorflow/tfjs/issues/4177#issuecomment-771536641

react/features/toolbox/components/native/ScreenSharingIosButton.js

@@ -4,6 +4,7 @@ import React from 'react';
 import { findNodeHandle, NativeModules, Platform } from 'react-native';
 import { ScreenCapturePickerView } from 'react-native-webrtc';
 
+import { getFeatureFlag, IOS_SCREENSHARING_ENABLED } from '../../../base/flags';
 import { translate } from '../../../base/i18n';
 import { IconShareDesktop } from '../../../base/icons';
 import { connect } from '../../../base/redux';
@@ -121,11 +122,13 @@ class ScreenSharingIosButton extends AbstractButton<Props, *> {
  * }}
  */
 function _mapStateToProps(state): Object {
+    const enabled = getFeatureFlag(state, IOS_SCREENSHARING_ENABLED, false);
+
     return {
         _screensharing: isLocalVideoTrackDesktop(state),
 
         // TODO: this should work on iOS 12 too, but our trick to show the picker doesn't work.
-        visible: Platform.OS === 'ios' && Platform.Version.split('.')[0] >= 14
+        visible: enabled && Platform.OS === 'ios' && Platform.Version.split('.')[0] >= 14
     };
 }
 

react/features/toolbox/components/native/styles.js

@@ -79,7 +79,7 @@ const styles = {
         flexDirection: 'column',
         flexGrow: 0,
         width: '100%',
-        maxWidth: 500,
+        maxWidth: 580,
         marginLeft: 'auto',
         marginRight: 'auto'
     }

resources/load-test/load-test-participant.js

@@ -14,6 +14,7 @@ const {
     remoteVideo = isHuman,
     remoteAudio = isHuman,
     autoPlayVideo = config.testing.noAutoPlayVideo !== true,
+    stageView = config.disableTileView
 } = params;
 
 let {
@@ -24,6 +25,8 @@ const { room: roomName } = parseURIString(window.location.toString());
 
 let connection = null;
 
+let connected = false;
+
 let room = null;
 
 let numParticipants = 1;
@@ -33,6 +36,8 @@ const remoteTracks = {};
 
 let maxFrameHeight = 0;
 
+let selectedParticipant = null;
+
 window.APP = {
     conference: {
         getStats() {
@@ -83,7 +88,8 @@ window.APP = {
             localVideo,
             remoteVideo,
             remoteAudio,
-            autoPlayVideo
+            autoPlayVideo,
+            stageView
         };
     }
 };
@@ -92,14 +98,23 @@ window.APP = {
  * Simple emulation of jitsi-meet's screen layout behavior
  */
 function updateMaxFrameHeight() {
+    if (!connected) {
+        return;
+    }
+
     let newMaxFrameHeight;
 
-    if (numParticipants <= 2) {
-        newMaxFrameHeight = 720;
-    } else if (numParticipants <= 4) {
-        newMaxFrameHeight = 360;
-    } else {
-        newMaxFrameHeight = 180;
+    if (stageView) {
+        newMaxFrameHeight = 2160;
+    }
+    else {
+        if (numParticipants <= 2) {
+            newMaxFrameHeight = 720;
+        } else if (numParticipants <= 4) {
+            newMaxFrameHeight = 360;
+        } else {
+            newMaxFrameHeight = 180;
+        }
     }
 
     if (room && maxFrameHeight !== newMaxFrameHeight) {
@@ -112,6 +127,10 @@ function updateMaxFrameHeight() {
  * Simple emulation of jitsi-meet's lastN behavior
  */
 function updateLastN() {
+    if (!connected) {
+        return;
+    }
+
     let lastN = typeof config.channelLastN === 'undefined' ? -1 : config.channelLastN;
 
     const limitedLastN = limitLastN(numParticipants, validateLastNLimits(config.lastNLimits));
@@ -128,17 +147,88 @@ function updateLastN() {
 }
 
 /**
- *
+ * Helper function to query whether a participant ID is a valid ID
+ * for stage view.
+ */
+function isValidStageViewParticipant(id) {
+    return (id !== room.myUserId() && room.getParticipantById(id));
+}
+
+/**
+ * Simple emulation of jitsi-meet's stage view participant selection behavior.
+ * Doesn't take into account pinning or screen sharing, and the initial behavior
+ * is slightly different.
+ * @returns Whether the selected participant changed.
+ */
+function selectStageViewParticipant(selected, previous) {
+    let newSelectedParticipant;
+
+    if (isValidStageViewParticipant(selected)) {
+        newSelectedParticipant = selected;
+    }
+    else {
+        newSelectedParticipant = previous.find(isValidStageViewParticipant);
+    }
+    if (newSelectedParticipant && newSelectedParticipant !== selectedParticipant) {
+        selectedParticipant = newSelectedParticipant;
+        return true;
+    }
+    return false;
+}
+
+/**
+ * Simple emulation of jitsi-meet's selectParticipants behavior
+ */
+function selectParticipants() {
+    if (!connected) {
+        return;
+    }
+    if (stageView) {
+        if (selectedParticipant) {
+            room.selectParticipants([selectedParticipant]);
+        }
+    }
+    else {
+        /* jitsi-meet's current Tile View behavior. */
+        const ids = room.getParticipants().map(participant => participant.getId());
+        room.selectParticipants(ids);
+    }
+}
+
+/**
+ * Called when number of participants changes.
  */
 function setNumberOfParticipants() {
     $('#participants').text(numParticipants);
-    /* jitsi-meet's current Tile View behavior. */
-    const ids = room.getParticipants().map(participant => participant.id);
-    room.selectParticipants(ids);
+    if (!stageView) {
+        selectParticipants();
+        updateMaxFrameHeight();
+    }
+    updateLastN();
+}
+
+/**
+ * Called when ICE connects
+ */
+function onConnectionEstablished() {
+    connected = true;
+
+    selectParticipants();
     updateMaxFrameHeight();
     updateLastN();
 }
 
+/**
+ * Handles dominant speaker changed.
+ * @param id
+ */
+function onDominantSpeakerChanged(selected, previous) {
+    if (selectStageViewParticipant(selected, previous)) {
+        selectParticipants();
+    }
+    updateMaxFrameHeight();
+}
+
 /**
  * Handles local tracks.
  * @param tracks Array with JitsiTrack objects
@@ -258,8 +348,12 @@ function onConnectionSuccess() {
     room.on(JitsiMeetJS.events.conference.STARTED_MUTED, onStartMuted);
     room.on(JitsiMeetJS.events.conference.TRACK_ADDED, onRemoteTrack);
     room.on(JitsiMeetJS.events.conference.CONFERENCE_JOINED, onConferenceJoined);
+    room.on(JitsiMeetJS.events.conference.CONNECTION_ESTABLISHED, onConnectionEstablished);
     room.on(JitsiMeetJS.events.conference.USER_JOINED, onUserJoined);
     room.on(JitsiMeetJS.events.conference.USER_LEFT, onUserLeft);
+    if (stageView) {
+        room.on(JitsiMeetJS.events.conference.DOMINANT_SPEAKER_CHANGED, onDominantSpeakerChanged);
+    }
 
     const devices = [];