migrated(sqaush)

Author: naman9271

JitsiMediaDevices.ts

@@ -95,6 +95,7 @@ export default class JitsiMediaDevices extends Listenable {
         // We would still want to update the permissions cache in case the permissions API is not supported.
         RTC.addListener(
             RTCEvents.PERMISSIONS_CHANGED,
+            // @ts-ignore
             permissions => this._handlePermissionsChange(permissions));
 
         // Test if the W3C Permissions API is implemented and the 'camera' and 'microphone' permissions are

modules/RTC/BridgeChannel.ts

@@ -8,7 +8,7 @@ import RTCEvents from '../../service/RTC/RTCEvents';
 import { IReceiverAudioSubscriptionMessage } from '../../service/RTC/ReceiverAudioSubscription';
 import { SourceName } from '../../service/RTC/SignalingLayer';
 import { createBridgeChannelClosedEvent } from '../../service/statistics/AnalyticsEvents';
-import ReceiverVideoConstraints from '../qualitycontrol/ReceiveVideoController';
+import { IReceiverVideoConstraints } from '../qualitycontrol/ReceiveVideoController';
 import Statistics from '../statistics/statistics';
 
 
@@ -277,9 +277,9 @@ export default class BridgeChannel {
     /**
      * Sends a 'ReceiverVideoConstraints' message via the bridge channel.
      *
-     * @param {ReceiverVideoConstraints} constraints video constraints.
+     * @param {IReceiverVideoConstraints} constraints video constraints.
      */
-    sendReceiverVideoConstraintsMessage(constraints: ReceiverVideoConstraints): void {
+    sendReceiverVideoConstraintsMessage(constraints: IReceiverVideoConstraints): void {
         logger.info(`Sending ReceiverVideoConstraints with ${JSON.stringify(constraints)}`);
         this._send({
             colibriClass: 'ReceiverVideoConstraints',

modules/RTC/JitsiLocalTrack.ts

@@ -554,37 +554,6 @@ export default class JitsiLocalTrack extends JitsiTrack {
             });
     }
 
-    /**
-     * Sets real device ID by comparing track information with device information. This is temporary solution until
-     * getConstraints() method will be implemented in browsers.
-     *
-     * @param {MediaDeviceInfo[]} devices - The list of devices obtained from enumerateDevices() call.
-     * @private
-     * @returns {void}
-     */
-    private _setRealDeviceIdFromDeviceList(devices: MediaDeviceInfo[]): void {
-        const track = this.getTrack();
-        const kind = `${track.kind}input`;
-
-        // We need to match by deviceId as well, in case of multiple devices with the same label.
-        let device = devices.find(d => d.kind === kind && d.label === track.label && d.deviceId === this.deviceId);
-
-        if (!device && this._realDeviceId === 'default') { // the default device has been changed.
-            // If the default device was 'A' and the default device is changed to 'B' the label for the track will
-            // remain 'Default - A' but the label for the device in the device list will be updated to 'A'. That's
-            // why in order to match it we need to remove the 'Default - ' part.
-            const label = (track.label || '').replace('Default - ', '');
-
-            device = devices.find(d => d.kind === kind && d.label === label);
-        }
-
-        if (device) {
-            this._realDeviceId = device.deviceId;
-        } else {
-            this._realDeviceId = undefined;
-        }
-    }
-
     /**
      * Starts the effect process and returns the modified stream.
      *
@@ -703,6 +672,37 @@ export default class JitsiLocalTrack extends JitsiTrack {
         return super.dispose();
     }
 
+    /**
+     * Sets real device ID by comparing track information with device information. This is temporary solution until
+     * getConstraints() method will be implemented in browsers.
+     *
+     * @param {MediaDeviceInfo[]} devices - The list of devices obtained from enumerateDevices() call.
+     * @internal
+     * @returns {void}
+     */
+    _setRealDeviceIdFromDeviceList(devices: MediaDeviceInfo[]): void {
+        const track = this.getTrack();
+        const kind = `${track.kind}input`;
+
+        // We need to match by deviceId as well, in case of multiple devices with the same label.
+        let device = devices.find(d => d.kind === kind && d.label === track.label && d.deviceId === this.deviceId);
+
+        if (!device && this._realDeviceId === 'default') { // the default device has been changed.
+            // If the default device was 'A' and the default device is changed to 'B' the label for the track will
+            // remain 'Default - A' but the label for the device in the device list will be updated to 'A'. That's
+            // why in order to match it we need to remove the 'Default - ' part.
+            const label = (track.label || '').replace('Default - ', '');
+
+            device = devices.find(d => d.kind === kind && d.label === label);
+        }
+
+        if (device) {
+            this._realDeviceId = device.deviceId;
+        } else {
+            this._realDeviceId = undefined;
+        }
+    }
+
     /**
      * Sends mute status for a track to conference if any.
      *