Merge branch 'dev/fix-uninferred-types' of github.com:DanielMcAssey/l…

…ib-jitsi-meet into dev/fix-uninferred-types
jitsi · Jan 8, 2024 · 1ee0293 · 1ee0293
2 parents 11a870b + 04416f8
commit 1ee0293
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 39 deletions.
diff --git a/JitsiConference.js b/JitsiConference.js
@@ -381,7 +381,8 @@ JitsiConference.prototype._init = function(options = {}) {
                 ? config.videoQuality.mobileCodecPreferenceOrder
                 : config.videoQuality?.codecPreferenceOrder,
             disabledCodec: _getCodecMimeType(config.videoQuality?.disabledCodec),
-            preferredCodec: _getCodecMimeType(config.videoQuality?.preferredCodec)
+            preferredCodec: _getCodecMimeType(config.videoQuality?.preferredCodec),
+            supportsAv1: config.testing?.enableAv1Support
         },
         p2p: {
             preferenceOrder: browser.isMobileDevice() && config.p2p?.mobileCodecPreferenceOrder
@@ -3077,6 +3078,13 @@ JitsiConference.prototype._updateProperties = function(properties = {}) {
                 });
             }
         });
+
+        const oldValue = this._hasVisitors;
+
+        this._hasVisitors = this.properties['visitor-count'] > 0;
+
+        // as this is visitor leaving, consider it leaving for _maybeStartOrStopP2P
+        oldValue && !this._hasVisitors && this._maybeStartOrStopP2P(true);
     }
 };
 
