twilio-video 2.18.2 → 2.20.0

package/es5/signaling/v2/peerconnection.js

@@ -36,33 +36,27 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from) {
     return to;
 };
 var DefaultBackoff = require('backoff');
-var _a = require('@twilio/webrtc'), DefaultMediaStream = _a.MediaStream, DefaultRTCIceCandidate = _a.RTCIceCandidate, DefaultRTCPeerConnection = _a.RTCPeerConnection, DefaultRTCSessionDescription = _a.RTCSessionDescription, getStatistics = _a.getStats;
-var guessBrowser = require('@twilio/webrtc/lib/util').guessBrowser;
-var getSdpFormat = require('@twilio/webrtc/lib/util/sdp').getSdpFormat;
+var _a = require('@twilio/webrtc'), DefaultRTCIceCandidate = _a.RTCIceCandidate, DefaultRTCPeerConnection = _a.RTCPeerConnection, DefaultRTCSessionDescription = _a.RTCSessionDescription, getStatistics = _a.getStats;
+var util = require('@twilio/webrtc/lib/util');
 var _b = require('../../util/constants'), DEFAULT_ICE_GATHERING_TIMEOUT_MS = _b.DEFAULT_ICE_GATHERING_TIMEOUT_MS, DEFAULT_LOG_LEVEL = _b.DEFAULT_LOG_LEVEL, DEFAULT_SESSION_TIMEOUT_SEC = _b.DEFAULT_SESSION_TIMEOUT_SEC, iceRestartBackoffConfig = _b.iceRestartBackoffConfig;
-var _c = require('../../util/sdp'), createCodecMapForMediaSection = _c.createCodecMapForMediaSection, disableRtx = _c.disableRtx, enableDtxForOpus = _c.enableDtxForOpus, getMediaSections = _c.getMediaSections, removeSSRCAttributes = _c.removeSSRCAttributes, revertSimulcastForNonVP8MediaSections = _c.revertSimulcastForNonVP8MediaSections, setBitrateParameters = _c.setBitrateParameters, setCodecPreferences = _c.setCodecPreferences, setSimulcast = _c.setSimulcast, unifiedPlanAddOrRewriteNewTrackIds = _c.unifiedPlanAddOrRewriteNewTrackIds, unifiedPlanAddOrRewriteTrackIds = _c.unifiedPlanAddOrRewriteTrackIds, unifiedPlanFilterLocalCodecs = _c.unifiedPlanFilterLocalCodecs;
+var _c = require('../../util/sdp'), addOrRewriteNewTrackIds = _c.addOrRewriteNewTrackIds, addOrRewriteTrackIds = _c.addOrRewriteTrackIds, createCodecMapForMediaSection = _c.createCodecMapForMediaSection, disableRtx = _c.disableRtx, enableDtxForOpus = _c.enableDtxForOpus, filterLocalCodecs = _c.filterLocalCodecs, getMediaSections = _c.getMediaSections, removeSSRCAttributes = _c.removeSSRCAttributes, revertSimulcast = _c.revertSimulcast, setCodecPreferences = _c.setCodecPreferences, setSimulcast = _c.setSimulcast;
 var DefaultTimeout = require('../../util/timeout');
 var _d = require('../../util/twilio-video-errors'), MediaClientLocalDescFailedError = _d.MediaClientLocalDescFailedError, MediaClientRemoteDescFailedError = _d.MediaClientRemoteDescFailedError;
-var _e = require('../../util'), buildLogLevels = _e.buildLogLevels, getPlatform = _e.getPlatform, isChromeScreenShareTrack = _e.isChromeScreenShareTrack, oncePerTick = _e.oncePerTick;
+var _e = require('../../util'), buildLogLevels = _e.buildLogLevels, getPlatform = _e.getPlatform, isChromeScreenShareTrack = _e.isChromeScreenShareTrack, oncePerTick = _e.oncePerTick, defer = _e.defer;
 var IceBox = require('./icebox');
 var DefaultIceConnectionMonitor = require('./iceconnectionmonitor.js');
 var DataTrackReceiver = require('../../data/receiver');
 var MediaTrackReceiver = require('../../media/track/receiver');
 var StateMachine = require('../../statemachine');
 var Log = require('../../util/log');
-var IdentityTrackMatcher = require('../../util/sdp/trackmatcher/identity');
-var OrderedTrackMatcher = require('../../util/sdp/trackmatcher/ordered');
-var MIDTrackMatcher = require('../../util/sdp/trackmatcher/mid');
+var TrackMatcher = require('../../util/sdp/trackmatcher');
 var workaroundIssue8329 = require('../../util/sdp/issue8329');
-var guess = guessBrowser();
+var guess = util.guessBrowser();
 var platform = getPlatform();
 var isAndroid = /android/.test(platform);
 var isChrome = guess === 'chrome';
 var isFirefox = guess === 'firefox';
 var isSafari = guess === 'safari';
