Merge branch 'jitsi:master' into RTC

Author: naman9271

JitsiConference.ts

@@ -93,6 +93,9 @@ import { XMPPEvents } from './service/xmpp/XMPPEvents';
 
 export interface IConferenceOptions {
     config: {
+        _p2pConnStatusRtcMuteTimeout?: number;
+        _peerConnStatusOutOfLastNTimeout?: number;
+        _peerConnStatusRtcMuteTimeout?: number;
         analytics?: {
             rtcstatsEnabled?: boolean;
             rtcstatsEndpoint?: string;
@@ -575,7 +578,7 @@ export default class JitsiConference extends Listenable {
         this._statsCurrentId = config.statisticsId ?? Settings.callStatsUserName;
         this.room = this._xmpp.createRoom(
             this.options.name, {
-                customDomain: this.options.customDomain,
+                ...config,
                 statsId: this._statsCurrentId
             },
             JitsiConference.resourceCreator
@@ -2078,7 +2081,7 @@ export default class JitsiConference extends Listenable {
     _sendBridgeVideoTypeMessage(localtrack: JitsiLocalTrack): void {
         let videoType = !localtrack || localtrack.isMuted() ? BridgeVideoType.NONE : localtrack.getVideoType();
 
-        if (videoType === BridgeVideoType.DESKTOP && this._desktopSharingFrameRate > SS_DEFAULT_FRAME_RATE) {
+        if (videoType === VideoType.DESKTOP && this._desktopSharingFrameRate > SS_DEFAULT_FRAME_RATE) {
             videoType = BridgeVideoType.DESKTOP_HIGH_FPS;
         }
 
@@ -2373,12 +2376,13 @@ export default class JitsiConference extends Listenable {
 
                     // Let the caller know that the XMPP login was successful.
                     onLoginSuccessful?.();
+                    const { config } = this.options;
 
                     // Now authenticate with Jicofo and get a new session ID.
                     const room = xmpp.createRoom(
                     this.options.name,
                     {
-                        customDomain: this.options.customDomain,
+                        ...config,
                         statsId: this._statsCurrentId
                     },
                     onCreateResource

globals.d.ts

@@ -16,4 +16,7 @@ declare global {
             writable: WritableStream<RTCEncodedAudioFrame | RTCEncodedVideoFrame>;
         }
     }
+    interface MediaStream {
+        oninactive?: ((this: MediaStream, ev: Event) => void) | ((this: MediaStreamTrack, ev: Event) => void) | null;
+    }
 }

modules/RTC/JitsiLocalTrack.ts

@@ -511,7 +511,7 @@ export default class JitsiLocalTrack extends JitsiTrack {
                 = RTCUtils.obtainAudioAndVideoPermissions({
 
                     ...streamOptions,
-                    constraints: { video: this._constraints } } as any) as Promise<IStreamInfo[]>;
+                    constraints: { video: this._constraints } }) as Promise<IStreamInfo[]>;
 
             promise = promise.then((streamsInfo: IStreamInfo[]) => {
                 const streamInfo = streamsInfo.find(info => info.track.kind === this.getType());