@webex/web-client-media-engine 3.29.2 → 3.29.4

package/dist/cjs/index.js

@@ -6658,23 +6658,6 @@ function areCodecInfosEqual(left, right) {
     return left.payloadType === right.payloadType && areH264CodecsEqual(left.h264, right.h264);
 }
 
-var HomerMsgType;
-(function (HomerMsgType) {
-    HomerMsgType["Multistream"] = "multistream";
-})(HomerMsgType || (HomerMsgType = {}));
-class HomerMsg {
-    constructor(msgType, payload) {
-        this.msgType = msgType;
-        this.payload = payload;
-    }
-    static fromJson(data) {
-        if (!data.msgType || !data.payload) {
-            return null;
-        }
-        return new HomerMsg(data.msgType, data.payload);
-    }
-}
-
 var JmpMsgType;
 (function (JmpMsgType) {
     JmpMsgType["MediaRequest"] = "mediaRequest";
@@ -6707,6 +6690,19 @@ function isValidJmpMsg(msg) {
         isValidJmpMsgPayload(maybeJmpMsg.payload));
 }
 
+class MediaRequestAckMsg {
+    constructor(mediaRequestSeqNum) {
+        this.mediaRequestSeqNum = mediaRequestSeqNum;
+    }
+    toString() {
+        return `MediaRequestAckMsg(seqNum=${this.mediaRequestSeqNum})`;
+    }
+}
+function isValidMediaRequestAckMsg(msg) {
+    const maybeMediaRequestAckMsg = msg;
+    return Boolean(maybeMediaRequestAckMsg.mediaRequestSeqNum);
+}
+
 class MediaRequestMsg {
     constructor(seqNum, requests) {
         this.seqNum = seqNum;
@@ -6721,17 +6717,17 @@ function isValidMediaRequestMsg(msg) {
     return Boolean(maybeMediaRequestMsg.seqNum && maybeMediaRequestMsg.requests);
 }
 
-class MediaRequestAckMsg {
-    constructor(mediaRequestSeqNum) {
-        this.mediaRequestSeqNum = mediaRequestSeqNum;
+class MediaRequestStatusAckMsg {
+    constructor(mediaRequestStatusSeqNum) {
+        this.mediaRequestStatusSeqNum = mediaRequestStatusSeqNum;
     }
     toString() {
-        return `MediaRequestAckMsg(seqNum=${this.mediaRequestSeqNum})`;
+        return `MediaRequestStatusAckMsg(seqNum=${this.mediaRequestStatusSeqNum})`;
     }
 }
-function isValidMediaRequestAckMsg(msg) {
-    const maybeMediaRequestAckMsg = msg;
-    return Boolean(maybeMediaRequestAckMsg.mediaRequestSeqNum);
+function isValidMediaRequestStatusAckMsg(msg) {
+    const maybeMediaRequestStatusAckMsg = msg;
+    return Boolean(maybeMediaRequestStatusAckMsg.mediaRequestStatusSeqNum);
 }
 
 function isValidMidRidStreamId(obj) {
@@ -6785,19 +6781,6 @@ function isValidMediaRequestStatusMsg(msg) {
         maybeMediaRequestStatusMsg.streamStates.every((streamInfo) => isValidStreamInfo(streamInfo)));
 }
 
-class MediaRequestStatusAckMsg {
-    constructor(mediaRequestStatusSeqNum) {
-        this.mediaRequestStatusSeqNum = mediaRequestStatusSeqNum;
-    }
-    toString() {
-        return `MediaRequestStatusAckMsg(seqNum=${this.mediaRequestStatusSeqNum})`;
-    }
-}
-function isValidMediaRequestStatusAckMsg(msg) {
-    const maybeMediaRequestStatusAckMsg = msg;
-    return Boolean(maybeMediaRequestStatusAckMsg.mediaRequestStatusSeqNum);
-}
-
 class ReceiverSelectedInfo {
     constructor(csi) {
         this.csi = csi;
@@ -6830,6 +6813,19 @@ function arePolicySpecificInfosEqual(left, right) {
     throw new Error('Invalid PolicySpecificInfo');
 }
 
+class SourceAdvertisementAckMsg {
+    constructor(sourceAdvertisementSeqNum) {
+        this.sourceAdvertisementSeqNum = sourceAdvertisementSeqNum;
+    }
+    toString() {
+        return `SourceAdvertisementAckMsg(sourceAdvertisementSeqNum=${this.sourceAdvertisementSeqNum})`;
+    }
+}
+function isValidSourceAdvertisementAckMsg(msg) {
+    const maybeSourceAdvertisementAckMsg = msg;
+    return Boolean(maybeSourceAdvertisementAckMsg.sourceAdvertisementSeqNum);
+}
+
 class SourceAdvertisementMsg {
     constructor(seqNum, numTotalSources, numLiveSources, namedMediaGroups, videoContentHint) {
         this.seqNum = seqNum;
@@ -6855,19 +6851,6 @@ function areSourceAdvertisementMsgsEqual(sourceAdvertisementMsg1, sourceAdvertis
         sourceAdvertisementMsg1.videoContentHint === sourceAdvertisementMsg2.videoContentHint);
 }
 
-class SourceAdvertisementAckMsg {
-    constructor(sourceAdvertisementSeqNum) {
-        this.sourceAdvertisementSeqNum = sourceAdvertisementSeqNum;
-    }
-    toString() {
-        return `SourceAdvertisementAckMsg(sourceAdvertisementSeqNum=${this.sourceAdvertisementSeqNum})`;
-    }
-}
-function isValidSourceAdvertisementAckMsg(msg) {
-    const maybeSourceAdvertisementAckMsg = msg;
-    return Boolean(maybeSourceAdvertisementAckMsg.sourceAdvertisementSeqNum);
-}
-
 class StreamRequest$1 {
     constructor(policy, policySpecificInfo, ids, maxPayloadBitsPerSecond, codecInfos = []) {
         this.policy = policy;
@@ -7098,8 +7081,7 @@ class JmpSession extends events$3.EventEmitter {
             msgType,
             payload,
         });
-        const homerMsg = new HomerMsg(HomerMsgType.Multistream, jmpMsg);
-        (_a = this.txCallback) === null || _a === void 0 ? void 0 : _a.call(this, JSON.stringify(homerMsg));
+        (_a = this.txCallback) === null || _a === void 0 ? void 0 : _a.call(this, jmpMsg);
     }
     handleIncomingMediaRequest(mediaRequestMsg) {
         var _a;
@@ -7621,7 +7603,10 @@ function getFrameHeightByMaxFs(sourceAspectRatio, requestedMaxFs) {
     const _gcd = gcd(sourceAspectRatio[0], sourceAspectRatio[1]);
     const minNumberRatiosForWidth = sourceAspectRatio[0] / _gcd;
     const minNumberRatiosForHeight = sourceAspectRatio[1] / _gcd;
-    return (Math.floor(Math.sqrt((requestedMaxFs * 16 * 16) / (minNumberRatiosForWidth * minNumberRatiosForHeight))) * minNumberRatiosForHeight);
+    const macroBlockSize = 16 * 16;
+    const minRatioNumberByMaxFs = Math.sqrt((requestedMaxFs * macroBlockSize) / (minNumberRatiosForWidth * minNumberRatiosForHeight));
+    const roundedMinRatioNumberByMaxFs = Math.max(Math.floor(minRatioNumberByMaxFs), 1.0);
+    return roundedMinRatioNumberByMaxFs * minNumberRatiosForHeight;
 }
 function getScaleDownRatio(sourceWidth, sourceHeight, maxFs, maxWidth, maxHeight) {
     if (!sourceWidth || !sourceHeight || !maxFs) {
@@ -10514,6 +10499,23 @@ class IngressSdpMunger {
     }
 }
 
+var HomerMsgType;
+(function (HomerMsgType) {
+    HomerMsgType["Multistream"] = "multistream";
+})(HomerMsgType || (HomerMsgType = {}));
+class HomerMsg {
+    constructor(msgType, payload) {
+        this.msgType = msgType;
+        this.payload = payload;
+    }
+    static fromJson(data) {
+        if (!data.msgType || !data.payload) {
+            return null;
+        }
+        return new HomerMsg(data.msgType, data.payload);
+    }
+}
+
 class MidPredictor {
     constructor() {
         this.currentMid = 0;
@@ -15083,22 +15085,24 @@ class MultistreamConnection extends EventEmitter$2 {
     }
     createJmpSession(mediaType) {
         const jmpSession = new JmpSession(getMediaFamily(mediaType), getMediaContent(mediaType));
-        jmpSession.setTxCallback((msg) => {
+        jmpSession.setTxCallback((jmpMessage) => {
             var _a;
             if (((_a = this.dataChannel) === null || _a === void 0 ? void 0 : _a.readyState) !== 'open') {
                 logger.error(`DataChannel not created or not connected. Unable to send JMP message.`);
                 return;
             }
+            const homerMsg = new HomerMsg(HomerMsgType.Multistream, jmpMessage);
+            const serializedHomerMsg = JSON.stringify(homerMsg);
             try {
-                logger.info(`Sending JMP message (size: ${msg.length}): ${msg}`);
-                this.dataChannel.send(msg);
+                logger.info(`Sending JMP message: ${serializedHomerMsg}`);
+                this.dataChannel.send(serializedHomerMsg);
             }
             catch (err) {
                 const { bufferedAmount, readyState } = this.dataChannel;
                 const { sctp } = this.pc.getUnderlyingRTCPeerConnection();
                 const { maxMessageSize, state } = sctp || {};
                 logErrorAndThrow(exports.WcmeErrorType.DATA_CHANNEL_SEND_FAILED, `Sending JMP message failed with error: ${err},
-Message size: ${msg.length},
+Message size: ${serializedHomerMsg.length},
 Data Channel State: ${readyState},
 Data Channel Buffered amount: ${bufferedAmount},
 SCTP State: ${state},