-var isRTCRtpSenderParamsSupported = typeof RTCRtpSender !== 'undefined'
-    && typeof RTCRtpSender.prototype.getParameters === 'function'
-    && typeof RTCRtpSender.prototype.setParameters === 'function';
 var nInstances = 0;
 /*
 PeerConnectionV2 States
@@ -119,26 +113,20 @@ var PeerConnectionV2 = /** @class */ (function (_super) {
             dummyAudioMediaStreamTrack: null,
             isChromeScreenShareTrack: isChromeScreenShareTrack,
             iceServers: [],
-            isRTCRtpSenderParamsSupported: isRTCRtpSenderParamsSupported,
             logLevel: DEFAULT_LOG_LEVEL,
             offerOptions: {},
-            revertSimulcastForNonVP8MediaSections: revertSimulcastForNonVP8MediaSections,
+            revertSimulcast: revertSimulcast,
             sessionTimeout: DEFAULT_SESSION_TIMEOUT_SEC * 1000,
-            setBitrateParameters: setBitrateParameters,
             setCodecPreferences: setCodecPreferences,
             setSimulcast: setSimulcast,
             Backoff: DefaultBackoff,
             IceConnectionMonitor: DefaultIceConnectionMonitor,
-            MediaStream: DefaultMediaStream,
             RTCIceCandidate: DefaultRTCIceCandidate,
             RTCPeerConnection: DefaultRTCPeerConnection,
             RTCSessionDescription: DefaultRTCSessionDescription,
             Timeout: DefaultTimeout
         }, options);
         var configuration = getConfiguration(options);
