fix(statistics) Use RTCRtpReceiver:getSynchronizationSources for audioLevels always.

Track based stats have been removed recently and RTCRtpReceiver:getSynchronizationSources has been available in the browsers for a while now.

modules/browser/BrowserCapabilities.js

@@ -200,11 +200,7 @@ export default class BrowserCapabilities extends BrowserDetection {
      */
     supportsReceiverStats() {
         return typeof window.RTCRtpReceiver !== 'undefined'
-            && Object.keys(RTCRtpReceiver.prototype).indexOf('getSynchronizationSources') > -1
-
-            // Disable this on Safari because it is reporting 0.000001 as the audio levels for all
-            // remote audio tracks.
-            && !this.isWebKitBased();
+            && Object.keys(RTCRtpReceiver.prototype).indexOf('getSynchronizationSources') > -1;
     }
 
     /**

modules/detection/NoAudioSignalDetection.js

@@ -2,7 +2,6 @@ import EventEmitter from 'events';
 
 import * as JitsiConferenceEvents from '../../JitsiConferenceEvents';
 import * as JitsiTrackEvents from '../../JitsiTrackEvents';
-import browser from '../browser';
 
 import * as DetectionEvents from './DetectionEvents';
 
@@ -32,9 +31,6 @@ export default class NoAudioSignalDetection extends EventEmitter {
         this._timeoutTrigger = null;
         this._hasAudioInput = null;
 
-        if (!browser.supportsReceiverStats()) {
-            conference.statistics.addAudioLevelListener(this._audioLevel.bind(this));
-        }
         conference.on(JitsiConferenceEvents.TRACK_ADDED, this._trackAdded.bind(this));
     }
 
@@ -132,21 +128,19 @@ export default class NoAudioSignalDetection extends EventEmitter {
             this._clearTriggerTimeout();
 
             // Listen for the audio levels on the newly added audio track
-            if (browser.supportsReceiverStats()) {
-                track.on(
-                    JitsiTrackEvents.NO_AUDIO_INPUT,
-                    audioLevel => {
-                        this._handleNoAudioInputDetection(audioLevel);
-                    }
-                );
-                track.on(
-                    JitsiTrackEvents.TRACK_AUDIO_LEVEL_CHANGED,
-                    audioLevel => {
-                        this._handleNoAudioInputDetection(audioLevel);
-                        this._handleAudioInputStateChange(audioLevel);
-                    }
-                );
-            }
+            track.on(
+                JitsiTrackEvents.NO_AUDIO_INPUT,
+                audioLevel => {
+                    this._handleNoAudioInputDetection(audioLevel);
+                }
+            );
+            track.on(
+                JitsiTrackEvents.TRACK_AUDIO_LEVEL_CHANGED,
+                audioLevel => {
+                    this._handleNoAudioInputDetection(audioLevel);
+                    this._handleAudioInputStateChange(audioLevel);
+                }
+            );
         }
     }
 }

modules/statistics/RTPStatsCollector.js

@@ -134,8 +134,6 @@ function ConferenceStats() {
  */
 export default function StatsCollector(peerconnection, audioLevelsInterval, statsInterval, eventEmitter) {
     this.peerconnection = peerconnection;
-    this.baselineAudioLevelsReport = null;
-    this.currentAudioLevelsReport = null;
     this.currentStatsReport = null;
     this.previousStatsReport = null;
     this.audioLevelReportHistory = {};
@@ -196,40 +194,23 @@ StatsCollector.prototype.errorCallback = function(error) {
  * Starts stats updates.
  */
 StatsCollector.prototype.start = function(startAudioLevelStats) {
-    if (startAudioLevelStats) {
-        if (browser.supportsReceiverStats()) {
-            logger.info('Using RTCRtpSynchronizationSource for remote audio levels');
-        }
+    if (startAudioLevelStats && browser.supportsReceiverStats()) {
         this.audioLevelsIntervalId = setInterval(
             () => {
-                if (browser.supportsReceiverStats()) {
-                    const audioLevels = this.peerconnection.getAudioLevels(this.speakerList);
-
-                    for (const ssrc in audioLevels) {
-                        if (audioLevels.hasOwnProperty(ssrc)) {
-                            // Use a scaling factor of 2.5 to report the same
-                            // audio levels that getStats reports.
-                            const audioLevel = audioLevels[ssrc] * 2.5;
-
-                            this.eventEmitter.emit(
-                                StatisticsEvents.AUDIO_LEVEL,
-                                this.peerconnection,
-                                Number.parseInt(ssrc, 10),
-                                audioLevel,
-                                false /* isLocal */);
-                        }
+                const audioLevels = this.peerconnection.getAudioLevels(this.speakerList);
+
+                for (const ssrc in audioLevels) {
+                    if (audioLevels.hasOwnProperty(ssrc)) {
+                        // Use a scaling factor of 2.5 to report the same audio levels that getStats reports.
+                        const audioLevel = audioLevels[ssrc] * 2.5;
+
+                        this.eventEmitter.emit(
+                            StatisticsEvents.AUDIO_LEVEL,
+                            this.peerconnection,
+                            Number.parseInt(ssrc, 10),
+                            audioLevel,
+                            false /* isLocal */);
                     }
-                } else {
-                    // Interval updates
-                    this.peerconnection.getStats()
-                        .then(report => {
-                            this.currentAudioLevelsReport = typeof report?.result === 'function'
-                                ? report.result()
-                                : report;
-                            this.processAudioLevelReport();
-                            this.baselineAudioLevelsReport = this.currentAudioLevelsReport;
-                        })
-                        .catch(error => this.errorCallback(error));
                 }
             },
             this.audioLevelsIntervalMilis
@@ -679,41 +660,3 @@ StatsCollector.prototype.processStatsReport = function() {
 
     this._processAndEmitReport();
 };
-
-/**
- * Stats processing logic.
- */
-StatsCollector.prototype.processAudioLevelReport = function() {
-    if (!this.baselineAudioLevelsReport) {
-        return;
-    }
-
-    this.currentAudioLevelsReport.forEach(now => {
-        if (now.type !== 'track') {
-            return;
-        }
-
-        // Audio level
-        const audioLevel = now.audioLevel;
-
-        if (!audioLevel) {
-            return;
-        }
-
-        const trackIdentifier = now.trackIdentifier;
-        const ssrc = this.peerconnection.getSsrcByTrackId(trackIdentifier);
-
-        if (ssrc) {
-            const isLocal
-                = ssrc === this.peerconnection.getLocalSSRC(
-                this.peerconnection.getLocalTracks(MediaType.AUDIO));
-
-            this.eventEmitter.emit(
-                StatisticsEvents.AUDIO_LEVEL,
-                this.peerconnection,
-                ssrc,
-                audioLevel,
-                isLocal);
-        }
-    });
-};

types/hand-crafted/modules/statistics/RTPStatsCollector.d.ts

@@ -7,7 +7,6 @@ export default class StatsCollector {
   start: ( startAudioLevelStats: unknown ) => void;
   getNonNegativeStat: ( report: unknown, name: string ) => number;
   processStatsReport: () => void;
-  processAudioLevelReport: () => void;
   getNonNegativeValue: ( v: unknown ) => number; // TODO:
   setSpeakerList: ( speakerList: Array<string> ) => void;
 }