@@ -3269,7 +3277,8 @@ JitsiConference.prototype._maybeStartOrStopP2P = function(userLeftEvent) {
     if (!this.isP2PEnabled()
             || this.isP2PTestModeEnabled()
             || (browser.isFirefox() && !this._firefoxP2pEnabled)
-            || this.isE2EEEnabled()) {
+            || this.isE2EEEnabled()
+            || this._hasVisitors) {
         logger.info('Auto P2P disabled');
 
         return;

diff --git a/modules/RTC/CodecSelection.js b/modules/RTC/CodecSelection.js
@@ -9,7 +9,7 @@ import browser from '../browser';
 const logger = getLogger(__filename);
 
 // Default video codec preferences on mobile and desktop endpoints.
-const DESKTOP_VIDEO_CODEC_ORDER = [ CodecMimeType.VP9, CodecMimeType.VP8, CodecMimeType.H264, CodecMimeType.AV1 ];
+const DESKTOP_VIDEO_CODEC_ORDER = [ CodecMimeType.VP9, CodecMimeType.VP8, CodecMimeType.H264 ];
 const MOBILE_P2P_VIDEO_CODEC_ORDER = [ CodecMimeType.H264, CodecMimeType.VP8, CodecMimeType.VP9 ];
 const MOBILE_VIDEO_CODEC_ORDER = [ CodecMimeType.VP8, CodecMimeType.VP9, CodecMimeType.H264 ];
 
@@ -112,6 +112,10 @@ export class CodecSelection {
             ? MOBILE_P2P_VIDEO_CODEC_ORDER
             : browser.isMobileDevice() ? MOBILE_VIDEO_CODEC_ORDER : DESKTOP_VIDEO_CODEC_ORDER;
 
+        if (connectionType === 'p2p' || this.options.jvb.supportsAv1) {
+            videoCodecMimeTypes.push(CodecMimeType.AV1);
+        }
+
         const supportedCodecs = videoCodecMimeTypes.filter(codec =>
             (window.RTCRtpReceiver?.getCapabilities?.(MediaType.VIDEO)?.codecs ?? [])
                 .some(supportedCodec => supportedCodec.mimeType.toLowerCase() === `${MediaType.VIDEO}/${codec}`));

diff --git a/modules/connectivity/ConnectionQuality.js b/modules/connectivity/ConnectionQuality.js
@@ -18,30 +18,30 @@ const logger = getLogger(__filename);
 const STATS_MESSAGE_TYPE = 'stats';
 
 const kSimulcastFormats = [
-    { width: 1920,
+    {
         height: 1080,
-        layers: 3,
-        target: 'high' },
-    { width: 1280,
+        target: 'high'
+    },
+    {
         height: 720,
-        layers: 3,
-        target: 'high' },
-    { width: 960,
+        target: 'high'
+    },
+    {
         height: 540,
-        layers: 3,
-        target: 'standard' },
-    { width: 640,
+        target: 'standard'
+    },
+    {
         height: 360,
-        layers: 2,
-        target: 'standard' },
-    { width: 480,
+        target: 'standard'
+    },
+    {
         height: 270,
-        layers: 2,
-        target: 'low' },
-    { width: 320,
+        target: 'low'
+    },
+    {
         height: 180,
-        layers: 1,
-        target: 'low' }
+        target: 'low'
+    }
 ];
 
 /**

diff --git a/modules/statistics/RTPStatsCollector.js b/modules/statistics/RTPStatsCollector.js
@@ -15,12 +15,11 @@ const logger = getLogger(__filename);
  * @returns {number} packet loss percent
  */
 function calculatePacketLoss(lostPackets, totalPackets) {
-    if (!totalPackets || totalPackets <= 0
-            || !lostPackets || lostPackets <= 0) {
-        return 0;
+    if (lostPackets > 0 && totalPackets > 0) {
+        return Math.round(lostPackets / totalPackets * 100);
     }
 
-    return Math.round((lostPackets / totalPackets) * 100);
+    return 0;
 }
 
 /**
@@ -354,18 +353,18 @@ StatsCollector.prototype._processAndEmitReport = function() {
     }
 
     this.conferenceStats.bitrate = {
-        'upload': bitrateUpload,
-        'download': bitrateDownload
+        upload: bitrateUpload,
+        download: bitrateDownload
     };
 
     this.conferenceStats.bitrate.audio = {
-        'upload': audioBitrateUpload,
-        'download': audioBitrateDownload
+        upload: audioBitrateUpload,
+        download: audioBitrateDownload
     };
 
     this.conferenceStats.bitrate.video = {
-        'upload': videoBitrateUpload,
-        'download': videoBitrateDownload
+        upload: videoBitrateUpload,
+        download: videoBitrateDownload
     };
 
     this.conferenceStats.packetLoss = {
@@ -406,13 +405,13 @@ StatsCollector.prototype._processAndEmitReport = function() {
         StatisticsEvents.CONNECTION_STATS,
         this.peerconnection,
         {
-            'bandwidth': this.conferenceStats.bandwidth,
-            'bitrate': this.conferenceStats.bitrate,
-            'packetLoss': this.conferenceStats.packetLoss,
-            'resolution': resolutions,
-            'framerate': framerates,
-            'codec': codecs,
-            'transport': this.conferenceStats.transport,
+            bandwidth: this.conferenceStats.bandwidth,
+            bitrate: this.conferenceStats.bitrate,
+            packetLoss: this.conferenceStats.packetLoss,
+            resolution: resolutions,
+            framerate: framerates,
+            codec: codecs,
+            transport: this.conferenceStats.transport,
             localAvgAudioLevels,
             avgAudioLevels
         });

diff --git a/package.json b/package.json
@@ -81,6 +81,7 @@
   },
   "browser": "dist/umd/lib-jitsi-meet.min.js",
   "module": "dist/esm/JitsiMeetJS.js",
+  "types": "types/index.d.ts",
   "files": [
     "dist",
     "types"

diff --git a/tsconfig.json b/tsconfig.json
@@ -22,7 +22,6 @@
     "**/*.spec.ts",
     "*.conf*.js",
     "index.js",
-    "index.d.ts",
     "lib-jitsi-meet.*.js",
     "webpack*.js",
   ]