fix(unified-plan): Use the new sdp-interop module for Unified plan

Switch to using ontrack for remote tracks, re-use mids/transceivers when remote sources are removed and added.

modules/RTC/TPCUtils.js

@@ -49,6 +49,40 @@ export class TPCUtils {
         ];
     }
 
+    /**
+     * Ensures that the ssrcs associated with a FID ssrc-group appear in the correct order, i.e.,
+     * the primary ssrc first and the secondary rtx ssrc later. This is important for unified
+     * plan since we have only one FID group per media description.
+     * @param {Object} description the webRTC session description instance for the remote
+     * description.
+     * @private
+     */
+    _ensureCorrectOrderOfSsrcs(description) {
+        const parsedSdp = transform.parse(description.sdp);
+
+        parsedSdp.media.forEach(mLine => {
+            if (mLine.type === 'audio') {
+                return;
+            }
+            if (!mLine.ssrcGroups || !mLine.ssrcGroups.length) {
+                return;
+            }
+            let reorderedSsrcs = [];
+
+            mLine.ssrcGroups[0].ssrcs.split(' ').forEach(ssrc => {
+                const sources = mLine.ssrcs.filter(source => source.id.toString() === ssrc);
+
+                reorderedSsrcs = reorderedSsrcs.concat(sources);
+            });
+            mLine.ssrcs = reorderedSsrcs;
+        });
+
+        return new RTCSessionDescription({
+            type: description.type,
+            sdp: transform.write(parsedSdp)
+        });
+    }
+
     /**
      * Obtains stream encodings that need to be configured on the given track.
      * @param {JitsiLocalTrack} localTrack
@@ -176,7 +210,7 @@ export class TPCUtils {
 
             return false;
         }
-        logger.info(`Adding ${localTrack} on ${this.pc}`);
+        logger.debug(`Adding ${localTrack} on ${this.pc}`);
 
         // If the client starts with audio/video muted setting, the transceiver direction
         // will be set to 'recvonly'. Use addStream here so that a MSID is generated for the stream.
@@ -218,7 +252,7 @@ export class TPCUtils {
             return false;
         }
 
-        logger.info(`Removing ${localTrack} on ${this.pc}`);
+        logger.debug(`Removing ${localTrack} on ${this.pc}`);
         transceiver.sender.replaceTrack(null)
             .then(() => {
                 this.pc.localTracks.delete(localTrack.rtcId);
@@ -252,6 +286,7 @@ export class TPCUtils {
             if (!transceiver) {
                 return Promise.reject(new Error('replace track failed'));
             }
+            logger.debug(`Replacing ${oldTrack} with ${newTrack} on ${this.pc}`);
 
             return transceiver.sender.replaceTrack(track)
                 .then(() => {

modules/RTC/TraceablePeerConnection.js

@@ -1,6 +1,7 @@
 /* global __filename, RTCSessionDescription */
 
 import { getLogger } from 'jitsi-meet-logger';
+import { Interop } from '@jitsi/sdp-interop';
 import transform from 'sdp-transform';
 
 import * as GlobalOnErrorHandler from '../util/GlobalOnErrorHandler';
@@ -220,7 +221,6 @@ export default function TraceablePeerConnection(
      * 300 values, i.e. 5 minutes; set to 0 to disable
      */
     this.maxstats = options.maxstats;
-    const Interop = require('@jitsi/sdp-interop').Interop;
 
     this.interop = new Interop();
     const Simulcast = require('@jitsi/sdp-simulcast');
@@ -267,10 +267,23 @@ export default function TraceablePeerConnection(
             this.onicecandidate(event);
         }
     };
