@webex/web-client-media-engine 3.22.1 → 3.22.3

package/dist/cjs/index.js

@@ -9415,30 +9415,26 @@ function disableRtcpFbValue(sdpOrAv, rtcpFbValue) {
 function disableTwcc(sdpOrAv) {
     disableRtcpFbValue(sdpOrAv, 'transport-cc');
 }
-function removeCodec(sdpOrAv, codecName) {
-    const mediaDescriptions = sdpOrAv instanceof Sdp ? sdpOrAv.avMedia : [sdpOrAv];
-    mediaDescriptions.forEach((media) => {
-        const codecInfos = [...media.codecs.entries()].filter(([, ci]) => { var _a; return ((_a = ci.name) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === codecName.toLowerCase(); });
-        codecInfos.forEach(([pt]) => media.removePt(pt));
+function retainCodecs(av, predicate) {
+    let filtered = false;
+    av.codecs.forEach((codecInfo) => {
+        if (!predicate(codecInfo)) {
+            av.removePt(codecInfo.pt);
+            filtered = true;
+        }
     });
+    return filtered;
 }
-function retainCodecs(sdpOrAv, allowedCodecNames) {
-    const avMediaDescriptions = sdpOrAv instanceof Sdp ? sdpOrAv.avMedia : [sdpOrAv];
+function retainCodecsByCodecName(av, allowedCodecNames) {
     const allowedLowerCase = allowedCodecNames.map((s) => s.toLowerCase());
-    avMediaDescriptions
-        .map((av) => {
-        return [...av.codecs.values()].map((c) => c.name);
-    })
-        .flat()
-        .filter((codecName) => !allowedLowerCase.includes(codecName.toLowerCase()))
-        .forEach((unwantedCodec) => removeCodec(sdpOrAv, unwantedCodec));
+    return retainCodecs(av, (codecInfo) => !!codecInfo.name && allowedLowerCase.includes(codecInfo.name.toLowerCase()));
 }
-function retainCandidates(sdpOrMedia, allowedTransportTypes) {
+function retainCandidates(sdpOrMedia, predicate) {
     const mediaDescriptions = sdpOrMedia instanceof Sdp ? sdpOrMedia.media : [sdpOrMedia];
     let filtered = false;
     mediaDescriptions.forEach((media) => {
         media.iceInfo.candidates = media.iceInfo.candidates.filter((candidate) => {
-            if (allowedTransportTypes.includes(candidate.transport.toLowerCase())) {
+            if (predicate(candidate)) {
                 return true;
             }
             filtered = true;
@@ -9446,6 +9442,10 @@ function retainCandidates(sdpOrMedia, allowedTransportTypes) {
         });
     });
     return filtered;
+}
+function retainCandidatesByTransportType(sdpOrMedia, allowedTransportTypes) {
+    const allowedLowerCase = allowedTransportTypes.map((s) => s.toLowerCase());
+    return retainCandidates(sdpOrMedia, (candidate) => allowedLowerCase.includes(candidate.transport.toLowerCase()));
 }
 
 function hasCodec(codecName, mLine) {
@@ -9473,6 +9473,12 @@ var BrowserName;
     BrowserName["EDGE"] = "Microsoft Edge";
     BrowserName["SAFARI"] = "Safari";
 })(BrowserName || (BrowserName = {}));
+var OSName;
+(function (OSName) {
+    OSName["WINDOWS"] = "Windows";
+    OSName["MAC"] = "macOS";
+    OSName["LINUX"] = "Linux";
+})(OSName || (OSName = {}));
 class BrowserInfo {
     static getBrowserDetails() {
         return this.browser.getBrowser();
@@ -9498,6 +9504,15 @@ class BrowserInfo {
     static isSafari() {
         return this.browser.getBrowserName() === BrowserName.SAFARI;
     }
+    static isWindows() {
+        return this.browser.getOSName() === OSName.WINDOWS;
+    }
+    static isMac() {
+        return this.browser.getOSName() === OSName.MAC;
+    }
+    static isLinux() {
+        return this.browser.getOSName() === OSName.LINUX;
+    }
     static isVersionGreaterThan(version) {
         const browserName = this.browser.getBrowserName();
         const checkTree = { [browserName]: `>${version}` };
@@ -9751,16 +9766,33 @@ function generateSsrc() {
 }
 
 class EgressSdpMunger {
-    constructor() {
+    constructor(options) {
         this.streamIds = [];
         this.customCodecParameters = new Map();
+        this.egressMungerOptions = options;
     }
     reset() {
         this.streamIds = [];
     }
     mungeLocalDescription(mediaDescription, options) {
         var _a;
-        retainCodecs(mediaDescription, ['h264', 'opus', 'rtx']);
+        retainCodecsByCodecName(mediaDescription, ['h264', 'opus', 'rtx']);
+        if (options.forceSoftwareEncoder) {
+            const isH264Cbp = (codecInfo) => {
+                var _a;
+                if (((_a = codecInfo.name) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'h264') {
+                    const profileLevelId = codecInfo.fmtParams.get('profile-level-id');
+                    return !!profileLevelId && /^42[^0]/.test(profileLevelId);
+                }
+                return false;
+            };
+            if ([...mediaDescription.codecs.values()].some(isH264Cbp)) {
+                retainCodecs(mediaDescription, (codecInfo) => { var _a; return ((_a = codecInfo.name) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== 'h264' || isH264Cbp(codecInfo); });
+            }
+            else {
+                logger.log(`No H.264 CBP present in m-line with MID ${mediaDescription.mid}, so all H.264 codecs have been retained.`);
+            }
+        }
         if (mediaDescription.codecs.size === 0) {
             logErrorAndThrow(exports.WcmeErrorType.SDP_MUNGE_MISSING_CODECS, `No codecs present in m-line with MID ${mediaDescription.mid} after filtering.`);
         }
@@ -9842,7 +9874,9 @@ class EgressSdpMunger {
     mungeLocalDescriptionForRemoteServer(mediaDescription, mediaContent, csi) {
         injectContentType(mediaDescription, mediaContent);
         injectJmpAttributes(mediaDescription, csi, 'SSRC');
-        injectDummyCandidates(mediaDescription);
+        if (!this.egressMungerOptions.doFullIce) {
+            injectDummyCandidates(mediaDescription);
+        }
         if (mediaDescription.type === 'video') {
             const ssrcGroup = mediaDescription.ssrcGroups.find((sg) => sg.semantics === 'SIM');
             if (ssrcGroup) {
@@ -9853,7 +9887,7 @@ class EgressSdpMunger {
         }
     }
     mungeRemoteDescription(mediaDescription) {
-        if (retainCandidates(mediaDescription, ['udp', 'tcp'])) {
+        if (retainCandidatesByTransportType(mediaDescription, ['udp', 'tcp'])) {
             logger.log(`Some unsupported remote candidates have been removed from mid ${mediaDescription.mid}`);
         }
         mediaDescription.bandwidth = undefined;
@@ -10366,7 +10400,7 @@ class IngressSdpMunger {
         return Object.assign({ ssrc: this.ssrc }, (this.rtxSsrc ? { rtxSsrc: this.rtxSsrc } : {}));
     }
     mungeLocalDescription(mediaDescription, options) {
-        retainCodecs(mediaDescription, ['h264', 'opus', 'rtx']);
+        retainCodecsByCodecName(mediaDescription, ['h264', 'opus', 'rtx']);
         if (mediaDescription.codecs.size === 0) {
             logErrorAndThrow(exports.WcmeErrorType.SDP_MUNGE_MISSING_CODECS, `No codecs present in m-line with MID ${mediaDescription.mid} after filtering.`);
         }
@@ -10388,7 +10422,7 @@ class IngressSdpMunger {
                 mediaDescription.addLine(new SsrcGroupLine('FID', [this.ssrc, this.rtxSsrc]));
             }
         }
-        if (retainCandidates(mediaDescription, ['udp', 'tcp'])) {
+        if (retainCandidatesByTransportType(mediaDescription, ['udp', 'tcp'])) {
             logger.log(`Some unsupported remote candidates have been removed from mid ${mediaDescription.mid}`);
         }
         [...mediaDescription.codecs.values()].forEach((ci) => {
@@ -14576,6 +14610,9 @@ class SendOnlyTransceiver extends Transceiver {
             simulcastEnabled: this.isSimulcastEnabled(),
             rtxEnabled: this.rtxEnabled,
             twccDisabled: this.twccDisabled,
+            forceSoftwareEncoder: this.mediaType === exports.MediaType.VideoSlides &&
+                (BrowserInfo.isWindows() || BrowserInfo.isMac()) &&
+                (BrowserInfo.isChrome() || BrowserInfo.isEdge()),
         });
     }
     mungeLocalDescriptionForRemoteServer(mediaDescription) {
@@ -14757,6 +14794,7 @@ const defaultMultistreamConnectionOptions = {
     iceServers: undefined,
     disableContentSimulcast: true,
     disableAudioTwcc: true,
+    doFullIce: BrowserInfo.isFirefox(),
 };
 class MultistreamConnection extends EventEmitter$2 {
     constructor(userOptions = {}) {
@@ -14863,7 +14901,9 @@ class MultistreamConnection extends EventEmitter$2 {
         }
         const mid = this.midPredictor.getNextMid(mediaType);
         const csi = generateCsi(getMediaFamily(mediaType), sceneId);
-        const munger = new EgressSdpMunger();
+        const munger = new EgressSdpMunger({
+            doFullIce: this.options.doFullIce,
+        });
         const transceiver = new SendOnlyTransceiver(rtcTransceiver, mid, csi, munger, mediaType);
         if (getMediaFamily(mediaType) === exports.MediaFamily.Video) {
             transceiver.rtxEnabled = true;
@@ -15221,6 +15261,22 @@ SCTP Max Message Size: ${maxMessageSize}`);
         }
         return targetCodec.pt;
     }
+    waitForIceGatheringComplete() {
+        return __awaiter$1(this, void 0, void 0, function* () {
+            return new Promise((resolve) => {
+                if (this.pc.iceGatheringState === 'complete') {
+                    resolve();
+                }
+                else {
+                    this.pc.on(PeerConnection.Events.IceGatheringStateChange, () => {
+                        if (this.pc.iceGatheringState === 'complete') {
+                            resolve();
+                        }
+                    });
+                }
+            });
+        });
+    }
     createOffer() {
         return __awaiter$1(this, void 0, void 0, function* () {
             if (!this.pc.getLocalDescription()) {
@@ -15250,6 +15306,9 @@ SCTP Max Message Size: ${maxMessageSize}`);
                             var _a;
                             logErrorAndThrow(exports.WcmeErrorType.CREATE_OFFER_FAILED, `Error: ${error}. SDP: ${maskIp((_a = offer.sdp) !== null && _a !== void 0 ? _a : '')}`);
                         });
+                        if (this.options.doFullIce) {
+                            yield this.waitForIceGatheringComplete();
+                        }
                         const sdpToSend = this.prepareLocalOfferForRemoteServer((_a = this.pc.getLocalDescription()) === null || _a === void 0 ? void 0 : _a.sdp);
                         createOfferResolve({ type: 'offer', sdp: sdpToSend });
                         if (this.currentCreateOfferId > createOfferId) {
@@ -15354,11 +15413,13 @@ SCTP Max Message Size: ${maxMessageSize}`);
             const sendTransceiver = this.getSendTransceiverByMidOrThrow(av.mid);
             sendTransceiver.mungeLocalDescriptionForRemoteServer(av);
         });
-        parsedOffer.media
-            .filter((media) => media instanceof ApplicationMediaDescription)
-            .forEach((media) => {
-            injectDummyCandidates(media);
-        });
+        if (!this.options.doFullIce) {
+            parsedOffer.media
+                .filter((media) => media instanceof ApplicationMediaDescription)
+                .forEach((media) => {
+                injectDummyCandidates(media);
+            });
+        }
         if (BrowserInfo.isFirefox()) {
             setupBundle(parsedOffer, this.options.bundlePolicy, this.midPredictor.getMidMap());
             if (this.options.bundlePolicy === 'max-bundle') {
@@ -15392,7 +15453,7 @@ SCTP Max Message Size: ${maxMessageSize}`);
         parsedAnswer.media
             .filter((media) => media instanceof ApplicationMediaDescription)
             .forEach((media) => {
-            if (retainCandidates(media, ['udp', 'tcp'])) {
+            if (retainCandidatesByTransportType(media, ['udp', 'tcp'])) {
                 logger.log(`Some unsupported remote candidates have been removed from mid ${media.mid}`);
             }
         });