fix(TPC): reconfigure the encodings to suspend/resume media after jvb<->p2p switch.

JitsiConference.js

@@ -1388,11 +1388,6 @@ JitsiConference.prototype._setupNewTrack = function(newTrack) {
     this.rtc.addLocalTrack(newTrack);
     newTrack.setConference(this);
 
-    // Suspend media on the inactive media session since it gets automatically enabled for a newly added source.
-    if (this.isP2PActive()) {
-        this._suspendMediaTransferForJvbConnection();
-    }
-
     // Add event handlers.
     newTrack.muteHandler = this._fireMuteChangeEvent.bind(this, newTrack);
     newTrack.addEventListener(JitsiTrackEvents.TRACK_MUTE_CHANGED, newTrack.muteHandler);

modules/RTC/TPCUtils.js

@@ -409,20 +409,23 @@ export class TPCUtils {
         const encodingsState = videoStreamEncodings
         .map(encoding => height / encoding.scaleResolutionDownBy)
         .map((frameHeight, idx) => {
+            let activeState = false;
+
+            // When video is suspended on the media session.
+            if (!this.pc.videoTransferActive) {
+                return activeState;
+            }
+
             // Single video stream.
             if (!this.pc.isSpatialScalabilityOn() || this._isRunningInFullSvcMode(codec)) {
                 const { active } = this._calculateActiveEncodingParams(localVideoTrack, codec, newHeight);
 
-                return idx === 0 ? active : false;
+                return idx === 0 ? active : activeState;
             }
 
-            // Multiple video streams.
-            let active = false;
-
             if (newHeight > 0) {
                 if (localVideoTrack.getVideoType() === VideoType.CAMERA) {
-
-                    active = frameHeight <= newHeight
+                    activeState = frameHeight <= newHeight
 
                         // Keep the LD stream enabled even when the LD stream's resolution is higher than of the
                         // requested resolution. This can happen when camera is captured at high resolutions like 4k
@@ -433,12 +436,12 @@ export class TPCUtils {
                 } else {
                     // For screenshare, keep the HD layer enabled always and the lower layers only for high fps
                     // screensharing.
-                    active = videoStreamEncodings[idx].scaleResolutionDownBy === SIM_LAYERS[2].scaleFactor
+                    activeState = videoStreamEncodings[idx].scaleResolutionDownBy === SIM_LAYERS[2].scaleFactor
                         || !this._isScreenshareBitrateCapped(localVideoTrack);
                 }
             }
 
-            return active;
+            return activeState;
         });
 
         return encodingsState;