fix(stats): Use promise-based getStats on all browsers.

Get rid of the browser specific keys and use the standard spec-compliant fields for stats.
Get the resolution/fps for remote streams from 'inbound-rtp' stats. Use the 'track' stats for the local resolution/fps since these take the active simulcast streams into account.

modules/RTC/TraceablePeerConnection.js

@@ -2551,7 +2551,7 @@ TraceablePeerConnection.prototype.setSenderVideoConstraint = function(frameHeigh
 
     if (this.isSimulcastOn()) {
         // Determine the encodings that need to stay enabled based on the new frameHeight provided.
-        const encodingsEnabledState = this.tpcUtils.getLocalStreamHeightConstraints(localVideoTrack.track)
+        this.encodingsEnabledState = this.tpcUtils.getLocalStreamHeightConstraints(localVideoTrack.track)
             .map(height => height <= newHeight);
 
         // Always keep the LD stream enabled, specifically when the LD stream's resolution is higher than of the
@@ -2562,11 +2562,11 @@ TraceablePeerConnection.prototype.setSenderVideoConstraint = function(frameHeigh
             .findIndex(layer => layer.scaleResolutionDownBy === 4.0);
 
         if (newHeight > 0 && ldStreamIndex !== -1) {
-            encodingsEnabledState[ldStreamIndex] = true;
+            this.encodingsEnabledState[ldStreamIndex] = true;
         }
         for (const encoding in parameters.encodings) {
             if (parameters.encodings.hasOwnProperty(encoding)) {
-                parameters.encodings[encoding].active = encodingsEnabledState[encoding];
+                parameters.encodings[encoding].active = this.encodingsEnabledState[encoding];
             }
         }
         this.tpcUtils.updateEncodingsResolution(parameters);
@@ -2940,31 +2940,36 @@ TraceablePeerConnection.prototype.addIceCandidate = function(candidate) {
     return this.peerconnection.addIceCandidate(candidate);
 };
 
+/**
+ * Returns the number of simulcast streams that are currently enabled on the peerconnection.
+ *
+ * @returns {number} The number of simulcast streams currently enabled or 1 when simulcast is disabled.
+ */
+TraceablePeerConnection.prototype.getActiveSimulcastStreams = function() {
+    let activeStreams = 1;
+
+    if (this.isSimulcastOn() && this.encodingsEnabledState) {
+        activeStreams = this.encodingsEnabledState.filter(stream => Boolean(stream))?.length;
+    } else if (this.isSimulcastOn()) {
+        activeStreams = SIM_LAYER_RIDS.length;
+    }
+
+    return activeStreams;
+};
+
 /**
  * Obtains call-related stats from the peer connection.
  *
- * @param {Function} callback - The function to invoke after successfully
- * obtaining stats.
- * @param {Function} errback - The function to invoke after failing to obtain
- * stats.
+ * @param {Function} callback - The function to invoke after successfully obtaining stats.
+ * @param {Function} errback - The function to invoke after failing to obtain stats.
  * @returns {void}
  */
 TraceablePeerConnection.prototype.getStats = function(callback, errback) {
-    // TODO (brian): After moving all browsers to adapter, check if adapter is
-    // accounting for different getStats apis, making the browser-checking-if
-    // unnecessary.
-    if (browser.isWebKitBased() || browser.isFirefox() || browser.isReactNative()) {
-        // uses the new Promise based getStats
-        this.peerconnection.getStats()
-            .then(callback)
-            .catch(errback || (() => {
-
-                // Making sure that getStats won't fail if error callback is
-                // not passed.
-            }));
-    } else {
-        this.peerconnection.getStats(callback);
-    }
+    this.peerconnection.getStats()
+        .then(callback)
+        .catch(errback || (() => {
+            // Making sure that getStats won't fail if error callback is not passed.
+        }));
 };
 
 /**

modules/statistics/RTPStatsCollector.js

@@ -1,4 +1,3 @@
-import { browsers } from '@jitsi/js-utils';
 import { getLogger } from 'jitsi-meet-logger';
 
 import * as MediaType from '../../service/RTC/MediaType';
@@ -9,74 +8,6 @@ const GlobalOnErrorHandler = require('../util/GlobalOnErrorHandler');
 
 const logger = getLogger(__filename);
 
-/**
- * The lib-jitsi-meet browser-agnostic names of the browser-specific keys
- * reported by RTCPeerConnection#getStats mapped by browser.
- */
-const KEYS_BY_BROWSER_TYPE = {};
-
-KEYS_BY_BROWSER_TYPE[browsers.FIREFOX] = {
-    'ssrc': 'ssrc',
-    'packetsReceived': 'packetsReceived',
-    'packetsLost': 'packetsLost',
-    'packetsSent': 'packetsSent',
-    'bytesReceived': 'bytesReceived',
-    'bytesSent': 'bytesSent',
-    'framerateMean': 'framerateMean',
-    'ip': 'address',
-    'port': 'port',
-    'protocol': 'protocol'
-};
-KEYS_BY_BROWSER_TYPE[browsers.CHROME] = {
-    'receiveBandwidth': 'googAvailableReceiveBandwidth',
-    'sendBandwidth': 'googAvailableSendBandwidth',
-    'remoteAddress': 'googRemoteAddress',
-    'transportType': 'googTransportType',
-    'localAddress': 'googLocalAddress',
-    'activeConnection': 'googActiveConnection',
-    'ssrc': 'ssrc',
-    'packetsReceived': 'packetsReceived',
-    'packetsSent': 'packetsSent',
-    'packetsLost': 'packetsLost',
-    'bytesReceived': 'bytesReceived',
-    'bytesSent': 'bytesSent',
-    'googCodecName': 'googCodecName',
-    'googFrameHeightReceived': 'googFrameHeightReceived',
-    'googFrameWidthReceived': 'googFrameWidthReceived',
-    'googFrameHeightSent': 'googFrameHeightSent',
-    'googFrameWidthSent': 'googFrameWidthSent',
-    'googFrameRateReceived': 'googFrameRateReceived',
-    'googFrameRateSent': 'googFrameRateSent',
-    'audioInputLevel': 'audioInputLevel',
-    'audioOutputLevel': 'audioOutputLevel',
-    'currentRoundTripTime': 'googRtt',
-    'remoteCandidateType': 'googRemoteCandidateType',
-    'localCandidateType': 'googLocalCandidateType',
-    'ip': 'ip',
-    'port': 'port',
-    'protocol': 'protocol'
-};
-KEYS_BY_BROWSER_TYPE[browsers.REACT_NATIVE] = {
-    'packetsReceived': 'packetsReceived',
-    'packetsSent': 'packetsSent',
-    'bytesReceived': 'bytesReceived',
-    'bytesSent': 'bytesSent',
-    'frameWidth': 'frameWidth',
-    'frameHeight': 'frameHeight',
-    'framesPerSecond': 'framesPerSecond',
-    'ip': 'ip',
-    'port': 'port',
-    'protocol': 'protocol'
-};
-KEYS_BY_BROWSER_TYPE[browsers.OPERA]
-    = KEYS_BY_BROWSER_TYPE[browsers.CHROME];
-KEYS_BY_BROWSER_TYPE[browsers.NWJS]
-    = KEYS_BY_BROWSER_TYPE[browsers.CHROME];
-KEYS_BY_BROWSER_TYPE[browsers.ELECTRON]
-    = KEYS_BY_BROWSER_TYPE[browsers.CHROME];
-KEYS_BY_BROWSER_TYPE[browsers.SAFARI]
-    = KEYS_BY_BROWSER_TYPE[browsers.CHROME];
-
 /**
  * Calculates packet lost percent using the number of lost packets and the
  * number of all packet.
@@ -200,53 +131,7 @@ function ConferenceStats() {
  * @param eventEmitter
  * @constructor
  */
-export default function StatsCollector(
-        peerconnection,
-        audioLevelsInterval,
-        statsInterval,
-        eventEmitter) {
-    // StatsCollector depends entirely on the format of the reports returned by
-    // RTCPeerConnection#getStats. Given that the value of
-    // browser#getName() is very unlikely to change at runtime, it
-    // makes sense to discover whether StatsCollector supports the executing
-    // browser as soon as possible. Otherwise, (1) getStatValue would have to
-    // needlessly check a "static" condition multiple times very very often and
-    // (2) the lack of support for the executing browser would be discovered and
-    // reported multiple times very very often too late in the execution in some
-    // totally unrelated callback.
-    /**
-     * The browser type supported by this StatsCollector. In other words, the
-     * type of the browser which initialized this StatsCollector
-     * instance.
-     * @private
-     */
-    this._browserType = browser.getName();
-    const keys = KEYS_BY_BROWSER_TYPE[this._browserType];
-
-    if (!keys) {
-        throw new Error(`The browser type '${this._browserType}' isn't supported!`);
-    }
-
-    /**
-     * Whether to use the Promise-based getStats API or not.
-     * @type {boolean}
-     */
-    this._usesPromiseGetStats
-        = browser.isWebKitBased() || browser.isFirefox() || browser.isReactNative();
-
-    /**
-     * The function which is to be used to retrieve the value associated in a
-     * report returned by RTCPeerConnection#getStats with a lib-jitsi-meet
-     * browser-agnostic name/key.
-     *
-     * @function
-     * @private
-     */
-    this._getStatValue
-        = this._usesPromiseGetStats
-            ? this._defineNewGetStatValueMethod(keys)
-            : this._defineGetStatValueMethod(keys);
-
+export default function StatsCollector(peerconnection, audioLevelsInterval, statsInterval, eventEmitter) {
     this.peerconnection = peerconnection;
     this.baselineAudioLevelsReport = null;
     this.currentAudioLevelsReport = null;
@@ -346,14 +231,8 @@ StatsCollector.prototype.start = function(startAudioLevelStats) {
                                 results = report.result();
                             }
                             this.currentAudioLevelsReport = results;
-                            if (this._usesPromiseGetStats) {
-                                this.processNewAudioLevelReport();
-                            } else {
-                                this.processAudioLevelReport();
-                            }
-
-                            this.baselineAudioLevelsReport
-                                = this.currentAudioLevelsReport;
+                            this.processAudioLevelReport();
+                            this.baselineAudioLevelsReport = this.currentAudioLevelsReport;
                         },
                         error => this.errorCallback(error)
                     );
@@ -380,16 +259,11 @@ StatsCollector.prototype.start = function(startAudioLevelStats) {
 
                 this.currentStatsReport = results;
                 try {
-                    if (this._usesPromiseGetStats) {
-                        this.processNewStatsReport();
-                    } else {
-                        this.processStatsReport();
-                    }
-                } catch (e) {
-                    GlobalOnErrorHandler.callErrorHandler(e);
-                    logger.error(`Unsupported key:${e}`, e);
+                    this.processStatsReport();
+                } catch (error) {
+                    GlobalOnErrorHandler.callErrorHandler(error);
+                    logger.error('Processing of RTP stats failed:', error);
                 }
-
                 this.previousStatsReport = this.currentStatsReport;
             },
             error => this.errorCallback(error)
@@ -400,341 +274,6 @@ StatsCollector.prototype.start = function(startAudioLevelStats) {
     this.statsIntervalId = setInterval(processStats, this.statsIntervalMilis);
 };
 
-/**
- * Defines a function which (1) is to be used as a StatsCollector method and (2)
- * gets the value from a specific report returned by RTCPeerConnection#getStats
- * associated with a lib-jitsi-meet browser-agnostic name.
- *
- * @param {Object.<string,string>} keys the map of LibJitsi browser-agnostic
- * names to RTCPeerConnection#getStats browser-specific keys
- */
-StatsCollector.prototype._defineGetStatValueMethod = function(keys) {
-    // Define the function which converts a lib-jitsi-meet browser-asnostic name
-    // to a browser-specific key of a report returned by
-    // RTCPeerConnection#getStats.
-    const keyFromName = function(name) {
-        const key = keys[name];
-
-        if (key) {
-            return key;
-        }
-
-        throw new Error(`The property '${name}' isn't supported!`);
-    };
-
-    // Define the function which retrieves the value from a specific report
-    // returned by RTCPeerConnection#getStats associated with a given
-    // browser-specific key.
-    let itemStatByKey;
-
-    switch (this._browserType) {
-    case browsers.CHROME:
-    case browsers.OPERA:
-    case browsers.NWJS:
-    case browsers.ELECTRON:
-        // TODO What about other types of browser which are based on Chrome such
-        // as NW.js? Every time we want to support a new type browser we have to
-        // go and add more conditions (here and in multiple other places).
-        // Cannot we do a feature detection instead of a browser type check? For
-        // example, if item has a stat property of type function, then it's very
-        // likely that whoever defined it wanted you to call it in order to
-        // retrieve the value associated with a specific key.
-        itemStatByKey = (item, key) => item.stat(key);
-        break;
-    default:
-        itemStatByKey = (item, key) => item[key];
-    }
-
-    // Compose the 2 functions defined above to get a function which retrieves
-    // the value from a specific report returned by RTCPeerConnection#getStats
-    // associated with a specific lib-jitsi-meet browser-agnostic name.
-    return (item, name) => itemStatByKey(item, keyFromName(name));
-};
-
-/**
- * Obtains a stat value from given stat and converts it to a non-negative
- * number. If the value is either invalid or negative then 0 will be returned.
- * @param report
- * @param {string} name
- * @return {number}
- * @private
- */
-StatsCollector.prototype.getNonNegativeStat = function(report, name) {
-    let value = this._getStatValue(report, name);
-
-    if (typeof value !== 'number') {
-        value = Number(value);
-    }
-
-    if (isNaN(value)) {
-        return 0;
-    }
-
-    return Math.max(0, value);
-};
-
-/* eslint-disable no-continue */
-
-/**
- * Stats processing logic.
- */
-StatsCollector.prototype.processStatsReport = function() {
-    if (!this.previousStatsReport) {
-        return;
-    }
-
-    const getStatValue = this._getStatValue;
-    const byteSentStats = {};
-
-    for (const idx in this.currentStatsReport) {
-        if (!this.currentStatsReport.hasOwnProperty(idx)) {
-            continue;
-        }
-        const now = this.currentStatsReport[idx];
-
-        // The browser API may return "undefined" values in the array
-        if (!now) {
-            continue;
-        }
-
-        try {
-            const receiveBandwidth = getStatValue(now, 'receiveBandwidth');
-            const sendBandwidth = getStatValue(now, 'sendBandwidth');
-
-            if (receiveBandwidth || sendBandwidth) {
-                this.conferenceStats.bandwidth = {
-                    'download': Math.round(receiveBandwidth / 1000),
-                    'upload': Math.round(sendBandwidth / 1000)
-                };
-            }
-        } catch (e) { /* not supported*/ }
-
-        if (now.type === 'googCandidatePair') {
-            let active, ip, localCandidateType, localip,
-                remoteCandidateType, rtt, type;
-
-            try {
-                active = getStatValue(now, 'activeConnection');
-                if (!active) {
-                    continue;
-                }
-
-                ip = getStatValue(now, 'remoteAddress');
-                type = getStatValue(now, 'transportType');
-                localip = getStatValue(now, 'localAddress');
-                localCandidateType = getStatValue(now, 'localCandidateType');
-                remoteCandidateType = getStatValue(now, 'remoteCandidateType');
-                rtt = this.getNonNegativeStat(now, 'currentRoundTripTime');
-            } catch (e) { /* not supported*/ }
-            if (!ip || !type || !localip || active !== 'true') {
-                continue;
-            }
-
-            // Save the address unless it has been saved already.
-            const conferenceStatsTransport = this.conferenceStats.transport;
-
-            if (!conferenceStatsTransport.some(
-                    t =>
-                        t.ip === ip
-                            && t.type === type
-                            && t.localip === localip)) {
-                conferenceStatsTransport.push({
-                    ip,
-                    type,
-                    localip,
-                    p2p: this.peerconnection.isP2P,
-                    localCandidateType,
-                    remoteCandidateType,
-                    rtt
-                });
-            }
-            continue;
-        }
-
-        if (now.type === 'candidatepair') {
-            // we need succeeded and selected pairs only
-            if (now.state !== 'succeeded' || !now.selected) {
-                continue;
-            }
-
-            const local = this.currentStatsReport[now.localCandidateId];
-            const remote = this.currentStatsReport[now.remoteCandidateId];
-
-            this.conferenceStats.transport.push({
-                ip: `${remote.ipAddress}:${remote.portNumber}`,
-                type: local.transport,
-                localip: `${local.ipAddress}:${local.portNumber}`,
-                p2p: this.peerconnection.isP2P,
-                localCandidateType: local.candidateType,
-                remoteCandidateType: remote.candidateType
-            });
-        }
-
-        if (now.type !== 'ssrc' && now.type !== 'outboundrtp'
-            && now.type !== 'inboundrtp' && now.type !== 'track') {
-            continue;
-        }
-
-        const before = this.previousStatsReport[idx];
-        let ssrc = this.getNonNegativeStat(now, 'ssrc');
-
-        // If type="track", take the first SSRC from ssrcIds.
-        if (now.type === 'track' && Array.isArray(now.ssrcIds)) {
-            ssrc = Number(now.ssrcIds[0]);
-        }
-
-        if (!before || !ssrc) {
-            continue;
-        }
-
-        // isRemote is available only in FF and is ignored in case of chrome
-        // according to the spec
-        // https://www.w3.org/TR/webrtc-stats/#dom-rtcrtpstreamstats-isremote
-        // when isRemote is true indicates that the measurements were done at
-        // the remote endpoint and reported in an RTCP RR/XR.
-        // Fixes a problem where we are calculating local stats wrong adding
-        // the sent bytes to the local download bitrate.
-        // In new W3 stats spec, type="track" has a remoteSource boolean
-        // property.
-        if (now.isRemote === true || now.remoteSource === true) {
-            continue;
-        }
-
-        let ssrcStats = this.ssrc2stats.get(ssrc);
-
-        if (!ssrcStats) {
-            ssrcStats = new SsrcStats();
-            this.ssrc2stats.set(ssrc, ssrcStats);
-        }
-
-        let isDownloadStream = true;
-        let key = 'packetsReceived';
-        let packetsNow = getStatValue(now, key);
-
-        if (typeof packetsNow === 'undefined'
-            || packetsNow === null || packetsNow === '') {
-            isDownloadStream = false;
-            key = 'packetsSent';
-            packetsNow = getStatValue(now, key);
-            if (typeof packetsNow === 'undefined' || packetsNow === null) {
-                logger.warn('No packetsReceived nor packetsSent stat found');
-            }
-        }
-        if (!packetsNow || packetsNow < 0) {
-            packetsNow = 0;
-        }
-
-        const packetsBefore = this.getNonNegativeStat(before, key);
-        const packetsDiff = Math.max(0, packetsNow - packetsBefore);
-
-        const packetsLostNow
-            = this.getNonNegativeStat(now, 'packetsLost');
-        const packetsLostBefore
-            = this.getNonNegativeStat(before, 'packetsLost');
-        const packetsLostDiff = Math.max(0, packetsLostNow - packetsLostBefore);
-
-        ssrcStats.setLoss({
-            packetsTotal: packetsDiff + packetsLostDiff,
-            packetsLost: packetsLostDiff,
-            isDownloadStream
-        });
-
-        const bytesReceivedNow
-            = this.getNonNegativeStat(now, 'bytesReceived');
-        const bytesReceivedBefore
-            = this.getNonNegativeStat(before, 'bytesReceived');
-        const bytesReceived
-            = Math.max(0, bytesReceivedNow - bytesReceivedBefore);
-
-        let bytesSent = 0;
-
-        // TODO: clean this mess up!
-        let nowBytesTransmitted = getStatValue(now, 'bytesSent');
-
-        if (typeof nowBytesTransmitted === 'number'
-            || typeof nowBytesTransmitted === 'string') {
-            nowBytesTransmitted = Number(nowBytesTransmitted);
-            if (!isNaN(nowBytesTransmitted)) {
-                byteSentStats[ssrc] = nowBytesTransmitted;
-                if (nowBytesTransmitted > 0) {
-                    bytesSent = nowBytesTransmitted
-                        - getStatValue(before, 'bytesSent');
-                }
-            }
-        }
-        bytesSent = Math.max(0, bytesSent);
-
-        const timeMs = now.timestamp - before.timestamp;
-        let bitrateReceivedKbps = 0, bitrateSentKbps = 0;
-
-        if (timeMs > 0) {
-            // TODO is there any reason to round here?
-            bitrateReceivedKbps = Math.round((bytesReceived * 8) / timeMs);
-            bitrateSentKbps = Math.round((bytesSent * 8) / timeMs);
-        }
-
-        ssrcStats.addBitrate({
-            'download': bitrateReceivedKbps,
-            'upload': bitrateSentKbps
-        });
-
-        const resolution = {
-            height: null,
-            width: null
-        };
-
-        try {
-            let height, width;
-
-            if ((height = getStatValue(now, 'googFrameHeightReceived'))
-                && (width = getStatValue(now, 'googFrameWidthReceived'))) {
-                resolution.height = height;
-                resolution.width = width;
-            } else if ((height = getStatValue(now, 'googFrameHeightSent'))
-                && (width = getStatValue(now, 'googFrameWidthSent'))) {
-                resolution.height = height;
-                resolution.width = width;
-            }
-        } catch (e) { /* not supported*/ }
-
-        // Tries to get frame rate
-        let frameRate;
-
-        try {
-            frameRate = getStatValue(now, 'googFrameRateReceived')
-                || getStatValue(now, 'googFrameRateSent') || 0;
-        } catch (e) {
-            // if it fails with previous properties(chrome),
-            // let's try with another one (FF)
-            try {
-                frameRate = this.getNonNegativeStat(now, 'framerateMean');
-            } catch (err) { /* not supported*/ }
-        }
-        ssrcStats.setFramerate(Math.round(frameRate || 0));
-
-        if (resolution.height && resolution.width) {
-            ssrcStats.setResolution(resolution);
-        } else {
-            ssrcStats.setResolution(null);
-        }
-
-        let codec;
-
-        // Try to get the codec for later reporting.
-        try {
-            codec = getStatValue(now, 'googCodecName') || '';
-        } catch (e) { /* not supported*/ }
-
-        ssrcStats.setCodec(codec);
-    }
-
-
-    this.eventEmitter.emit(
-        StatisticsEvents.BYTE_SENT_STATS, this.peerconnection, byteSentStats);
-
-    this._processAndEmitReport();
-};
-
 /**
  *
  */
@@ -891,136 +430,6 @@ StatsCollector.prototype._processAndEmitReport = function() {
     this.conferenceStats.transport = [];
 };
 
-/**
- * Stats processing logic.
- */
-StatsCollector.prototype.processAudioLevelReport = function() {
-    if (!this.baselineAudioLevelsReport) {
-        return;
-    }
-
-    const getStatValue = this._getStatValue;
-
-    for (const idx in this.currentAudioLevelsReport) {
-        if (!this.currentAudioLevelsReport.hasOwnProperty(idx)) {
-            continue;
-        }
-
-        const now = this.currentAudioLevelsReport[idx];
-
-        if (now.type !== 'ssrc' && now.type !== 'track') {
-            continue;
-        }
-
-        const before = this.baselineAudioLevelsReport[idx];
-        let ssrc = this.getNonNegativeStat(now, 'ssrc');
-
-        if (!ssrc && Array.isArray(now.ssrcIds)) {
-            ssrc = Number(now.ssrcIds[0]);
-        }
-
-        if (!before) {
-            logger.warn(`${ssrc} not enough data`);
-            continue;
-        }
-
-        if (!ssrc) {
-            if ((Date.now() - now.timestamp) < 3000) {
-                logger.warn('No ssrc: ');
-            }
-            continue;
-        }
-
-        // Audio level
-        let audioLevel;
-
-        try {
-            audioLevel
-                = getStatValue(now, 'audioInputLevel')
-                    || getStatValue(now, 'audioOutputLevel');
-        } catch (e) { /* not supported*/
-            logger.warn('Audio Levels are not available in the statistics.');
-            clearInterval(this.audioLevelsIntervalId);
-
-            return;
-        }
-
-        if (audioLevel) {
-            let isLocal;
-
-            // If type="ssrc" (legacy) check whether they are received packets.
-            if (now.type === 'ssrc') {
-                isLocal = !getStatValue(now, 'packetsReceived');
-
-            // If type="track", check remoteSource boolean property.
-            } else {
-                isLocal = !now.remoteSource;
-            }
-
-            // According to the W3C WebRTC Stats spec, audioLevel should be in
-            // 0..1 range (0 == silence). However browsers don't behave that
-            // way so we must convert it to 0..1.
-            // TODO: Can't find specs about what this value really is, but it
-            // seems to vary between 0 and around 32k.
-            audioLevel = audioLevel / 32767;
-
-            if (!(ssrc in this.audioLevelReportHistory)) {
-                this.audioLevelReportHistory[ssrc] = {
-                    isLocal,
-                    data: []
-                };
-            }
-            this.audioLevelReportHistory[ssrc].data.push(audioLevel);
-
-            this.eventEmitter.emit(
-                StatisticsEvents.AUDIO_LEVEL,
-                this.peerconnection,
-                ssrc,
-                audioLevel,
-                isLocal);
-        }
-    }
-};
-
-/* eslint-enable no-continue */
-
-/**
- * New promised based getStats report processing.
- * Tested with chrome, firefox and safari. Not switching it on for chrome as
- * frameRate stat is missing and calculating it using framesSent,
- * gives values double the values seen in webrtc-internals.
- * https://w3c.github.io/webrtc-stats/
- */
-
-/**
- * Defines a function which (1) is to be used as a StatsCollector method and (2)
- * gets the value from a specific report returned by RTCPeerConnection#getStats
- * associated with a lib-jitsi-meet browser-agnostic name in case of using
- * Promised based getStats.
- *
- * @param {Object.<string,string>} keys the map of LibJitsi browser-agnostic
- * names to RTCPeerConnection#getStats browser-specific keys
- */
-StatsCollector.prototype._defineNewGetStatValueMethod = function(keys) {
-    // Define the function which converts a lib-jitsi-meet browser-asnostic name
-    // to a browser-specific key of a report returned by
-    // RTCPeerConnection#getStats.
-    const keyFromName = function(name) {
-        const key = keys[name];
-
-        if (key) {
-            return key;
-        }
-
-        throw new Error(`The property '${name}' isn't supported!`);
-    };
-
-    // Compose the 2 functions defined above to get a function which retrieves
-    // the value from a specific report returned by RTCPeerConnection#getStats
-    // associated with a specific lib-jitsi-meet browser-agnostic name.
-    return (item, name) => item[keyFromName(name)];
-};
-
 /**
  * Converts the value to a non-negative number.
  * If the value is either invalid or negative then 0 will be returned.
@@ -1069,24 +478,17 @@ StatsCollector.prototype._calculateBitrate = function(now, before, fieldName) {
 };
 
 /**
- * Stats processing new getStats logic.
+ * Stats processing for spec-compliant RTCPeerConnection#getStats.
  */
-StatsCollector.prototype.processNewStatsReport = function() {
+StatsCollector.prototype.processStatsReport = function() {
     if (!this.previousStatsReport) {
         return;
     }
-
-    const getStatValue = this._getStatValue;
     const byteSentStats = {};
 
     this.currentStatsReport.forEach(now => {
-
-        // RTCIceCandidatePairStats
-        // https://w3c.github.io/webrtc-stats/#candidatepair-dict*
-        if (now.type === 'candidate-pair'
-            && now.nominated
-            && now.state === 'succeeded') {
-
+        // RTCIceCandidatePairStats - https://w3c.github.io/webrtc-stats/#candidatepair-dict*
+        if (now.type === 'candidate-pair' && now.nominated && now.state === 'succeeded') {
             const availableIncomingBitrate = now.availableIncomingBitrate;
             const availableOutgoingBitrate = now.availableOutgoingBitrate;
 
@@ -1097,37 +499,36 @@ StatsCollector.prototype.processNewStatsReport = function() {
                 };
             }
 
-            const remoteUsedCandidate
-                = this.currentStatsReport.get(now.remoteCandidateId);
-            const localUsedCandidate
-                = this.currentStatsReport.get(now.localCandidateId);
+            const remoteUsedCandidate = this.currentStatsReport.get(now.remoteCandidateId);
+            const localUsedCandidate = this.currentStatsReport.get(now.localCandidateId);
 
             // RTCIceCandidateStats
             // https://w3c.github.io/webrtc-stats/#icecandidate-dict*
-            // safari currently does not provide ice candidates in stats
             if (remoteUsedCandidate && localUsedCandidate) {
-                const remoteIpAddress = getStatValue(remoteUsedCandidate, 'ip');
-                const remotePort = getStatValue(remoteUsedCandidate, 'port');
+                const remoteIpAddress = browser.isChromiumBased()
+                    ? remoteUsedCandidate.ip
+                    : remoteUsedCandidate.address;
+                const remotePort = remoteUsedCandidate.port;
                 const ip = `${remoteIpAddress}:${remotePort}`;
 
-                const localIpAddress = getStatValue(localUsedCandidate, 'ip');
-                const localPort = getStatValue(localUsedCandidate, 'port');
-
-                const localIp = `${localIpAddress}:${localPort}`;
-                const type = getStatValue(remoteUsedCandidate, 'protocol');
+                const localIpAddress = browser.isChromiumBased()
+                    ? localUsedCandidate.ip
+                    : localUsedCandidate.address;
+                const localPort = localUsedCandidate.port;
+                const localip = `${localIpAddress}:${localPort}`;
+                const type = remoteUsedCandidate.protocol;
 
                 // Save the address unless it has been saved already.
                 const conferenceStatsTransport = this.conferenceStats.transport;
 
-                if (!conferenceStatsTransport.some(
-                        t =>
-                            t.ip === ip
-                            && t.type === type
-                            && t.localip === localIp)) {
+                if (!conferenceStatsTransport.some(t =>
+                    t.ip === ip
+                    && t.type === type
+                    && t.localip === localip)) {
                     conferenceStatsTransport.push({
                         ip,
                         type,
-                        localIp,
+                        localip,
                         p2p: this.peerconnection.isP2P,
                         localCandidateType: localUsedCandidate.candidateType,
                         remoteCandidateType: remoteUsedCandidate.candidateType,
@@ -1173,12 +574,9 @@ StatsCollector.prototype.processNewStatsReport = function() {
             const packetsBefore = this.getNonNegativeValue(before[key]);
             const packetsDiff = Math.max(0, packetsNow - packetsBefore);
 
-            const packetsLostNow
-                = this.getNonNegativeValue(now.packetsLost);
-            const packetsLostBefore
-                = this.getNonNegativeValue(before.packetsLost);
-            const packetsLostDiff
-                = Math.max(0, packetsLostNow - packetsLostBefore);
+            const packetsLostNow = this.getNonNegativeValue(now.packetsLost);
+            const packetsLostBefore = this.getNonNegativeValue(before.packetsLost);
+            const packetsLostDiff = Math.max(0, packetsLostNow - packetsLostBefore);
 
             ssrcStats.setLoss({
                 packetsTotal: packetsDiff + packetsLostDiff,
@@ -1186,71 +584,36 @@ StatsCollector.prototype.processNewStatsReport = function() {
                 isDownloadStream
             });
 
-            const resolution = {
-                height: null,
-                width: null
-            };
-
-            try {
-                resolution.height = getStatValue(now, 'frameHeight');
-                resolution.width = getStatValue(now, 'frameWidth');
-            } catch (e) { /* not supported*/ }
-
-            // Tries to get frame rate
-            let frameRate;
-
-            try {
-                frameRate = getStatValue(now, 'framesPerSecond');
-            } catch (err) { /* not supported*/ }
-
-            ssrcStats.setFramerate(Math.round(frameRate || 0));
-
-            if (resolution.height && resolution.width) {
-                ssrcStats.setResolution(resolution);
-            } else {
-                ssrcStats.setResolution(null);
-            }
-
+            // Get the resolution and framerate for only remote video sources here. For the local video sources,
+            // 'track' stats will be used since they have the updated resolution based on the simulcast streams
+            // currently being sent. Promise based getStats reports three 'outbound-rtp' streams and there will be
+            // more calculations needed to determine what is the highest resolution stream sent by the client if the
+            // 'outbound-rtp' stats are used.
             if (now.type === 'inbound-rtp') {
+                const resolution = {
+                    height: now.frameHeight,
+                    width: now.frameWidth
+                };
+                const frameRate = now.framesPerSecond;
+
+                if (resolution.height && resolution.width) {
+                    ssrcStats.setResolution(resolution);
+                }
+                ssrcStats.setFramerate(Math.round(frameRate || 0));
 
                 ssrcStats.addBitrate({
-                    'download': this._calculateBitrate(
-                                    now, before, 'bytesReceived'),
+                    'download': this._calculateBitrate(now, before, 'bytesReceived'),
                     'upload': 0
                 });
-
-                // RTCInboundRtpStreamStats
-                // https://w3c.github.io/webrtc-stats/#inboundrtpstats-dict*
-                // TODO: can we use framesDecoded for frame rate, available
-                // in chrome
             } else {
                 byteSentStats[ssrc] = this.getNonNegativeValue(now.bytesSent);
                 ssrcStats.addBitrate({
                     'download': 0,
-                    'upload': this._calculateBitrate(
-                                now, before, 'bytesSent')
+                    'upload': this._calculateBitrate(now, before, 'bytesSent')
                 });
-
-                // RTCOutboundRtpStreamStats
-                // https://w3c.github.io/webrtc-stats/#outboundrtpstats-dict*
-                // TODO: can we use framesEncoded for frame rate, available
-                // in chrome
-            }
-
-            // FF has framerateMean out of spec
-            const framerateMean = now.framerateMean;
-
-            if (framerateMean) {
-                ssrcStats.setFramerate(Math.round(framerateMean || 0));
             }
 
-
-            let codec;
-
-            // Try to get the codec for later reporting.
-            try {
-                codec = this.currentStatsReport.get(now.codecId);
-            } catch (e) { /* not supported*/ }
+            const codec = this.currentStatsReport.get(now.codecId);
 
             if (codec) {
                 /**
@@ -1263,31 +626,47 @@ StatsCollector.prototype.processNewStatsReport = function() {
                 codecShortType && ssrcStats.setCodec(codecShortType);
             }
 
-        // track for resolution
-        // RTCVideoHandlerStats
-        // https://w3c.github.io/webrtc-stats/#vststats-dict*
-        // RTCMediaHandlerStats
-        // https://w3c.github.io/webrtc-stats/#mststats-dict*
-        } else if (now.type === 'track') {
-
+        // Use track stats for resolution and framerate of the local video source.
+        // RTCVideoHandlerStats - https://w3c.github.io/webrtc-stats/#vststats-dict*
+        // RTCMediaHandlerStats - https://w3c.github.io/webrtc-stats/#mststats-dict*
+        } else if (now.type === 'track' && now.kind === MediaType.VIDEO && !now.remoteSource) {
             const resolution = {
                 height: now.frameHeight,
                 width: now.frameWidth
             };
+            const localVideoTracks = this.peerconnection.getLocalTracks(MediaType.VIDEO);
+
+            if (!localVideoTracks?.length) {
+                return;
+            }
 
-            // Tries to get frame rate
+            const ssrc = this.peerconnection.getLocalSSRC(localVideoTracks[0]);
+
+            if (!ssrc) {
+                return;
+            }
+            let ssrcStats = this.ssrc2stats.get(ssrc);
+
+            if (!ssrcStats) {
+                ssrcStats = new SsrcStats();
+                this.ssrc2stats.set(ssrc, ssrcStats);
+            }
+            if (resolution.height && resolution.width) {
+                ssrcStats.setResolution(resolution);
+            }
+
+            // Calculate the frame rate. 'framesSent' is the total aggregate value for all the simulcast streams.
+            // Therefore, it needs to be divided by the total number of active simulcast streams.
             let frameRate = now.framesPerSecond;
 
             if (!frameRate) {
-                // we need to calculate it
                 const before = this.previousStatsReport.get(now.id);
 
                 if (before) {
                     const timeMs = now.timestamp - before.timestamp;
 
                     if (timeMs > 0 && now.framesSent) {
-                        const numberOfFramesSinceBefore
-                            = now.framesSent - before.framesSent;
+                        const numberOfFramesSinceBefore = now.framesSent - before.framesSent;
 
                         frameRate = (numberOfFramesSinceBefore / timeMs) * 1000;
                     }
@@ -1298,38 +677,21 @@ StatsCollector.prototype.processNewStatsReport = function() {
                 }
             }
 
-            const trackIdentifier = now.trackIdentifier;
-            const ssrc = this.peerconnection.getSsrcByTrackId(trackIdentifier);
+            // Get the number of simulcast streams currently enabled from TPC.
+            const numberOfActiveStreams = this.peerconnection.getActiveSimulcastStreams();
 
-            if (!ssrc) {
-                return;
-            }
-            let ssrcStats = this.ssrc2stats.get(ssrc);
-
-            if (!ssrcStats) {
-                ssrcStats = new SsrcStats();
-                this.ssrc2stats.set(ssrc, ssrcStats);
-            }
-            ssrcStats.setFramerate(Math.round(frameRate || 0));
-
-            if (resolution.height && resolution.width) {
-                ssrcStats.setResolution(resolution);
-            } else {
-                ssrcStats.setResolution(null);
-            }
+            ssrcStats.setFramerate(Math.round((frameRate / numberOfActiveStreams) || 0));
         }
     });
 
-    this.eventEmitter.emit(
-        StatisticsEvents.BYTE_SENT_STATS, this.peerconnection, byteSentStats);
-
+    this.eventEmitter.emit(StatisticsEvents.BYTE_SENT_STATS, this.peerconnection, byteSentStats);
     this._processAndEmitReport();
 };
 
 /**
  * Stats processing logic.
  */
-StatsCollector.prototype.processNewAudioLevelReport = function() {
+StatsCollector.prototype.processAudioLevelReport = function() {
     if (!this.baselineAudioLevelsReport) {
         return;
     }
@@ -1364,6 +726,3 @@ StatsCollector.prototype.processNewAudioLevelReport = function() {
     });
 };
 
-/**
- * End new promised based getStats processing methods.
- */