-    this.peerconnection.onaddstream
-        = event => this._remoteStreamAdded(event.stream);
-    this.peerconnection.onremovestream
-        = event => this._remoteStreamRemoved(event.stream);
+
+    // Use stream events in plan-b and track events in unified plan.
+    if (browser.usesPlanB()) {
+        this.peerconnection.onaddstream
+            = event => this._remoteStreamAdded(event.stream);
+        this.peerconnection.onremovestream
+            = event => this._remoteStreamRemoved(event.stream);
+    } else {
+        this.peerconnection.ontrack = event => {
+            const stream = event.streams[0];
+
+            this._remoteTrackAdded(stream, event.track, event.transceiver);
+            stream.onremovetrack = evt => {
+                this._remoteTrackRemoved(stream, evt.track);
+            };
+        };
+    }
     this.onsignalingstatechange = null;
     this.peerconnection.onsignalingstatechange = event => {
         this.trace('onsignalingstatechange', this.signalingState);
@@ -421,16 +434,7 @@ TraceablePeerConnection.prototype._getDesiredMediaDirection = function(
  * <tt>false</tt> if it's turned off.
  */
 TraceablePeerConnection.prototype.isSimulcastOn = function() {
-    return !this.options.disableSimulcast
-        && browser.supportsSimulcast()
-
-        // Firefox has been added as supporting simulcast, but it is
-        // experimental so we only want to do it for firefox if the config
-        // option is set.  Unfortunately, browser::supportsSimulcast()
-        // doesn't have a reference to the config options, so we have
-        // to do it here
-        && (!browser.isFirefox()
-            || this.options.enableFirefoxSimulcast);
+    return !this.options.disableSimulcast;
 };
 
 /**
@@ -644,12 +648,21 @@ TraceablePeerConnection.prototype._remoteStreamAdded = function(stream) {
  * @param {MediaStream} stream the WebRTC MediaStream instance which is
  * the parent of the track
  * @param {MediaStreamTrack} track the WebRTC MediaStreamTrack added for remote
- * participant
+ * participant.
+ * @param {RTCRtpTransceiver} transceiver the WebRTC transceiver that is created
+ * for the remote participant in unified plan.
  */
-TraceablePeerConnection.prototype._remoteTrackAdded = function(stream, track) {
+TraceablePeerConnection.prototype._remoteTrackAdded = function(stream, track, transceiver = null) {
     const streamId = RTC.getStreamID(stream);
     const mediaType = track.kind;
 
+    if (!this.isP2P && !RTC.isUserStreamById(streamId)) {
+        logger.info(
+            `${this} ignored remote 'stream added' event for non-user stream`
+             + `id: ${streamId}`);
+
+        return;
+    }
     logger.info(`${this} remote track added:`, streamId, mediaType);
 
     // look up an associated JID for a stream id
@@ -663,9 +676,26 @@ TraceablePeerConnection.prototype._remoteTrackAdded = function(stream, track) {
         return;
     }
 
-    const remoteSDP = new SDP(this.remoteDescription.sdp);
-    const mediaLines
-        = remoteSDP.media.filter(mls => mls.startsWith(`m=${mediaType}`));
+    const remoteSDP = browser.usesPlanB()
+        ? new SDP(this.remoteDescription.sdp)
+        : new SDP(this.peerconnection.remoteDescription.sdp);
+    let mediaLines;
+
+    if (browser.usesUnifiedPlan()) {
+        if (transceiver && transceiver.mid) {
+            const mid = transceiver.mid;
+
+            mediaLines = remoteSDP.media.filter(mls => SDPUtil.findLine(mls, `a=mid:${mid}`));
+        } else {
+            mediaLines = remoteSDP.media.filter(mls => {
+                const msid = SDPUtil.findLine(mls, 'a=msid');
+
+                return typeof msid !== 'undefined' && streamId === msid.substring(7).split(' ')[0];
+            });
+        }
+    } else {
+        mediaLines = remoteSDP.media.filter(mls => mls.startsWith(`m=${mediaType}`));
+    }
 
     if (!mediaLines.length) {
         GlobalOnErrorHandler.callErrorHandler(
@@ -1321,24 +1351,24 @@ const getters = {
             desc = this._injectSsrcGroupForUnifiedSimulcast(desc);
             this.trace('getLocalDescription::postTransform (inject ssrc group)',
                 dumpSDP(desc));
-        }
+        } else {
+            if (browser.doesVideoMuteByStreamRemove()) {
+                desc = this.localSdpMunger.maybeAddMutedLocalVideoTracksToSDP(desc);
+                logger.debug(
+                    'getLocalDescription::postTransform (munge local SDP)', desc);
+            }
 
-        if (browser.doesVideoMuteByStreamRemove()) {
-            desc = this.localSdpMunger.maybeAddMutedLocalVideoTracksToSDP(desc);
-            logger.debug(
-                'getLocalDescription::postTransform (munge local SDP)', desc);
+            // What comes out of this getter will be signalled over Jingle to
+            // the other peer, so we need to make sure the media direction is
+            // 'sendrecv' because we won't change the direction later and don't want
+            // the other peer to think we can't send or receive.
+            //
+            // Note that the description we set in chrome does have the accurate
+            // direction (e.g. 'recvonly'), since that is technically what is
+            // happening (check setLocalDescription impl).
+            desc = enforceSendRecv(desc, this.options);
         }
 
-        // What comes out of this getter will be signalled over Jingle to
-        // the other peer, so we need to make sure the media direction is
-        // 'sendrecv' because we won't change the direction later and don't want
-        // the other peer to think we can't send or receive.
-        //
-        // Note that the description we set in chrome does have the accurate
-        // direction (e.g. 'recvonly'), since that is technically what is
-        // happening (check setLocalDescription impl).
-        desc = enforceSendRecv(desc, this.options);
-
         // See the method's doc for more info about this transformation.
         desc = this.localSdpMunger.transformStreamIdentifiers(desc);
 
@@ -1347,6 +1377,11 @@ const getters = {
     remoteDescription() {
         let desc = this.peerconnection.remoteDescription;
 
+        if (!desc) {
+            logger.debug('getRemoteDescription no remoteDescription found');
+
+            return {};
+        }
         this.trace('getRemoteDescription::preTransform', dumpSDP(desc));
 
         // if we're running on FF, transform to Plan B first.
@@ -1356,7 +1391,7 @@ const getters = {
                 'getRemoteDescription::postTransform (Plan B)', dumpSDP(desc));
         }
 
-        return desc || {};
+        return desc;
     }
 };
 
@@ -1406,7 +1441,7 @@ TraceablePeerConnection.prototype.addTrack = function(track, isInitiator = false
     }
 
     // Muted video tracks do not have WebRTC stream
-    if (browser.doesVideoMuteByStreamRemove()
+    if (browser.usesPlanB() && browser.doesVideoMuteByStreamRemove()
             && track.isVideoTrack() && track.isMuted()) {
         const ssrcInfo = this.generateNewStreamSSRCInfo(track);
 
@@ -1793,12 +1828,12 @@ TraceablePeerConnection.prototype.setLocalDescription = function(description) {
             dumpSDP(localSdp));
     }
 
-    localSdp = this._adjustLocalMediaDirection(localSdp);
-
-    localSdp = this._ensureSimulcastGroupIsLast(localSdp);
+    if (browser.usesPlanB()) {
+        localSdp = this._adjustLocalMediaDirection(localSdp);
+        localSdp = this._ensureSimulcastGroupIsLast(localSdp);
+    } else {
 
-    // if we're using unified plan, transform to it first.
-    if (browser.usesUnifiedPlan()) {
+        // if we're using unified plan, transform to it first.
         localSdp = this.interop.toUnifiedPlan(localSdp);
         this.trace(
             'setLocalDescription::postTransform (Unified Plan)',
@@ -1889,7 +1924,7 @@ TraceablePeerConnection.prototype.setMaxBitRate = function(localTrack) {
                 if (!parameters.encodings || !parameters.encodings.length) {
                     return;
                 }
-                logger.info('Setting max bitrate on video stream');
+                logger.debug('Setting max bitrate on video stream');
                 for (const encoding in parameters.encodings) {
                     if (parameters.encodings.hasOwnProperty(encoding)) {
                         parameters.encodings[encoding].maxBitrate
@@ -1915,64 +1950,51 @@ TraceablePeerConnection.prototype.setMaxBitRate = function(localTrack) {
 TraceablePeerConnection.prototype.setRemoteDescription = function(description) {
     this.trace('setRemoteDescription::preTransform', dumpSDP(description));
 
-    // TODO the focus should squeze or explode the remote simulcast
-    // eslint-disable-next-line no-param-reassign
-    description = this.simulcast.mungeRemoteDescription(description);
-    this.trace(
-        'setRemoteDescription::postTransform (simulcast)',
-        dumpSDP(description));
+    if (browser.usesPlanB()) {
+        // TODO the focus should squeze or explode the remote simulcast
+        // eslint-disable-next-line no-param-reassign
+        description = this.simulcast.mungeRemoteDescription(description);
+        this.trace(
+            'setRemoteDescription::postTransform (simulcast)',
+            dumpSDP(description));
 
-    if (this.options.preferH264) {
-        const parsedSdp = transform.parse(description.sdp);
-        const videoMLine = parsedSdp.media.find(m => m.type === 'video');
+        if (this.options.preferH264) {
+            const parsedSdp = transform.parse(description.sdp);
+            const videoMLine = parsedSdp.media.find(m => m.type === 'video');
 
-        SDPUtil.preferVideoCodec(videoMLine, 'h264');
+            SDPUtil.preferVideoCodec(videoMLine, 'h264');
 
-        // eslint-disable-next-line no-param-reassign
-        description = new RTCSessionDescription({
-            type: description.type,
-            sdp: transform.write(parsedSdp)
-        });
-    }
+            // eslint-disable-next-line no-param-reassign
+            description = new RTCSessionDescription({
+                type: description.type,
+                sdp: transform.write(parsedSdp)
+            });
+        }
 
-    // If the browser uses unified plan, transform to it first
-    if (browser.usesUnifiedPlan()) {
         // eslint-disable-next-line no-param-reassign
-        description = new RTCSessionDescription({
-            type: description.type,
-            sdp: this.rtxModifier.stripRtx(description.sdp)
-        });
-
-        this.trace(
-            'setRemoteDescription::postTransform (stripRtx)',
-            dumpSDP(description));
+        description = normalizePlanB(description);
+    } else {
+        const currentDescription = this.peerconnection.remoteDescription;
 
         // eslint-disable-next-line no-param-reassign
-        description = this.interop.toUnifiedPlan(description);
+        description = this.interop.toUnifiedPlan(description, currentDescription);
         this.trace(
-            'setRemoteDescription::postTransform (Plan A)',
+            'setRemoteDescription::postTransform (Unified)',
             dumpSDP(description));
 
         if (this.isSimulcastOn()) {
+            // eslint-disable-next-line no-param-reassign
+            description = this.simulcast.mungeRemoteDescription(description);
+
             // eslint-disable-next-line no-param-reassign
             description = this.tpcUtils._insertUnifiedPlanSimulcastReceive(description);
             this.trace(
                 'setRemoteDescription::postTransform (sim receive)',
                 dumpSDP(description));
-        }
-    } else {
-        // Plan B
-        // eslint-disable-next-line no-param-reassign
-        description = normalizePlanB(description);
-    }
 
-    // Safari WebRTC errors when no supported video codec is found in the offer.
-    // To prevent the error, inject H264 into the video mLine.
-    if (browser.isSafariWithWebrtc() && !browser.isSafariWithVP8()) {
-        logger.debug('Maybe injecting H264 into the remote description');
-
-        // eslint-disable-next-line no-param-reassign
-        description = this._injectH264IfNotPresent(description);
+            // eslint-disable-next-line no-param-reassign
+            description = this.tpcUtils._ensureCorrectOrderOfSsrcs(description);
+        }
     }
 
     return new Promise((resolve, reject) => {
@@ -1998,76 +2020,6 @@ TraceablePeerConnection.prototype.setRemoteDescription = function(description) {
     });
 };
 
-/**
- * Inserts an H264 payload into the description if not already present. This is
- * need for Safari WebRTC, which errors when no supported video codec is found
- * in the offer. Related bug reports:
- * https://bugs.webkit.org/show_bug.cgi?id=173141
- * https://bugs.chromium.org/p/webrtc/issues/detail?id=4957
- *
- * @param {RTCSessionDescription} description - An RTCSessionDescription
- * to inject with an H264 payload.
- * @private
- * @returns {RTCSessionDescription}
- */
-TraceablePeerConnection.prototype._injectH264IfNotPresent = function(
-        description) {
-    const parsedSdp = transform.parse(description.sdp);
-    const videoMLine = parsedSdp.media.find(m => m.type === 'video');
-
-    if (!videoMLine) {
-        logger.debug('No videoMLine found, no need to inject H264.');
-
-        return description;
-    }
-
-    if (videoMLine.rtp.some(rtp => rtp.codec.toLowerCase() === 'h264')) {
-        logger.debug('H264 codec found in video mLine, no need to inject.');
-
-        return description;
-    }
-
-    const { fmtp, payloads, rtp } = videoMLine;
-    const payloadsArray = payloads.toString().split(' ');
-    let dummyPayloadType;
-
-    for (let i = 127; i >= 96; i--) {
-        if (!payloadsArray.includes(i)) {
-            dummyPayloadType = i;
-            payloadsArray.push(i);
-            videoMLine.payloads = payloadsArray.join(' ');
-            break;
-        }
-    }
-
-    if (typeof dummyPayloadType === 'undefined') {
-        logger.error('Could not find valid payload type to inject.');
-
-        return description;
-    }
-
-    rtp.push({
-        codec: 'H264',
-        payload: dummyPayloadType,
-        rate: 90000
-    });
-
-    fmtp.push({
-        config: 'level-asymmetry-allowed=1;'
-            + 'packetization-mode=1;'
-            + 'profile-level-id=42e01f',
-        payload: dummyPayloadType
-    });
-
-    logger.debug(
-        `Injecting H264 payload type ${dummyPayloadType} into video mLine.`);
-
-    return new RTCSessionDescription({
-        type: description.type,
-        sdp: transform.write(parsedSdp)
-    });
-};
-
 /**
  * Enables/disables video media transmission on this peer connection. When
  * disabled the SDP video media direction in the local SDP will be adjusted to
@@ -2278,17 +2230,6 @@ const _fixAnswerRFC4145Setup = function(offer, answer) {
 };
 
 TraceablePeerConnection.prototype.createAnswer = function(constraints) {
-    if (browser.isFirefox() && this.isSimulcastOn()) {
-        const videoSender
-            = this.peerconnection.getSenders().find(sender =>
-                sender.track !== null && sender.track.kind === 'video');
-        const simParams = {
-            encodings: this.tpcUtils.simulcastEncodings
-        };
-
-        videoSender.setParameters(simParams);
-    }
-
     return this._createOfferOrAnswer(false /* answer */, constraints);
 };
 
@@ -2319,32 +2260,7 @@ TraceablePeerConnection.prototype._createOfferOrAnswer = function(
             this.trace(
                 `create${logName}OnSuccess::preTransform`, dumpSDP(resultSdp));
 
-            // if we're using unified plan, transform to Plan B.
-            if (browser.usesUnifiedPlan()) {
-                // eslint-disable-next-line no-param-reassign
-                resultSdp = this.interop.toPlanB(resultSdp);
-                this.trace(
-                    `create${logName}OnSuccess::postTransform (Plan B)`,
-                    dumpSDP(resultSdp));
-                if (this.isSimulcastOn()) {
-                    // eslint-disable-next-line no-param-reassign
-                    resultSdp
-                        = this._injectSsrcGroupForUnifiedSimulcast(resultSdp);
-                    this.trace(
-                        `create${logName}OnSuccess::postTransform`
-                        + '(inject ssrc group)', dumpSDP(resultSdp));
-                }
-            }
-
-            /**
-             * We don't keep ssrcs consitent for Firefox because rewriting
-             *  the ssrcs between createAnswer and setLocalDescription breaks
-             *  the caching in sdp-interop (sdp-interop must know about all
-             *  ssrcs, and it updates its cache in toPlanB so if we rewrite them
-             *  after that, when we try and go back to unified plan it will
-             *  complain about unmapped ssrcs)
-             */
-            if (!browser.usesUnifiedPlan()) {
+            if (browser.usesPlanB()) {
                 // If there are no local video tracks, then a "recvonly"
                 // SSRC needs to be generated
                 if (!this.hasAnyTracksOfType(MediaType.VIDEO)

modules/RTC/TraceablePeerConnection.spec.js

@@ -1,51 +0,0 @@
-import transform from 'sdp-transform';
-
-import { multiCodecVideoSdp, plainVideoSdp } from '../xmpp/SampleSdpStrings';
-
-import TraceablePeerConnection from './TraceablePeerConnection';
-
-describe('TraceablePeerConnection', () => {
-    describe('_injectH264IfNotPresent', () => {
-        // Store the method-in-test in a convenience variable.
-        const injectFunction
-            = TraceablePeerConnection.prototype._injectH264IfNotPresent;
-        const MockSessionDescription = function({ sdp }) {
-            this.sdp = sdp;
-        };
-        const originalSessionDescription = window.originalSessionDescription;
-
-        beforeEach(() => {
-            window.RTCSessionDescription = MockSessionDescription;
-        });
-
-        afterEach(() => {
-            window.RTCSessionDescription = originalSessionDescription;
-        });
-
-        it('adds h264', () => {
-            const sessionDescription = new MockSessionDescription({
-                sdp: transform.write(plainVideoSdp)
-            });
-            const { sdp } = injectFunction(sessionDescription);
-            const expectedH264Payload = [
-                'm=video 9 RTP/SAVPF 100 127',
-                'a=rtpmap:127 H264/90000',
-                'a=fmtp:127 level-asymmetry-allowed=1;'
-                    + 'packetization-mode=1;'
-                    + 'profile-level-id=42e01f'
-            ];
-
-            expectedH264Payload.forEach(h264Description =>
-                expect(sdp.indexOf(h264Description) > -1).toBe(true));
-        });
-
-        it('does not modify the description if H264 is present', () => {
-            const sessionDescription = new MockSessionDescription({
-                sdp: transform.write(multiCodecVideoSdp)
-            });
-            const result = injectFunction(sessionDescription);
-
-            expect(result).toEqual(sessionDescription);
-        });
-    });
-});

modules/browser/BrowserCapabilities.js

@@ -39,7 +39,7 @@ export default class BrowserCapabilities extends BrowserDetection {
      * otherwise.
      */
     supportsP2P() {
-        return !this.isFirefox();
+        return !this.usesUnifiedPlan();
     }
 
     /**
@@ -181,15 +181,6 @@ export default class BrowserCapabilities extends BrowserDetection {
         return !this.isFirefox() && !this.usesUnifiedPlan();
     }
 
-    /**
-     * Whether jitsi-meet supports simulcast on the current browser.
-     * @returns {boolean}
-     */
-    supportsSimulcast() {
-        return this.isChromiumBased() || this.isFirefox()
-            || this.isSafariWithVP8() || this.isReactNative();
-    }
-
     /**
      * Returns whether or not the current browser can support capturing video,
      * be it camera or desktop, and displaying received video.

modules/xmpp/JingleSessionPC.js

@@ -1597,16 +1597,31 @@ export default class JingleSessionPC extends JingleSession {
      *  in removeSsrcInfo
      */
     _processRemoteRemoveSource(removeSsrcInfo) {
-        const remoteSdp = new SDP(this.peerconnection.remoteDescription.sdp);
+        const remoteSdp = browser.usesPlanB()
+            ? new SDP(this.peerconnection.remoteDescription.sdp)
+            : new SDP(this.peerconnection.peerconnection.remoteDescription.sdp);
 
         removeSsrcInfo.forEach((lines, idx) => {
             // eslint-disable-next-line no-param-reassign
             lines = lines.split('\r\n');
             lines.pop(); // remove empty last element;
-            lines.forEach(line => {
-                remoteSdp.media[idx]
-                    = remoteSdp.media[idx].replace(`${line}\r\n`, '');
-            });
+            if (browser.usesPlanB()) {
+                lines.forEach(line => {
+                    remoteSdp.media[idx]
+                        = remoteSdp.media[idx].replace(`${line}\r\n`, '');
+                });
+            } else {
+                lines.forEach(line => {
+                    const mid = remoteSdp.media.findIndex(mLine => mLine.includes(line));
+
+                    if (mid > -1) {
+                        remoteSdp.media[mid] = remoteSdp.media[mid].replace(`${line}\r\n`, '');
+
+                        // Change the direction to "inactive".
+                        remoteSdp.media[mid] = remoteSdp.media[mid].replace('a=sendonly', 'a=inactive');
+                    }
+                });
+            }
         });
         remoteSdp.raw = remoteSdp.session + remoteSdp.media.join('');
 
@@ -1701,28 +1716,6 @@ export default class JingleSessionPC extends JingleSession {
      * @private
      */
     _initiatorRenegotiate(remoteDescription) {
-        if (this.peerconnection.signalingState === 'have-local-offer') {
-            // Skip createOffer and setLocalDescription or FF will fail
-            logger.debug(
-                'Renegotiate: setting remote description');
-
-            /* eslint-disable arrow-body-style */
-
-            return this.peerconnection.setRemoteDescription(remoteDescription)
-                .then(() => {
-                    // In case when the answer is being set for the first time,
-                    // full sRD/sLD cycle is required to have the local
-                    // description updated and SSRCs synchronized correctly.
-                    // Otherwise SSRCs for streams added after invite, but
-                    // before the answer was accepted will not be detected.
-                    // The reason for that is that renegotiate can not be called
-                    // when adding tracks and they will not be reflected in
-                    // the local SDP.
-                    return this._initiatorRenegotiate(remoteDescription);
-                });
-            /* eslint-enable arrow-body-style */
-        }
-
         logger.debug('Renegotiate: creating offer');
 
         return this.peerconnection.createOffer(this.mediaConstraints)

package-lock.json

@@ -1305,17 +1305,18 @@
       }
     },
     "@jitsi/sdp-interop": {
-      "version": "0.1.14",
-      "resolved": "https://registry.npmjs.org/@jitsi/sdp-interop/-/sdp-interop-0.1.14.tgz",
-      "integrity": "sha512-v60VAtBx9LO46c9In9oMNY+Ho5993UMOLHBg6VcrcyoVTIWIeqs/9YjjmrQ3Sf4I5aMRABNl7HTby/1lHcqFJw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@jitsi/sdp-interop/-/sdp-interop-1.0.1.tgz",
+      "integrity": "sha512-OJm8IYsJKCYJBlC0geRHm2VHi8ow2k/3wOZ7n0lEOBfV6RWghZQzQWHdT/qrkbXB2EHcm40Oy91a5Bfz2m6ydA==",
       "requires": {
+        "lodash.clonedeep": "4.5.0",
         "sdp-transform": "2.3.0"
       }
     },
     "@jitsi/sdp-simulcast": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@jitsi/sdp-simulcast/-/sdp-simulcast-0.2.2.tgz",
-      "integrity": "sha512-zQt9DRnG/wn7bQg3nat0+G2yptBtuZuQN0iG5LHy4/wedyzV7HjEE73Zod69i7boZlRgvdjyexoaiwisrj9knw==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@jitsi/sdp-simulcast/-/sdp-simulcast-0.3.0.tgz",
+      "integrity": "sha512-lxHfIWgTvdVY7F7BOcC3OaFvyvLsQJVRBCQvfmz4/Pk21/FdCyeBW4gv9ogfxxisjarU8gPX7/up4Z3C17wuXw==",
       "requires": {
         "sdp-transform": "2.3.0"
       }
@@ -6644,6 +6645,11 @@
       "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
       "dev": true
     },
+    "lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
+    },
     "lodash.cond": {
       "version": "4.5.2",
       "resolved": "https://registry.npmjs.org/lodash.cond/-/lodash.cond-4.5.2.tgz",

package.json

@@ -16,8 +16,8 @@
   "author": "",
   "readmeFilename": "README.md",
   "dependencies": {
-    "@jitsi/sdp-interop": "0.1.14",
-    "@jitsi/sdp-simulcast": "0.2.2",
+    "@jitsi/sdp-interop": "1.0.1",
+    "@jitsi/sdp-simulcast": "0.3.0",
     "async": "0.9.0",
     "current-executing-script": "0.1.3",
     "jitsi-meet-logger": "github:jitsi/jitsi-meet-logger#5ec92357570dc8f0b7ffc1528820721c84c6af8b",