@reactoo/watchtogether-sdk-js 2.6.73 → 2.6.75

package/example/index.html

@@ -212,7 +212,7 @@
             .then(r => Instance.room.createSession({constructId, roomId:r.roomId, pinHash: r.pinHash, role:'participant', options: {
                     simulcast: true,
                     simulcastMode: {default: 'controlled', screen: 'manual'}, // controlled, manual, auto ... key is the device source (default = all)
-                    simulcastDefaultManualSubstream: {default:2, screen: 0},  // 2 lowest quality, 0 highest quality ... key is the device source (default = all)
+                    simulcastDefaultManualSubstream: {default:0, screen: 0},  // 2 lowest quality, 0 highest quality ... key is the device source (default = all)
                     // those are for videowall (see that 4 fps preview for producer panel)
                     simulcastBitrates: [
                         { rid: 'l', active: true, maxBitrate: 180000, maxFramerate: 4, scaleResolutionDownBy: 4, priority: "low" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reactoo/watchtogether-sdk-js",
-  "version": "2.6.73",
+  "version": "2.6.75",
   "description": "Javascript SDK for Reactoo",
   "main": "src/index.js",
   "unpkg": "dist/watchtogether-sdk.min.js",

package/src/modules/wt-room.js

@@ -209,8 +209,8 @@ class RoomSession {
 		this.isMuted = [];
 		this.isVideoEnabled = false;
 		this.isAudioEnabed = false;
-		this._statsMaxLength = 21;
-		this._upStatsLength = 20;
+		this._statsMaxLength = 16;
+		this._upStatsLength = 15;
 		this._downStatsLength = 5;
 		this._statsTimeoutStopped = true;
 		this._statsTimeoutId = null;
@@ -784,7 +784,7 @@ class RoomSession {
 			let temporal = msg["temporal"];
 
 			if(substream !== undefined && substream !== null) {
-				this._log('Substream: ',substream);
+				this._log('Substream: ', sender, mid, substream);
 				this._setSelectedSubstream(sender, mid, substream);
 				this._resetStats(sender, mid);
 			}
@@ -966,6 +966,7 @@ class RoomSession {
 					isIceRestarting: false,
 					stats: {},
 					selectedSubstream: {},
+					initialSimulcastSubstreamBeenSet: {},
 					simulcastSubstreamManualSelect: {},
 					simulcastSwitchFailedAttempts: {},
 				};
@@ -1023,6 +1024,7 @@ class RoomSession {
 					isIceRestarting: false,
 					stats: {},
 					selectedSubstream: {},
+					initialSimulcastSubstreamBeenSet: {},
 					simulcastSubstreamManualSelect: {},
 					simulcastSwitchFailedAttempts: {},
 				}
@@ -1103,13 +1105,17 @@ class RoomSession {
 		let config = handle.webrtcStuff;
 		config.tracksMap = structuredClone(streams.map(s => {
 			let source = null;
+			let simulcastBitrates = null;
 			try {
-				source = JSON.parse(s.description)?.source;
+				const description = JSON.parse(s.description);
+				source = description?.source;
+				simulcastBitrates = description?.simulcastBitrates;
 			} catch(e) {}
 			return {
 				active: !s.disabled,
 				description: s.description,
 				source: source,
+				simulcastBitrates: simulcastBitrates,
 				display: s.display,
 				id: s.id,
 				mid: s.mid,
@@ -1258,7 +1264,8 @@ class RoomSession {
 		simulcast = false,
 		simulcastBitrates = this.simulcastBitrates,
 		simulcastMode = this.simulcastMode,
-		simulcastDefaultManualSubstream = this.simulcastDefaultManualSubstream
+		simulcastDefaultManualSubstream = this.simulcastDefaultManualSubstream,
+		simulcastInitialSubstream = null
 	) {
 
 		if (this.isConnecting) {
@@ -1566,7 +1573,8 @@ class RoomSession {
 					const mids = transceivers?.filter(t => t.receiver.track.kind === "video")?.map(t => t.mid) || [];
 					mids.forEach(mid => {
 
-						const source = p.webrtcStuff.tracksMap.find(t => t.mid === mid)?.source;
+						const {source, simulcastBitrates} = p.webrtcStuff.tracksMap.find(t => t.mid === mid) || {};
+						const initialSubstreamBeenSet = !!p.webrtcStuff.initialSimulcastSubstreamBeenSet[mid];
 						const manualSelectedSubstream = p.webrtcStuff.simulcastSubstreamManualSelect?.[mid];
 						const defaultSelectedSubstream = typeof this.simulcastDefaultManualSubstream === 'object'
 								? (this.simulcastDefaultManualSubstream[source] !== undefined ? this.simulcastDefaultManualSubstream[source] : this.simulcastDefaultManualSubstream['default'])
@@ -1580,9 +1588,10 @@ class RoomSession {
 							// do nothing
 						}
 						
-						else if(simulcastMode === 'manual' || manualSelectedSubstream) {
+						else if(simulcastMode === 'manual' || manualSelectedSubstream || !initialSubstreamBeenSet) {
+							p.webrtcStuff.initialSimulcastSubstreamBeenSet[mid] = true;
 							const currentSubstream = p.webrtcStuff.selectedSubstream[mid];
-							if(manualSelectedSubstream && currentSubstream !== manualSelectedSubstream) {
+							if(manualSelectedSubstream !== undefined && manualSelectedSubstream !== null && currentSubstream !== manualSelectedSubstream) {
 								this.selectSubStream(p.handleId, manualSelectedSubstream, undefined, mid, false)
 									.then(() => {
 										p.webrtcStuff.simulcastSwitchFailedAttempts[mid] = 0
@@ -1596,7 +1605,7 @@ class RoomSession {
 										}
 									});
 							}
-							else if(defaultSelectedSubstream !== currentSubstream) {
+							else if(defaultSelectedSubstream !== undefined && defaultSelectedSubstream !== null && defaultSelectedSubstream !== currentSubstream) {
 								this.selectSubStream(p.handleId, defaultSelectedSubstream, undefined, mid, false)
 									.then(() => {
 										p.webrtcStuff.simulcastSwitchFailedAttempts[mid] = 0
@@ -1614,11 +1623,11 @@ class RoomSession {
 
 						else if(simulcastMode === 'controlled') {
 							const currentSubstream = p.webrtcStuff.selectedSubstream[mid];
-							const settingsForCurrentSubstream = this.simulcastBitrates?.[this.simulcastBitrates.length - 1 - currentSubstream];
+							const settingsForCurrentSubstream = simulcastBitrates?.[simulcastBitrates.length - 1 - currentSubstream];
 							let directionDecision = 0;
 							if(p.webrtcStuff?.stats?.[mid]?.length > this._upStatsLength) {
 								const upMedianStats = this._calculateMedianStats(p.webrtcStuff.stats[mid].slice(this._upStatsLength * -1));
-								if(upMedianStats?.framesPerSecond > Math.floor(settingsForCurrentSubstream.maxFramerate * 0.9) || upMedianStats?.freezeDurationSinceLast < (this._upStatsLength * this._statsInterval * 0.1) / 1000 || this._upStatsLength?.freezeCountSinceLast < 3) {
+								if(upMedianStats?.framesPerSecond >= Math.floor(settingsForCurrentSubstream.maxFramerate * 0.7) && upMedianStats?.freezeDurationSinceLast < (this._upStatsLength * this._statsInterval * 0.33) / 1000 && upMedianStats?.freezeCountSinceLast < 3) {
 									directionDecision = 1;
 								}
 							}
@@ -1631,7 +1640,7 @@ class RoomSession {
 							}
 
 							if(directionDecision === -1) {
-								if(currentSubstream < this.simulcastBitrates.length - 1) {
+								if(currentSubstream < simulcastBitrates.length - 1) {
 									this._log('switching to low res', currentSubstream + 1);
 									this.selectSubStream(p.handleId, currentSubstream + 1, undefined, mid, false)
 										.then(() => {
@@ -2757,7 +2766,7 @@ class RoomSession {
 					config.streamMap[source].forEach(trackId => {
 						let t = transceivers.find(transceiver => transceiver.sender.track && transceiver.sender.track.id === trackId)
 						if(t) {
-							descriptions.push({mid: t.mid, description: JSON.stringify({source, intercomGroups: this._talkIntercomChannels})});
+							descriptions.push({mid: t.mid, description: JSON.stringify({source, simulcastBitrates: this.simulcastBitrates, intercomGroups: this._talkIntercomChannels})});
 						}
 					})
 				});
@@ -3050,7 +3059,7 @@ class RoomSession {
 			config.streamMap[source].forEach(trackId => {
 				let t = transceivers.find(transceiver => transceiver.sender.track && transceiver.sender.track.id === trackId)
 				if(t) {
-					descriptions.push({mid: t.mid, description: JSON.stringify({intercomGroups: groups, source:source})});
+					descriptions.push({mid: t.mid, description: JSON.stringify({simulcastBitrates: this.simulcastBitrates, intercomGroups: groups, source:source})});
 				}
 			})
 		});