@webex/internal-media-core 1.35.3 → 1.35.4

package/dist/cjs/index.js

@@ -2933,6 +2933,22 @@ class FingerprintLine$1 extends Line$1 {
   }
 }
 FingerprintLine$1.regex = new RegExp("^fingerprint:(".concat(REST$1, ")"));
+function parseFmtpParams$1(fmtpParams) {
+  fmtpParams = fmtpParams.replace(/^a=fmtp:\d+\x20/, '');
+  var fmtpObj = new Map();
+  if (/^\d+([/-]\d+)+$/.test(fmtpParams)) {
+    fmtpObj.set(fmtpParams, undefined);
+    return fmtpObj;
+  }
+  fmtpParams.split(';').forEach(param => {
+    var paramArr = param && param.split('=');
+    if (paramArr.length !== 2 || !paramArr[0] || !paramArr[1]) {
+      throw new Error("Fmtp params is invalid with ".concat(fmtpParams));
+    }
+    fmtpObj.set(paramArr[0], paramArr[1]);
+  });
+  return fmtpObj;
+}
 class FmtpLine$1 extends Line$1 {
   constructor(payloadType, params) {
     super();
@@ -2946,10 +2962,16 @@ class FmtpLine$1 extends Line$1 {
     var tokens = line.match(FmtpLine$1.regex);
     var payloadType = parseInt(tokens[1], 10);
     var params = tokens[2];
-    return new FmtpLine$1(payloadType, params);
+    return new FmtpLine$1(payloadType, parseFmtpParams$1(params));
   }
   toSdpLine() {
-    return "a=fmtp:".concat(this.payloadType, " ").concat(this.params);
+    var fmtParams = Array.from(this.params.keys()).map(key => {
+      if (this.params.get(key) !== undefined) {
+        return "".concat(key, "=").concat(this.params.get(key));
+      }
+      return "".concat(key);
+    }).join(';');
+    return "a=fmtp:".concat(this.payloadType, " ").concat(fmtParams);
   }
 }
 FmtpLine$1.regex = new RegExp("^fmtp:(".concat(NUM$1, ") (").concat(REST$1, ")"));
@@ -3610,7 +3632,7 @@ class ApplicationMediaDescription$1 extends MediaDescription$1 {
 }
 class CodecInfo$2 {
   constructor(pt) {
-    this.fmtParams = [];
+    this.fmtParams = new Map();
     this.feedback = [];
     this.pt = pt;
   }
@@ -3622,9 +3644,9 @@ class CodecInfo$2 {
       return true;
     }
     if (line instanceof FmtpLine$1) {
-      this.fmtParams.push(line.params);
-      if (line.params.indexOf('apt') !== -1) {
-        var apt = line.params.split('=')[1];
+      this.fmtParams = new Map([...Array.from(this.fmtParams.entries()), ...Array.from(line.params.entries())]);
+      if (line.params.has('apt')) {
+        var apt = line.params.get('apt');
         this.primaryCodecPt = parseInt(apt, 10);
       }
       return true;
@@ -3637,13 +3659,15 @@ class CodecInfo$2 {
   }
   toLines() {
     var lines = [];
-    lines.push(new RtpMapLine$1(this.pt, this.name, this.clockRate, this.encodingParams));
+    if (this.name && this.clockRate) {
+      lines.push(new RtpMapLine$1(this.pt, this.name, this.clockRate, this.encodingParams));
+    }
     this.feedback.forEach(fb => {
       lines.push(new RtcpFbLine$1(this.pt, fb));
     });
-    this.fmtParams.forEach(fmt => {
-      lines.push(new FmtpLine$1(this.pt, fmt));
-    });
+    if (this.fmtParams.size > 0) {
+      lines.push(new FmtpLine$1(this.pt, this.fmtParams));
+    }
     return lines;
   }
 }
@@ -4044,13 +4068,13 @@ function disableExtmap(sdp) {
     media.extMaps.length = 0;
   });
 }
-function appendToH264fmtpParams(sdp, paramsToAppend) {
+function updateH264fmtpParams(sdp, paramsToUpdate) {
   sdp.avMedia.forEach(media => {
     if (media.type === 'video') {
       media.codecs.forEach(codec => {
         var _codec$name2;
         if (((_codec$name2 = codec.name) === null || _codec$name2 === void 0 ? void 0 : _codec$name2.toUpperCase()) === 'H264') {
-          codec.fmtParams = codec.fmtParams.map(fmtp => "".concat(fmtp, ";").concat(paramsToAppend));
+          paramsToUpdate.forEach((value, key) => codec.fmtParams.set(key, value));
         }
       });
     }
@@ -4084,32 +4108,30 @@ function adjustH264Profile(sdp, maxFsValue) {
       media.codecs.forEach(codec => {
         var _codec$name3;
         if (((_codec$name3 = codec.name) === null || _codec$name3 === void 0 ? void 0 : _codec$name3.toUpperCase()) === 'H264') {
-          codec.fmtParams = codec.fmtParams.map(fmtp => {
-            var parsedRegex = fmtp.match(/(.*)profile-level-id=(\w{4})(\w{2})(.*)/);
-            if (parsedRegex && parsedRegex.length === 5) {
-              var stuffBeforeProfileLevelId = parsedRegex[1];
-              var profile = parsedRegex[2].toLowerCase();
-              var levelId = parseInt(parsedRegex[3], 16);
-              var stuffAfterProfileLevelId = parsedRegex[4];
-              if (!maxFsForProfileLevel[levelId]) {
-                throw new Error("found unsupported h264 profile level id value in the SDP: ".concat(levelId));
-              }
-              if (maxFsForProfileLevel[levelId] === maxFsValue) {
-                return fmtp;
-              }
-              if (maxFsForProfileLevel[levelId] < maxFsValue) {
-                return "".concat(fmtp, ";max-fs=").concat(maxFsValue, ";max-mbps=").concat(maxFsValue * framesPerSecond);
-              }
-              var newLevelId = Object.keys(maxFsForProfileLevel).reverse().find(key => maxFsForProfileLevel[key] === maxFsValue);
-              if (newLevelId) {
-                var newLevelIdHex = parseInt(newLevelId, 10).toString(16);
-                var maxMbps = "max-mbps=".concat(maxFsValue * framesPerSecond);
-                return "".concat(stuffBeforeProfileLevelId, "profile-level-id=").concat(profile).concat(newLevelIdHex, ";").concat(maxMbps).concat(stuffAfterProfileLevelId);
-              }
-              throw new Error("unsupported maxFsValue: ".concat(maxFsValue));
+          var profileLevelIdValue = codec.fmtParams.get('profile-level-id');
+          if (profileLevelIdValue) {
+            var profile = profileLevelIdValue.substring(0, 4).toLowerCase();
+            var levelId = parseInt(profileLevelIdValue.substring(4, 6), 16);
+            if (!maxFsForProfileLevel[levelId]) {
+              throw new Error("found unsupported h264 profile level id value in the SDP: ".concat(levelId));
             }
-            return fmtp;
-          });
+            if (maxFsForProfileLevel[levelId] === maxFsValue) {
+              return;
+            }
+            if (maxFsForProfileLevel[levelId] < maxFsValue) {
+              codec.fmtParams.set('max-fs', "".concat(maxFsValue));
+              codec.fmtParams.set('max-mbps', "".concat(maxFsValue * framesPerSecond));
+              return;
+            }
+            var newLevelId = Object.keys(maxFsForProfileLevel).reverse().find(key => maxFsForProfileLevel[key] === maxFsValue);
+            if (newLevelId) {
+              var newLevelIdHex = parseInt(newLevelId, 10).toString(16);
+              codec.fmtParams.set('profile-level-id', "".concat(profile).concat(newLevelIdHex));
+              codec.fmtParams.set('max-mbps', "".concat(maxFsValue * framesPerSecond));
+              return;
+            }
+            throw new Error("unsupported maxFsValue: ".concat(maxFsValue));
+          }
         }
       });
     }
@@ -4160,7 +4182,7 @@ function mungeLocalSdp(config, sdp) {
   return parsedSdp.toString();
 }
 function setStartBitrate(sdp, startBitrate) {
-  appendToH264fmtpParams(sdp, "x-google-start-bitrate=".concat(startBitrate));
+  updateH264fmtpParams(sdp, new Map([['x-google-start-bitrate', startBitrate.toString()]]));
 }
 function removeXtlsIceCandidates(sdp) {
   sdp.media.forEach(media => {

package/dist/esm/index.js

@@ -2922,6 +2922,22 @@ class FingerprintLine$1 extends Line$1 {
   }
 }
 FingerprintLine$1.regex = new RegExp("^fingerprint:(".concat(REST$1, ")"));
+function parseFmtpParams$1(fmtpParams) {
+  fmtpParams = fmtpParams.replace(/^a=fmtp:\d+\x20/, '');
+  var fmtpObj = new Map();
+  if (/^\d+([/-]\d+)+$/.test(fmtpParams)) {
+    fmtpObj.set(fmtpParams, undefined);
+    return fmtpObj;
+  }
+  fmtpParams.split(';').forEach(param => {
+    var paramArr = param && param.split('=');
+    if (paramArr.length !== 2 || !paramArr[0] || !paramArr[1]) {
+      throw new Error("Fmtp params is invalid with ".concat(fmtpParams));
+    }
+    fmtpObj.set(paramArr[0], paramArr[1]);
+  });
+  return fmtpObj;
+}
 class FmtpLine$1 extends Line$1 {
   constructor(payloadType, params) {
     super();
@@ -2935,10 +2951,16 @@ class FmtpLine$1 extends Line$1 {
     var tokens = line.match(FmtpLine$1.regex);
     var payloadType = parseInt(tokens[1], 10);
     var params = tokens[2];
-    return new FmtpLine$1(payloadType, params);
+    return new FmtpLine$1(payloadType, parseFmtpParams$1(params));
   }
   toSdpLine() {
-    return "a=fmtp:".concat(this.payloadType, " ").concat(this.params);
+    var fmtParams = Array.from(this.params.keys()).map(key => {
+      if (this.params.get(key) !== undefined) {
+        return "".concat(key, "=").concat(this.params.get(key));
+      }
+      return "".concat(key);
+    }).join(';');
+    return "a=fmtp:".concat(this.payloadType, " ").concat(fmtParams);
   }
 }
 FmtpLine$1.regex = new RegExp("^fmtp:(".concat(NUM$1, ") (").concat(REST$1, ")"));
@@ -3599,7 +3621,7 @@ class ApplicationMediaDescription$1 extends MediaDescription$1 {
 }
 class CodecInfo$2 {
   constructor(pt) {
-    this.fmtParams = [];
+    this.fmtParams = new Map();
     this.feedback = [];
     this.pt = pt;
   }
@@ -3611,9 +3633,9 @@ class CodecInfo$2 {
       return true;
     }
     if (line instanceof FmtpLine$1) {
-      this.fmtParams.push(line.params);
-      if (line.params.indexOf('apt') !== -1) {
-        var apt = line.params.split('=')[1];
+      this.fmtParams = new Map([...Array.from(this.fmtParams.entries()), ...Array.from(line.params.entries())]);
+      if (line.params.has('apt')) {
+        var apt = line.params.get('apt');
         this.primaryCodecPt = parseInt(apt, 10);
       }
       return true;
@@ -3626,13 +3648,15 @@ class CodecInfo$2 {
   }
   toLines() {
     var lines = [];
-    lines.push(new RtpMapLine$1(this.pt, this.name, this.clockRate, this.encodingParams));
+    if (this.name && this.clockRate) {
+      lines.push(new RtpMapLine$1(this.pt, this.name, this.clockRate, this.encodingParams));
+    }
     this.feedback.forEach(fb => {
       lines.push(new RtcpFbLine$1(this.pt, fb));
     });
-    this.fmtParams.forEach(fmt => {
-      lines.push(new FmtpLine$1(this.pt, fmt));
-    });
+    if (this.fmtParams.size > 0) {
+      lines.push(new FmtpLine$1(this.pt, this.fmtParams));
+    }
     return lines;
   }
 }
@@ -4033,13 +4057,13 @@ function disableExtmap(sdp) {
     media.extMaps.length = 0;
   });
 }
-function appendToH264fmtpParams(sdp, paramsToAppend) {
+function updateH264fmtpParams(sdp, paramsToUpdate) {
   sdp.avMedia.forEach(media => {
     if (media.type === 'video') {
       media.codecs.forEach(codec => {
         var _codec$name2;
         if (((_codec$name2 = codec.name) === null || _codec$name2 === void 0 ? void 0 : _codec$name2.toUpperCase()) === 'H264') {
-          codec.fmtParams = codec.fmtParams.map(fmtp => "".concat(fmtp, ";").concat(paramsToAppend));
+          paramsToUpdate.forEach((value, key) => codec.fmtParams.set(key, value));
         }
       });
     }
@@ -4073,32 +4097,30 @@ function adjustH264Profile(sdp, maxFsValue) {
       media.codecs.forEach(codec => {
         var _codec$name3;
         if (((_codec$name3 = codec.name) === null || _codec$name3 === void 0 ? void 0 : _codec$name3.toUpperCase()) === 'H264') {
-          codec.fmtParams = codec.fmtParams.map(fmtp => {
-            var parsedRegex = fmtp.match(/(.*)profile-level-id=(\w{4})(\w{2})(.*)/);
-            if (parsedRegex && parsedRegex.length === 5) {
-              var stuffBeforeProfileLevelId = parsedRegex[1];
-              var profile = parsedRegex[2].toLowerCase();
-              var levelId = parseInt(parsedRegex[3], 16);
-              var stuffAfterProfileLevelId = parsedRegex[4];
-              if (!maxFsForProfileLevel[levelId]) {
-                throw new Error("found unsupported h264 profile level id value in the SDP: ".concat(levelId));
-              }
-              if (maxFsForProfileLevel[levelId] === maxFsValue) {
-                return fmtp;
-              }
-              if (maxFsForProfileLevel[levelId] < maxFsValue) {
-                return "".concat(fmtp, ";max-fs=").concat(maxFsValue, ";max-mbps=").concat(maxFsValue * framesPerSecond);
-              }
-              var newLevelId = Object.keys(maxFsForProfileLevel).reverse().find(key => maxFsForProfileLevel[key] === maxFsValue);
-              if (newLevelId) {
-                var newLevelIdHex = parseInt(newLevelId, 10).toString(16);
-                var maxMbps = "max-mbps=".concat(maxFsValue * framesPerSecond);
-                return "".concat(stuffBeforeProfileLevelId, "profile-level-id=").concat(profile).concat(newLevelIdHex, ";").concat(maxMbps).concat(stuffAfterProfileLevelId);
-              }
-              throw new Error("unsupported maxFsValue: ".concat(maxFsValue));
+          var profileLevelIdValue = codec.fmtParams.get('profile-level-id');
+          if (profileLevelIdValue) {
+            var profile = profileLevelIdValue.substring(0, 4).toLowerCase();
+            var levelId = parseInt(profileLevelIdValue.substring(4, 6), 16);
+            if (!maxFsForProfileLevel[levelId]) {
+              throw new Error("found unsupported h264 profile level id value in the SDP: ".concat(levelId));
             }
-            return fmtp;
-          });
+            if (maxFsForProfileLevel[levelId] === maxFsValue) {
+              return;
+            }
+            if (maxFsForProfileLevel[levelId] < maxFsValue) {
+              codec.fmtParams.set('max-fs', "".concat(maxFsValue));
+              codec.fmtParams.set('max-mbps', "".concat(maxFsValue * framesPerSecond));
+              return;
+            }
+            var newLevelId = Object.keys(maxFsForProfileLevel).reverse().find(key => maxFsForProfileLevel[key] === maxFsValue);
+            if (newLevelId) {
+              var newLevelIdHex = parseInt(newLevelId, 10).toString(16);
+              codec.fmtParams.set('profile-level-id', "".concat(profile).concat(newLevelIdHex));
+              codec.fmtParams.set('max-mbps', "".concat(maxFsValue * framesPerSecond));
+              return;
+            }
+            throw new Error("unsupported maxFsValue: ".concat(maxFsValue));
+          }
         }
       });
     }
@@ -4149,7 +4171,7 @@ function mungeLocalSdp(config, sdp) {
   return parsedSdp.toString();
 }
 function setStartBitrate(sdp, startBitrate) {
-  appendToH264fmtpParams(sdp, "x-google-start-bitrate=".concat(startBitrate));
+  updateH264fmtpParams(sdp, new Map([['x-google-start-bitrate', startBitrate.toString()]]));
 }
 function removeXtlsIceCandidates(sdp) {
   sdp.media.forEach(media => {

package/dist/types/MediaConnection/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/MediaConnection/utils.ts"],"names":[],"mappings":"AAYA,OAAO,EAAC,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAI1C,oBAAY,SAAS,GAAG,OAAO,GAAG,OAAO,CAAC;AAE1C,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,SAAS,EACf,OAAO,EAAE,OAAO,EAChB,UAAU,CAAC,EAAE,gBAAgB,GAAG,IAAI,GACnC;IAAC,WAAW,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAAC,SAAS,EAAE,0BAA0B,CAAA;CAAC,CAYpF;AAmBD,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE;IACP,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;CACtB,EACD,GAAG,CAAC,EAAE,MAAM,GACX,KAAK,GAAG,KAAK,CA6Bf;AA8ND,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,gBAAgB,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAQrF;AASD,wBAAgB,aAAa,CAAC,MAAM,EAAE,gBAAgB,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CA2B3E;AAcD,wBAAgB,cAAc,CAAC,MAAM,EAAE,gBAAgB,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAc5E"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/MediaConnection/utils.ts"],"names":[],"mappings":"AAYA,OAAO,EAAC,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAI1C,oBAAY,SAAS,GAAG,OAAO,GAAG,OAAO,CAAC;AAE1C,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,SAAS,EACf,OAAO,EAAE,OAAO,EAChB,UAAU,CAAC,EAAE,gBAAgB,GAAG,IAAI,GACnC;IAAC,WAAW,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAAC,SAAS,EAAE,0BAA0B,CAAA;CAAC,CAYpF;AAmBD,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE;IACP,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;CACtB,EACD,GAAG,CAAC,EAAE,MAAM,GACX,KAAK,GAAG,KAAK,CA6Bf;AAkOD,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,gBAAgB,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAQrF;AASD,wBAAgB,aAAa,CAAC,MAAM,EAAE,gBAAgB,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CA2B3E;AAcD,wBAAgB,cAAc,CAAC,MAAM,EAAE,gBAAgB,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAc5E"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/internal-media-core",
-  "version": "1.35.3",
+  "version": "1.35.4",
   "files": [
     "dist/cjs",
     "dist/esm",
@@ -46,7 +46,7 @@
   "dependencies": {
     "@babel/runtime": "^7.18.9",
     "@webex/json-multistream": "1.20.2",
-    "@webex/ts-sdp": "1.3.0",
+    "@webex/ts-sdp": "1.3.2",
     "@webex/web-client-media-engine": "1.40.2",
     "detectrtc": "^1.4.1",
     "events": "^3.3.0",