-        var sdpFormat = getSdpFormat(configuration.sdpSemantics);
-        var isUnifiedPlan = sdpFormat === 'unified';
-        var localMediaStream = isUnifiedPlan ? null : new options.MediaStream();
         var logLevels = buildLogLevels(options.logLevel);
         var RTCPeerConnection = options.RTCPeerConnection;
         if (options.enableDscp === true) {
@@ -149,7 +137,7 @@ var PeerConnectionV2 = /** @class */ (function (_super) {
         var log = options.log ? options.log.createLog('webrtc', _this) : new Log('webrtc', _this, logLevels, options.loggerName);
         var peerConnection = new RTCPeerConnection(configuration, options.chromeSpecificConstraints);
         if (options.dummyAudioMediaStreamTrack) {
-            peerConnection.addTrack(options.dummyAudioMediaStreamTrack, localMediaStream || new options.MediaStream());
+            peerConnection.addTrack(options.dummyAudioMediaStreamTrack);
         }
         Object.defineProperties(_this, {
             _appliedTrackIdsToAttributes: {
@@ -208,12 +196,6 @@ var PeerConnectionV2 = /** @class */ (function (_super) {
                 writable: true,
                 value: false
             },
-            _isUnifiedPlan: {
-                value: isUnifiedPlan
-            },
-            _isRTCRtpSenderParamsSupported: {
-                value: options.isRTCRtpSenderParamsSupported
-            },
             _lastIceConnectionState: {
                 writable: true,
                 value: null
@@ -241,9 +223,6 @@ var PeerConnectionV2 = /** @class */ (function (_super) {
                 writable: true,
                 value: null
             },
-            _localMediaStream: {
-                value: localMediaStream
-            },
             _localUfrag: {
                 writable: true,
                 value: null
@@ -260,6 +239,9 @@ var PeerConnectionV2 = /** @class */ (function (_super) {
             _rtpSenders: {
                 value: new Map()
             },
+            _rtpNewSenders: {
+                value: new Set()
+            },
             _iceConnectionMonitor: {
                 value: new options.IceConnectionMonitor(peerConnection)
             },
@@ -280,13 +262,9 @@ var PeerConnectionV2 = /** @class */ (function (_super) {
             },
             _onEncodingParametersChanged: {
                 value: oncePerTick(function () {
-                    if (_this._isRTCRtpSenderParamsSupported) {
-                        if (!_this._needsAnswer) {
-                            updateEncodingParameters(_this);
-                        }
-                        return;
+                    if (!_this._needsAnswer) {
+                        updateEncodingParameters(_this);
                     }
-                    _this.offer();
                 })
             },
             _peerConnection: {
@@ -308,9 +286,6 @@ var PeerConnectionV2 = /** @class */ (function (_super) {
                         return codec === 'opus' && dtx;
                     })
             },
-            _shouldApplySimulcast: {
-                value: (isChrome || isSafari) && preferredCodecs.video.some(function (codecSettings) { return codecSettings.codec.toLowerCase() === 'vp8' && codecSettings.simulcast; })
-            },
             _queuedDescription: {
                 writable: true,
                 value: null
@@ -334,12 +309,6 @@ var PeerConnectionV2 = /** @class */ (function (_super) {
                 writable: true,
                 value: new IceBox()
             },
-            _sdpFormat: {
-                value: sdpFormat
-            },
-            _setBitrateParameters: {
-                value: options.setBitrateParameters
-            },
             _setCodecPreferences: {
                 // NOTE(mmalavalli): Re-ordering payload types in order to make sure a non-H264
                 // preferred codec is selected does not work on Android Firefox due to this behavior:
@@ -352,8 +321,8 @@ var PeerConnectionV2 = /** @class */ (function (_super) {
             _setSimulcast: {
                 value: options.setSimulcast
             },
-            _revertSimulcastForNonVP8MediaSections: {
-                value: options.revertSimulcastForNonVP8MediaSections
+            _revertSimulcast: {
+                value: options.revertSimulcast
             },
             _RTCIceCandidate: {
                 value: options.RTCIceCandidate
@@ -380,6 +349,9 @@ var PeerConnectionV2 = /** @class */ (function (_super) {
                 writable: true,
                 value: null
             },
+            _mediaTrackSenderToPublisherHints: {
+                value: new Map()
+            },
             id: {
                 enumerable: true,
                 value: id
@@ -409,6 +381,29 @@ var PeerConnectionV2 = /** @class */ (function (_super) {
     PeerConnectionV2.prototype.toString = function () {
         return "[PeerConnectionV2 #" + this._instanceId + ": " + this.id + "]";
     };
+    PeerConnectionV2.prototype.setEffectiveAdaptiveSimulcast = function (effectiveAdaptiveSimulcast) {
+        this._log.debug('Setting setEffectiveAdaptiveSimulcast: ', effectiveAdaptiveSimulcast);
+        // clear adaptive simulcast from codec preferences if it was set.
+        this._preferredVideoCodecs.forEach(function (cs) {
+            if ('adaptiveSimulcast' in cs) {
+                cs.adaptiveSimulcast = effectiveAdaptiveSimulcast;
+            }
+        });
+    };
+    Object.defineProperty(PeerConnectionV2.prototype, "_shouldApplySimulcast", {
+        get: function () {
+            if (!isChrome && !isSafari) {
+                return false;
+            }
+            // adaptiveSimulcast is set to false after connected message is received if other party does not support it.
+            var simulcast = this._preferredVideoCodecs.some(function (cs) {
+                return cs.codec.toLowerCase() === 'vp8' && cs.simulcast && cs.adaptiveSimulcast !== false;
+            });
+            return simulcast;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(PeerConnectionV2.prototype, "connectionState", {
         /**
          * The {@link PeerConnectionV2}'s underlying RTCPeerConnection's RTCPeerConnectionState
@@ -453,35 +448,97 @@ var PeerConnectionV2 = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(PeerConnectionV2.prototype, "_isAdaptiveSimulcastEnabled", {
+        /**
+         * Whether adaptive simulcast is enabled.
+         * @returns {boolean}
+         */
+        get: function () {
+            var adaptiveSimulcastEntry = this._preferredVideoCodecs.find(function (cs) { return 'adaptiveSimulcast' in cs; });
+            return adaptiveSimulcastEntry && adaptiveSimulcastEntry.adaptiveSimulcast === true;
+        },
+        enumerable: false,
+        configurable: true
+    });
     /**
-     * Updates scaleResolutionDownBy for encoding layers.
-     * @param {number} width
-     * @param {number} height
+     * @param {MediaStreamTrack} track
      * @param {Array<RTCRtpEncodingParameters>} encodings
+     * @param {boolean} trackReplaced
+     * @returns {boolean} true if encodings were updated.
      */
-    PeerConnectionV2.prototype._updateEncodings = function (width, height, encodings) {
-        var _this = this;
-        // NOTE(mpatwardhan): All the simulcast encodings in Safari have
-        // the same resolution. So, here we make sure that the lower layers have
-        // lower resolution, as seen in Chrome.
-        var pixelsToMaxActiveLayers = [
-            { pixels: 960 * 540, maxActiveLayers: 3 },
-            { pixels: 480 * 270, maxActiveLayers: 2 },
-            { pixels: 0, maxActiveLayers: 1 }
-        ];
-        var trackPixels = width * height;
-        var activeLayersInfo = pixelsToMaxActiveLayers.find(function (layer) { return trackPixels >= layer.pixels; });
-        var activeLayers = Math.min(encodings.length, activeLayersInfo.maxActiveLayers);
-        encodings.forEach(function (encoding, i) {
-            encoding.active = i < activeLayers;
-            if (encoding.active) {
-                encoding.scaleResolutionDownBy = 1 << (activeLayers - i - 1);
-            }
-            else {
-                delete encoding.scaleResolutionDownBy;
-            }
-            _this._log.debug("setting up simulcast layer " + i + " with active = " + encoding.active + ", scaleResolutionDownBy = " + encoding.scaleResolutionDownBy);
-        });
+    PeerConnectionV2.prototype._maybeUpdateEncodings = function (track, encodings, trackReplaced) {
+        if (trackReplaced === void 0) { trackReplaced = false; }
+        if (track.kind !== 'video') {
+            return false;
+        }
+        var browser = util.guessBrowser();
+        // Note(mpatwardhan): always configure encodings for safari.
+        // for chrome only when adaptive simulcast enabled.
+        if (browser === 'safari' || (browser === 'chrome' && this._isAdaptiveSimulcastEnabled)) {
+            this._updateEncodings(track, encodings, trackReplaced);
+            return true;
+        }
+        return false;
+    };
+    /**
+     * Configures with default encodings depending on track type and resolution.
+     * Default configuration sets some encodings to disabled, and for others set scaleResolutionDownBy
+     * values. When trackReplaced is set to true, it will clear 'active' for any encodings that
+     * needs to be enabled.
+     * @param {MediaStreamTrack} track
+     * @param {Array<RTCRtpEncodingParameters>} encodings
+     * @param {boolean} trackReplaced
+     */
+    PeerConnectionV2.prototype._updateEncodings = function (track, encodings, trackReplaced) {
+        if (this._isChromeScreenShareTrack(track)) {
+            var screenShareActiveLayerConfig_1 = [
+                { scaleResolutionDownBy: 1 },
+                { scaleResolutionDownBy: 1 }
+            ];
+            encodings.forEach(function (encoding, i) {
+                var activeLayerConfig = screenShareActiveLayerConfig_1[i];
+                if (activeLayerConfig) {
+                    encoding.scaleResolutionDownBy = activeLayerConfig.scaleResolutionDownBy;
+                    if (trackReplaced) {
+                        delete encoding.active;
+                    }
+                }
+                else {
+                    encoding.active = false;
+                    delete encoding.scaleResolutionDownBy;
+                }
+            });
+        }
+        else {
+            var _a = track.getSettings(), width = _a.width, height = _a.height;
+            // NOTE(mpatwardhan): for non-screen share tracks
+            // enable layers depending on track resolutions
+            var pixelsToMaxActiveLayers = [
+                { pixels: 960 * 540, maxActiveLayers: 3 },
+                { pixels: 480 * 270, maxActiveLayers: 2 },
+                { pixels: 0, maxActiveLayers: 1 }
+            ];
+            var trackPixels_1 = width * height;
+            var activeLayersInfo = pixelsToMaxActiveLayers.find(function (layer) { return trackPixels_1 >= layer.pixels; });
+            var activeLayers_1 = Math.min(encodings.length, activeLayersInfo.maxActiveLayers);
+            encodings.forEach(function (encoding, i) {
+                var enabled = i < activeLayers_1;
+                if (enabled) {
+                    encoding.scaleResolutionDownBy = 1 << (activeLayers_1 - i - 1);
+                    if (trackReplaced) {
+                        delete encoding.active;
+                    }
+                }
+                else {
+                    encoding.active = false;
+                    delete encoding.scaleResolutionDownBy;
+                }
+            });
+        }
+        this._log.debug('_updateEncodings:', encodings.map(function (_a, i) {
+            var active = _a.active, scaleResolutionDownBy = _a.scaleResolutionDownBy;
+            return "[" + i + ": " + active + ", " + (scaleResolutionDownBy || 0) + "]";
+        }).join(', '));
     };
     /**
      * Add an ICE candidate to the {@link PeerConnectionV2}.
@@ -597,11 +654,11 @@ var PeerConnectionV2 = /** @class */ (function (_super) {
             var updatedSdp = removeSSRCAttributes(answer.sdp, ['mslabel', 'label']);
             if (_this._shouldApplySimulcast) {
                 var sdpWithoutSimulcast = updatedSdp;
-                updatedSdp = _this._setSimulcast(sdpWithoutSimulcast, _this._sdpFormat, _this._trackIdsToAttributes);
+                updatedSdp = _this._setSimulcast(sdpWithoutSimulcast, _this._trackIdsToAttributes);
                 // NOTE(syerrapragada): VMS does not support H264 simulcast. So,
                 // unset simulcast for sections in local offer where corresponding
                 // sections in answer doesn't have vp8 as preferred codec and reapply offer.
-                updatedSdp = _this._revertSimulcastForNonVP8MediaSections(updatedSdp, sdpWithoutSimulcast, offer.sdp);
+                updatedSdp = _this._revertSimulcast(updatedSdp, sdpWithoutSimulcast, offer.sdp);
             }
             // NOTE(mmalavalli): Work around Chromium bug 1074421.
             // https://bugs.chromium.org/p/chromium/issues/detail?id=1074421
@@ -819,7 +876,7 @@ var PeerConnectionV2 = /** @class */ (function (_super) {
     /**
      * Handle a track event.
      * @private
-     * @param {Event} event
+     * @param {RTCTrackEvent} event
      * @returns {void}
      */
     PeerConnectionV2.prototype._handleTrackEvent = function (event) {
@@ -827,24 +884,16 @@ var PeerConnectionV2 = /** @class */ (function (_super) {
         var sdp = this._peerConnection.remoteDescription
             ? this._peerConnection.remoteDescription.sdp
             : null;
-        if (!this._trackMatcher) {
-            this._trackMatcher = event.transceiver && event.transceiver.mid
-                ? new MIDTrackMatcher()
-                // NOTE(mroberts): Until Chrome ships RTCRtpTransceivers with MID
-                // support, we have to use the same hacky solution as Safari. Revisit
-                // this when RTCRtpTransceivers and MIDs land. We should be able to use
-                // the same technique as Firefox.
-                : isSafari || this._isUnifiedPlan ? new OrderedTrackMatcher() : new IdentityTrackMatcher();
-        }
+        this._trackMatcher = this._trackMatcher || new TrackMatcher();
         this._trackMatcher.update(sdp);
         var mediaStreamTrack = event.track;
         var signaledTrackId = this._trackMatcher.match(event) || mediaStreamTrack.id;
         var mediaTrackReceiver = new MediaTrackReceiver(signaledTrackId, mediaStreamTrack);
-        // NOTE(mmalavalli): In unified plan mode, "ended" is not fired on the remote
-        // MediaStreamTrack when the remote peer removes a track. So, when this
-        // MediaStreamTrack is re-used for a different track due to the remote peer
-        // calling RTCRtpSender.replaceTrack(), we delete the previous MediaTrackReceiver
-        // that owned this MediaStreamTrack before adding the new MediaTrackReceiver.
+        // NOTE(mmalavalli): "ended" is not fired on the remote MediaStreamTrack when
+        // the remote peer removes a track. So, when this MediaStreamTrack is re-used
+        // for a different track due to the remote peer calling RTCRtpSender.replaceTrack(),
+        // we delete the previous MediaTrackReceiver that owned this MediaStreamTrack
+        // before adding the new MediaTrackReceiver.
         this._mediaTrackReceivers.forEach(function (trackReceiver) {
             if (trackReceiver.track.id === mediaTrackReceiver.track.id) {
                 _this._mediaTrackReceivers.delete(trackReceiver);
@@ -899,18 +948,16 @@ var PeerConnectionV2 = /** @class */ (function (_super) {
     PeerConnectionV2.prototype._maybeReoffer = function (localDescription) {
         var shouldReoffer = this._shouldOffer;
         if (localDescription && localDescription.sdp) {
-            // NOTE(mmalavalli): For "unified-plan" sdps, if the local RTCSessionDescription
-            // has fewer audio and/or video send* m= lines than the corresponding RTCRtpSenders
-            // with non-null MediaStreamTracks, it means that the newly added RTCRtpSenders
-            // require renegotiation.
-            if (this._isUnifiedPlan) {
-                var senders_1 = this._peerConnection.getSenders().filter(function (sender) { return sender.track; });
-                shouldReoffer = ['audio', 'video'].reduce(function (shouldOffer, kind) {
-                    var mediaSections = getMediaSections(localDescription.sdp, kind, '(sendrecv|sendonly)');
-                    var sendersOfKind = senders_1.filter(isSenderOfKind.bind(null, kind));
-                    return shouldOffer || (mediaSections.length < sendersOfKind.length);
-                }, shouldReoffer);
-            }
+            // NOTE(mmalavalli): If the local RTCSessionDescription has fewer audio and/or
+            // video send* m= lines than the corresponding RTCRtpSenders with non-null
+            // MediaStreamTracks, it means that the newly added RTCRtpSenders require
+            // renegotiation.
+            var senders_1 = this._peerConnection.getSenders().filter(function (sender) { return sender.track; });
+            shouldReoffer = ['audio', 'video'].reduce(function (shouldOffer, kind) {
+                var mediaSections = getMediaSections(localDescription.sdp, kind, '(sendrecv|sendonly)');
+                var sendersOfKind = senders_1.filter(isSenderOfKind.bind(null, kind));
+                return shouldOffer || (mediaSections.length < sendersOfKind.length);
+            }, shouldReoffer);
             // NOTE(mroberts): We also need to re-offer if we have a DataTrack to share
             // but no m= application section.
             var hasDataTrack = this._dataChannels.size > 0;
@@ -964,8 +1011,8 @@ var PeerConnectionV2 = /** @class */ (function (_super) {
             // Looks like we are not referencing those attributes, but this changes goes ahead and removes them to see if it works.
             // this also helps reduce bytes on wires
             var sdp = removeSSRCAttributes(offer.sdp, ['mslabel', 'label']);
-            sdp = _this._isUnifiedPlan && _this._peerConnection.remoteDescription
-                ? unifiedPlanFilterLocalCodecs(sdp, _this._peerConnection.remoteDescription.sdp)
+            sdp = _this._peerConnection.remoteDescription
+                ? filterLocalCodecs(sdp, _this._peerConnection.remoteDescription.sdp)
                 : sdp;
             var updatedSdp = _this._setCodecPreferences(sdp, _this._preferredAudioCodecs, _this._preferredVideoCodecs);
             _this._shouldOffer = false;
@@ -977,7 +1024,7 @@ var PeerConnectionV2 = /** @class */ (function (_super) {
                     type: 'offer',
                     sdp: updatedSdp
                 };
-                updatedSdp = _this._setSimulcast(updatedSdp, _this._sdpFormat, _this._trackIdsToAttributes);
+                updatedSdp = _this._setSimulcast(updatedSdp, _this._trackIdsToAttributes);
             }
             return _this._setLocalDescription({
                 type: 'offer',
@@ -1001,7 +1048,7 @@ var PeerConnectionV2 = /** @class */ (function (_super) {
         return mediaTrackSender ? mediaTrackSender.id : trackId;
     };
     /**
-     * Add or rewrite local MediaStreamTrack IDs in the given Unified Plan RTCSessionDescription.
+     * Add or rewrite local MediaStreamTrack IDs in the given RTCSessionDescription.
      * @private
      * @param {RTCSessionDescription} description
      * @return {RTCSessionDescription}
@@ -1025,7 +1072,7 @@ var PeerConnectionV2 = /** @class */ (function (_super) {
             var mid = _a.mid, sender = _a.sender;
             return [mid, _this._getMediaTrackSenderId(sender.track.id)];
         }));
-        var sdp1 = unifiedPlanAddOrRewriteTrackIds(description.sdp, midsToTrackIds);
+        var sdp1 = addOrRewriteTrackIds(description.sdp, midsToTrackIds);
         // NOTE(mmalavalli): Chrome and Safari do not apply the offer until they get an answer.
         // So, we add or re-write the actual MediaStreamTrack IDs to the unassigned m= sections here.
         var unassignedTransceivers = activeTransceivers.filter(function (_a) {
@@ -1042,7 +1089,7 @@ var PeerConnectionV2 = /** @class */ (function (_super) {
                 return _this._getMediaTrackSenderId(sender.track.id);
             })
         ]; }));
-        var sdp2 = unifiedPlanAddOrRewriteNewTrackIds(sdp1, midsToTrackIds, newTrackIdsByKind);
+        var sdp2 = addOrRewriteNewTrackIds(sdp1, midsToTrackIds, newTrackIdsByKind);
         return new this._RTCSessionDescription({
             sdp: sdp2,
             type: description.type
@@ -1073,7 +1120,7 @@ var PeerConnectionV2 = /** @class */ (function (_super) {
             });
         }
         return this._peerConnection.setLocalDescription(description).catch(function (error) {
-            _this._log.warn("Calling setLocalDescription with an RTCSessionDescription of type \"" + description.type + "\" failed with the error \"" + error.message + "\".");
+            _this._log.warn("Calling setLocalDescription with an RTCSessionDescription of type \"" + description.type + "\" failed with the error \"" + error.message + "\".", error);
             var errorToThrow = new MediaClientLocalDescFailedError();
             var publishWarning = {
                 message: "Calling setLocalDescription with an RTCSessionDescription of type \"" + description.type + "\" failed",
@@ -1088,7 +1135,7 @@ var PeerConnectionV2 = /** @class */ (function (_super) {
             throw errorToThrow;
         }).then(function () {
             if (description.type !== 'rollback') {
-                _this._localDescription = _this._isUnifiedPlan ? _this._addOrRewriteLocalTrackIds(description) : description;
+                _this._localDescription = _this._addOrRewriteLocalTrackIds(description);
                 // NOTE(mmalavalli): In order for this feature to be backward compatible with older
                 // SDK versions which to not support opus DTX, we append "usedtx=1" to the local SDP
                 // only while applying it. We will not send it over the wire to prevent inadvertent
@@ -1122,9 +1169,6 @@ var PeerConnectionV2 = /** @class */ (function (_super) {
     PeerConnectionV2.prototype._setRemoteDescription = function (description) {
         var _this = this;
         if (description.sdp) {
-            if (!this._isRTCRtpSenderParamsSupported) {
-                description.sdp = this._setBitrateParameters(description.sdp, isFirefox ? 'TIAS' : 'AS', this._encodingParameters.maxAudioBitrate, this._encodingParameters.maxVideoBitrate);
-            }
             description.sdp = this._setCodecPreferences(description.sdp, this._preferredAudioCodecs, this._preferredVideoCodecs);
             if (this._shouldApplyDtx) {
                 description.sdp = enableDtxForOpus(description.sdp);
@@ -1151,8 +1195,13 @@ var PeerConnectionV2 = /** @class */ (function (_super) {
             // NOTE(syerrapragada): VMS does not support H264 simulcast. So,
             // unset simulcast for sections in local offer where corresponding
             // sections in answer doesn't have vp8 as preferred codec and reapply offer.
-            if (description.type === 'answer' && _this._shouldApplySimulcast) {
-                var sdpWithoutSimulcastForNonVP8MediaSections = _this._revertSimulcastForNonVP8MediaSections(_this._localDescription.sdp, _this._localDescriptionWithoutSimulcast.sdp, description.sdp);
+            if (description.type === 'answer' && _this._localDescriptionWithoutSimulcast) {
+                // NOTE(mpatwardhan):if we were using adaptive simulcast, and if its not supported by server
+                // revert simulcast even for vp8.
+                var adaptiveSimulcastEntry = _this._preferredVideoCodecs.find(function (cs) { return 'adaptiveSimulcast' in cs; });
+                var revertForAll = !!adaptiveSimulcastEntry && adaptiveSimulcastEntry.adaptiveSimulcast === false;
+                var sdpWithoutSimulcastForNonVP8MediaSections = _this._revertSimulcast(_this._localDescription.sdp, _this._localDescriptionWithoutSimulcast.sdp, description.sdp, revertForAll);
+                _this._localDescriptionWithoutSimulcast = null;
                 if (sdpWithoutSimulcastForNonVP8MediaSections !== _this._localDescription.sdp) {
                     return _this._rollbackAndApplyOffer({
                         type: _this._localDescription.type,
@@ -1169,7 +1218,7 @@ var PeerConnectionV2 = /** @class */ (function (_super) {
                 negotiationCompleted(_this);
             }
         }, function (error) {
-            _this._log.warn("Calling setRemoteDescription with an RTCSessionDescription of type \"" + description.type + "\" failed with the error \"" + error.message + "\".");
+            _this._log.warn("Calling setRemoteDescription with an RTCSessionDescription of type \"" + description.type + "\" failed with the error \"" + error.message + "\".", error);
             if (description.sdp) {
                 _this._log.warn("The SDP was " + description.sdp);
             }
@@ -1293,25 +1342,89 @@ var PeerConnectionV2 = /** @class */ (function (_super) {
             this._log.warn("Error creating an RTCDataChannel for DataTrack \"" + dataTrackSender.id + "\": " + error.message);
         }
     };
+    PeerConnectionV2.prototype._handleQueuedPublisherHints = function () {
+        var _this = this;
+        if (this._peerConnection.signalingState === 'stable') {
+            this._mediaTrackSenderToPublisherHints.forEach(function (_a, mediaTrackSender) {
+                var deferred = _a.deferred, encodings = _a.encodings;
+                _this._mediaTrackSenderToPublisherHints.delete(mediaTrackSender);
+                _this._setPublisherHint(mediaTrackSender, encodings)
+                    .then(function (result) { return deferred.resolve(result); })
+                    .catch(function (error) { return deferred.reject(error); });
+            });
+        }
+    };
+    /**
+     * updates encodings for simulcast layers of given sender.
+     * @param {RTCRtpSender} sender
+     * @param {Array<{enabled: boolean, layer_index: number}>|null} encodings
+     * @returns {Promise<string>} string indicating result of the operation. can be one of
+     *  "OK", "INVALID_HINT", "COULD_NOT_APPLY_HINT", "UNKNOWN_TRACK"
+     */
+    PeerConnectionV2.prototype._setPublisherHint = function (mediaTrackSender, encodings) {
+        var _this = this;
+        if (isFirefox) {
+            return Promise.resolve('COULD_NOT_APPLY_HINT');
+        }
+        if (this._mediaTrackSenderToPublisherHints.has(mediaTrackSender)) {
+            // skip any stale hint associated with the mediaTrackSender.
+            var queuedHint = this._mediaTrackSenderToPublisherHints.get(mediaTrackSender);
+            queuedHint.deferred.resolve('REQUEST_SKIPPED');
+            this._mediaTrackSenderToPublisherHints.delete(mediaTrackSender);
+        }
+        var sender = this._rtpSenders.get(mediaTrackSender);
+        if (!sender) {
+            this._log.warn('Could not apply publisher hint because RTCRtpSender was not found');
+            return Promise.resolve('UNKNOWN_TRACK');
+        }
+        if (this._peerConnection.signalingState === 'closed') {
+            this._log.warn('Could not apply publisher hint because signalingState was "closed"');
+            return Promise.resolve('COULD_NOT_APPLY_HINT');
+        }
+        if (this._peerConnection.signalingState !== 'stable') {
+            // enqueue this hint to be applied when pc becomes stable.
+            this._log.debug('Queuing up publisher hint because signalingState:', this._peerConnection.signalingState);
+            var deferred = defer();
+            this._mediaTrackSenderToPublisherHints.set(mediaTrackSender, { deferred: deferred, encodings: encodings });
+            return deferred.promise;
+        }
+        var parameters = sender.getParameters();
+        if (encodings !== null) {
+            encodings.forEach(function (_a) {
+                var enabled = _a.enabled, layerIndex = _a.layer_index;
+                if (parameters.encodings.length > layerIndex) {
+                    _this._log.debug("layer:" + layerIndex + ", active:" + parameters.encodings[layerIndex].active + " => " + enabled);
+                    parameters.encodings[layerIndex].active = enabled;
+                }
+                else {
+                    _this._log.warn("invalid layer:" + layerIndex + ", active:" + enabled);
+                }
+            });
+        }
+        // Note(mpatwardhan): after publisher hints are applied, overwrite with default encodings
+        // to disable any encoding that shouldn't have been enabled by publisher_hints.
+        // When encodings===null (that is we are asked to reset encodings for replaceTrack)
+        // along with disabling encodings, clear active flag for encodings that should not be disabled
+        this._maybeUpdateEncodings(sender.track, parameters.encodings, encodings === null /* trackReplaced */);
+        return sender.setParameters(parameters).then(function () { return 'OK'; }).catch(function (error) {
+            _this._log.error('Failed to apply publisher hints:', error);
+            return 'COULD_NOT_APPLY_HINT';
+        });
+    };
     /**
      * Add the {@link MediaTrackSender} to the {@link PeerConnectionV2}.
      * @param {MediaTrackSender} mediaTrackSender
      * @returns {void}
      */
     PeerConnectionV2.prototype.addMediaTrackSender = function (mediaTrackSender) {
+        var _this = this;
         if (this._peerConnection.signalingState === 'closed' || this._rtpSenders.has(mediaTrackSender)) {
             return;
         }
-        var sender;
-        if (this._localMediaStream) {
-            this._localMediaStream.addTrack(mediaTrackSender.track);
-            sender = this._peerConnection.addTrack(mediaTrackSender.track, this._localMediaStream);
-        }
-        else {
-            var transceiver = this._addOrUpdateTransceiver(mediaTrackSender.track);
-            sender = transceiver.sender;
-        }
-        mediaTrackSender.addSender(sender);
+        var transceiver = this._addOrUpdateTransceiver(mediaTrackSender.track);
+        var sender = transceiver.sender;
+        mediaTrackSender.addSender(sender, function (encodings) { return _this._setPublisherHint(mediaTrackSender, encodings); });
+        this._rtpNewSenders.add(sender);
         this._rtpSenders.set(mediaTrackSender, sender);
     };
     /**
@@ -1326,7 +1439,7 @@ var PeerConnectionV2 = /** @class */ (function (_super) {
         }
     };
     /**
-     * Get the {@link DataTrackReceiver}s and the {@link MediaTrackReceivers} on the
+     * Get the {@link DataTrackReceiver}s and the {@link MediaTrackReceiver}s on the
      * {@link PeerConnectionV2}.
      * @returns {Array<DataTrackReceiver|MediaTrackReceiver>} trackReceivers
      */
@@ -1405,10 +1518,14 @@ var PeerConnectionV2 = /** @class */ (function (_super) {
         if (this._peerConnection.signalingState !== 'closed') {
             this._peerConnection.removeTrack(sender);
         }
-        if (this._localMediaStream) {
-            this._localMediaStream.removeTrack(mediaTrackSender.track);
-        }
         mediaTrackSender.removeSender(sender);
+        // clean up any pending publisher hints associated with this mediaTrackSender.
+        if (this._mediaTrackSenderToPublisherHints.has(mediaTrackSender)) {
+            var queuedHint = this._mediaTrackSenderToPublisherHints.get(mediaTrackSender);
+            queuedHint.deferred.resolve('UNKNOWN_TRACK');
+            this._mediaTrackSenderToPublisherHints.delete(mediaTrackSender);
+        }
+        this._rtpNewSenders.delete(sender);
         this._rtpSenders.delete(mediaTrackSender);
     };
     /**
@@ -1587,7 +1704,7 @@ function takeRecycledTransceiver(pcv2, kind) {
  */
 function updateLocalCodecs(pcv2) {
     var description = pcv2._peerConnection.localDescription;
-    if (!description) {
+    if (!description || !description.sdp) {
         return;
     }
     getMediaSections(description.sdp).forEach(function (section) {
@@ -1602,11 +1719,15 @@ function updateLocalCodecs(pcv2) {
  */
 function updateRemoteCodecMaps(pcv2) {
     var description = pcv2._peerConnection.remoteDescription;
-    if (!description) {
+    if (!description || !description.sdp) {
         return;
     }
     getMediaSections(description.sdp).forEach(function (section) {
-        var mid = section.match(/^a=mid:(.+)$/m)[1];
+        var matched = section.match(/^a=mid:(.+)$/m);
+        if (!matched || !matched[1]) {
+            return;
+        }
+        var mid = matched[1];
         var codecMap = createCodecMapForMediaSection(section);
         pcv2._remoteCodecMaps.set(mid, codecMap);
     });
@@ -1631,14 +1752,13 @@ function updateRecycledTransceivers(pcv2) {
  * @returns {void}
  */
 function negotiationCompleted(pcv2) {
-    if (pcv2._isUnifiedPlan) {
-        updateRecycledTransceivers(pcv2);
-        updateLocalCodecs(pcv2);
-        updateRemoteCodecMaps(pcv2);
-    }
-    if (pcv2._isRTCRtpSenderParamsSupported) {
-        updateEncodingParameters(pcv2);
-    }
+    updateRecycledTransceivers(pcv2);
+    updateLocalCodecs(pcv2);
+    updateRemoteCodecMaps(pcv2);
+    updateEncodingParameters(pcv2).then(function () {
+        // if there any any publisher hints queued, apply them now.
+        pcv2._handleQueuedPublisherHints();
+    });
 }
 /**
  * Update the RTCRtpEncodingParameters of all active RTCRtpSenders.
@@ -1651,6 +1771,7 @@ function updateEncodingParameters(pcv2) {
         ['audio', maxAudioBitrate],
         ['video', maxVideoBitrate]
     ]);
+    var promises = [];
     pcv2._peerConnection.getSenders().filter(function (sender) { return sender.track; }).forEach(function (sender) {
         var maxBitrate = maxBitrates.get(sender.track.kind);
         var params = sender.getParameters();
@@ -1673,14 +1794,16 @@ function updateEncodingParameters(pcv2) {
             // by RTCRtpSender.setParameters() being rejected.
             params.encodings[0].networkPriority = 'high';
         }
-        if (isSafari && sender.track.kind === 'video') {
-            var _a = sender.track.getSettings(), width = _a.width, height = _a.height;
-            pcv2._updateEncodings(width, height, params.encodings);
-        }
-        sender.setParameters(params).catch(function (error) {
+        // when a sender is reused, delete any active encodings set by server.
+        var trackReplaced = pcv2._rtpNewSenders.has(sender);
+        pcv2._maybeUpdateEncodings(sender.track, params.encodings, trackReplaced);
+        pcv2._rtpNewSenders.delete(sender);
+        var promise = sender.setParameters(params).catch(function (error) {
             pcv2._log.warn("Error while setting encodings parameters for " + sender.track.kind + " Track " + sender.track.id + ": " + (error.message || error.name));
         });
+        promises.push(promise);
     });
+    return Promise.all(promises);
 }
 /**
  * Remove maxBitrate from the RTCRtpSendParameters' encodings.