fix(ssrc-rewriting) Update mute state after source is re-mapped.

Also add all the orphan jvb tracks to the conference when the call switches over from p2p to jvb.

JitsiConference.js

@@ -3091,18 +3091,18 @@ JitsiConference.prototype._addRemoteP2PTracks = function() {
 
 /**
  * Generates fake "remote track added" events for given Jingle session.
- * @param {string} logName the session's nickname which will appear in log
- * messages.
+ * @param {string} logName the session's nickname which will appear in log messages.
  * @param {Array<JitsiRemoteTrack>} remoteTracks the tracks that will be added
  * @private
  */
 JitsiConference.prototype._addRemoteTracks = function(logName, remoteTracks) {
-    // Add tracks for the participants that are still in the call.
-    const existingTracks = remoteTracks.filter(t => this.participants.has(t.ownerEndpointId));
-
-    for (const track of existingTracks) {
-        logger.info(`Adding remote ${logName} track: ${track}`);
-        this.onRemoteTrackAdded(track);
+    for (const track of remoteTracks) {
+        // There will be orphan (with no owner) tracks when ssrc-rewriting is enabled and all of them need to be addded
+        // back to the conference.
+        if (FeatureFlags.isSsrcRewritingSupported() || this.participants.has(track.ownerEndpointId)) {
+            logger.info(`Adding remote ${logName} track: ${track}`);
+            this.onRemoteTrackAdded(track);
+        }
     }
 };
 

modules/RTC/TraceablePeerConnection.js

@@ -626,6 +626,10 @@ TraceablePeerConnection.prototype._sourceMutedChanged = function(sourceName, isM
     const track = this.getRemoteTracks().find(t => t.getSourceName() === sourceName);
 
     if (!track) {
+        if (FeatureFlags.isSsrcRewritingSupported()) {
+            logger.debug(`Remote track not found for source=${sourceName}, mute update failed!`);
+        }
+
         return;
     }
 

modules/xmpp/JingleSessionPC.js

@@ -1815,6 +1815,12 @@ export default class JingleSessionPC extends JingleSession {
 
                         track._setVideoType(type);
                     }
+
+                    // Update the muted state on the track since the presence for this track could have been received
+                    // before the updated source map is received on the bridge channel.
+                    const peerMediaInfo = this._signalingLayer.getPeerMediaInfo(owner, mediaType, source);
+
+                    peerMediaInfo && this.peerconnection._sourceMutedChanged(source, peerMediaInfo.muted);
                 } else {
                     logger.error(`Remote track attached to a remote SSRC=${ssrc} not found`);
                 }