@webex/web-client-media-engine 3.36.0 → 3.37.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/index.js +107 -100
- package/dist/cjs/index.js.map +1 -1
- package/dist/esm/index.js +107 -100
- package/dist/esm/index.js.map +1 -1
- package/dist/types/index.d.ts +9 -11
- package/package.json +1 -1
package/dist/cjs/index.js
CHANGED
|
@@ -8210,6 +8210,24 @@ function getRecommendedMaxBitrateForFrameSize(requestedMaxFs) {
|
|
|
8210
8210
|
.sort((a, b) => b - a)
|
|
8211
8211
|
.find((h) => requestedMaxFs >= h);
|
|
8212
8212
|
return maxFrameSizeToMaxBitrateMap.get(expectedHeight);
|
|
8213
|
+
}
|
|
8214
|
+
function setCodecParameters(allCodecParameters, codecMimeType, newParameters) {
|
|
8215
|
+
if (!allCodecParameters.has(codecMimeType)) {
|
|
8216
|
+
allCodecParameters.set(codecMimeType, {});
|
|
8217
|
+
}
|
|
8218
|
+
const currentParameters = allCodecParameters.get(codecMimeType);
|
|
8219
|
+
Object.entries(newParameters).forEach(([param, value]) => {
|
|
8220
|
+
currentParameters[param] = value;
|
|
8221
|
+
});
|
|
8222
|
+
}
|
|
8223
|
+
function markCodecParametersForDeletion(allCodecParameters, codecMimeTypeToUpdate, codecParameters) {
|
|
8224
|
+
if (!allCodecParameters.has(codecMimeTypeToUpdate)) {
|
|
8225
|
+
allCodecParameters.set(codecMimeTypeToUpdate, {});
|
|
8226
|
+
}
|
|
8227
|
+
const currentParameters = allCodecParameters.get(codecMimeTypeToUpdate);
|
|
8228
|
+
codecParameters.forEach((param) => {
|
|
8229
|
+
currentParameters[param] = undefined;
|
|
8230
|
+
});
|
|
8213
8231
|
}
|
|
8214
8232
|
|
|
8215
8233
|
/******************************************************************************
|
|
@@ -10443,16 +10461,17 @@ function addVlaExtension(mediaDescription) {
|
|
|
10443
10461
|
mediaDescription.addExtension({ uri: vlaExtensionUri });
|
|
10444
10462
|
}
|
|
10445
10463
|
}
|
|
10446
|
-
function
|
|
10447
|
-
|
|
10464
|
+
function setFormatParameters(mediaDescription, codecMimeType, paramsMap) {
|
|
10465
|
+
const codecName = codecMimeType.split('/')[1].toLowerCase();
|
|
10466
|
+
Object.entries(paramsMap).forEach(([param, value]) => {
|
|
10448
10467
|
[...mediaDescription.codecs.values()]
|
|
10449
|
-
.filter((ci) => ci.name &&
|
|
10468
|
+
.filter((ci) => ci.name && codecName === ci.name.toLowerCase())
|
|
10450
10469
|
.forEach((ci) => {
|
|
10451
|
-
if (value ===
|
|
10470
|
+
if (value === undefined) {
|
|
10452
10471
|
ci.fmtParams.delete(param);
|
|
10453
10472
|
}
|
|
10454
10473
|
else {
|
|
10455
|
-
ci.fmtParams.set(param,
|
|
10474
|
+
ci.fmtParams.set(param, value);
|
|
10456
10475
|
}
|
|
10457
10476
|
});
|
|
10458
10477
|
});
|
|
@@ -10567,7 +10586,9 @@ class EgressSdpMunger {
|
|
|
10567
10586
|
if (options.simulcastEnabled) {
|
|
10568
10587
|
mediaDescription.addLine(new SsrcGroupLine('SIM', this.streamIds.map((streamId) => streamId.ssrc)));
|
|
10569
10588
|
}
|
|
10570
|
-
|
|
10589
|
+
this.customCodecParameters.forEach((codecParams, codecMimeType) => {
|
|
10590
|
+
setFormatParameters(mediaDescription, codecMimeType, codecParams);
|
|
10591
|
+
});
|
|
10571
10592
|
if (options.twccDisabled) {
|
|
10572
10593
|
disableTwcc(mediaDescription);
|
|
10573
10594
|
}
|
|
@@ -10597,7 +10618,9 @@ class EgressSdpMunger {
|
|
|
10597
10618
|
ci.fmtParams.set('usedtx', mungeOptions.dtxDisabled ? '0' : '1');
|
|
10598
10619
|
});
|
|
10599
10620
|
}
|
|
10600
|
-
|
|
10621
|
+
this.customCodecParameters.forEach((codecParams, codecMimeType) => {
|
|
10622
|
+
setFormatParameters(mediaDescription, codecMimeType, codecParams);
|
|
10623
|
+
});
|
|
10601
10624
|
}
|
|
10602
10625
|
getSenderIds() {
|
|
10603
10626
|
return this.streamIds;
|
|
@@ -10605,15 +10628,11 @@ class EgressSdpMunger {
|
|
|
10605
10628
|
getEncodingIndexForStreamId(streamId) {
|
|
10606
10629
|
return this.streamIds.findIndex((currStreamId) => areStreamIdsEqual(currStreamId, streamId));
|
|
10607
10630
|
}
|
|
10608
|
-
|
|
10609
|
-
|
|
10610
|
-
this.customCodecParameters.set(param, value);
|
|
10611
|
-
});
|
|
10631
|
+
setCustomCodecParameters(codecMimeType, parameters) {
|
|
10632
|
+
setCodecParameters(this.customCodecParameters, codecMimeType, parameters);
|
|
10612
10633
|
}
|
|
10613
|
-
|
|
10614
|
-
|
|
10615
|
-
this.customCodecParameters.set(param, null);
|
|
10616
|
-
});
|
|
10634
|
+
markCustomCodecParametersForDeletion(codecMimeType, parameters) {
|
|
10635
|
+
markCodecParametersForDeletion(this.customCodecParameters, codecMimeType, parameters);
|
|
10617
10636
|
}
|
|
10618
10637
|
}
|
|
10619
10638
|
|
|
@@ -11099,7 +11118,6 @@ class EventEmitter$2 extends events$1.exports.EventEmitter {
|
|
|
11099
11118
|
class IngressSdpMunger {
|
|
11100
11119
|
constructor() {
|
|
11101
11120
|
this.customCodecParameters = new Map();
|
|
11102
|
-
this.customRtxCodecParameters = new Map();
|
|
11103
11121
|
this.ssrc = generateSsrc();
|
|
11104
11122
|
}
|
|
11105
11123
|
getReceiverId() {
|
|
@@ -11111,8 +11129,9 @@ class IngressSdpMunger {
|
|
|
11111
11129
|
logErrorAndThrow(exports.WcmeErrorType.SDP_MUNGE_MISSING_CODECS, `No codecs present in m-line with MID ${mediaDescription.mid} after filtering.`);
|
|
11112
11130
|
}
|
|
11113
11131
|
removeMidRidExtensions(mediaDescription);
|
|
11114
|
-
|
|
11115
|
-
|
|
11132
|
+
this.customCodecParameters.forEach((codecParams, codecMimeType) => {
|
|
11133
|
+
setFormatParameters(mediaDescription, codecMimeType, codecParams);
|
|
11134
|
+
});
|
|
11116
11135
|
if (options.twccDisabled) {
|
|
11117
11136
|
disableTwcc(mediaDescription);
|
|
11118
11137
|
}
|
|
@@ -11133,17 +11152,16 @@ class IngressSdpMunger {
|
|
|
11133
11152
|
if (retainCandidatesByTransportType(mediaDescription, ['udp', 'tcp'])) {
|
|
11134
11153
|
logger.log(`Some unsupported remote candidates have been removed from mid ${mediaDescription.mid}`);
|
|
11135
11154
|
}
|
|
11136
|
-
|
|
11155
|
+
const rtxParams = this.customCodecParameters.get(exports.MediaCodecMimeType.RTX);
|
|
11156
|
+
if (rtxParams) {
|
|
11157
|
+
setFormatParameters(mediaDescription, exports.MediaCodecMimeType.RTX, rtxParams);
|
|
11158
|
+
}
|
|
11137
11159
|
}
|
|
11138
|
-
|
|
11139
|
-
|
|
11140
|
-
this.customCodecParameters.set(param, value);
|
|
11141
|
-
});
|
|
11160
|
+
setCustomCodecParameters(codecMimeType, parameters) {
|
|
11161
|
+
setCodecParameters(this.customCodecParameters, codecMimeType, parameters);
|
|
11142
11162
|
}
|
|
11143
|
-
|
|
11144
|
-
|
|
11145
|
-
this.customRtxCodecParameters.set(param, value);
|
|
11146
|
-
});
|
|
11163
|
+
markCustomCodecParametersForDeletion(codecMimeType, parameters) {
|
|
11164
|
+
markCodecParametersForDeletion(this.customCodecParameters, codecMimeType, parameters);
|
|
11147
11165
|
}
|
|
11148
11166
|
reset() {
|
|
11149
11167
|
this.ssrc = generateSsrc();
|
|
@@ -11456,11 +11474,8 @@ class ReceiveOnlyTransceiver extends Transceiver {
|
|
|
11456
11474
|
this.metadata.lastActiveSpeakerUpdateTimestamp = getCurrentTimestamp();
|
|
11457
11475
|
}
|
|
11458
11476
|
}
|
|
11459
|
-
|
|
11460
|
-
this.munger.
|
|
11461
|
-
}
|
|
11462
|
-
setRtxCodecParameters(parameters) {
|
|
11463
|
-
this.munger.setRtxCodecParameters(parameters);
|
|
11477
|
+
setCustomCodecParameters(codecMimeType, parameters) {
|
|
11478
|
+
this.munger.setCustomCodecParameters(codecMimeType, parameters);
|
|
11464
11479
|
}
|
|
11465
11480
|
}
|
|
11466
11481
|
ReceiveOnlyTransceiver.rid = '1';
|
|
@@ -15436,12 +15451,12 @@ class SendOnlyTransceiver extends Transceiver {
|
|
|
15436
15451
|
resetSdpMunger() {
|
|
15437
15452
|
this.munger.reset();
|
|
15438
15453
|
}
|
|
15439
|
-
|
|
15440
|
-
this.munger.
|
|
15454
|
+
setCustomCodecParameters(codecMimeType, codecParams) {
|
|
15455
|
+
this.munger.setCustomCodecParameters(codecMimeType, codecParams);
|
|
15441
15456
|
this.negotiationNeeded.emit(OfferAnswerType.LocalOnly);
|
|
15442
15457
|
}
|
|
15443
|
-
|
|
15444
|
-
this.munger.
|
|
15458
|
+
markCustomCodecParametersForDeletion(codecMimeType, parameters) {
|
|
15459
|
+
this.munger.markCustomCodecParametersForDeletion(codecMimeType, parameters);
|
|
15445
15460
|
this.negotiationNeeded.emit(OfferAnswerType.LocalOnly);
|
|
15446
15461
|
}
|
|
15447
15462
|
setSourceStateOverride(state) {
|
|
@@ -15502,12 +15517,26 @@ class SendSlot {
|
|
|
15502
15517
|
}
|
|
15503
15518
|
setCodecParameters(parameters) {
|
|
15504
15519
|
return __awaiter(this, void 0, void 0, function* () {
|
|
15505
|
-
|
|
15520
|
+
[exports.MediaCodecMimeType.H264, exports.MediaCodecMimeType.OPUS].forEach((codecMimeType) => {
|
|
15521
|
+
this.setCustomCodecParameters(codecMimeType, parameters);
|
|
15522
|
+
});
|
|
15506
15523
|
});
|
|
15507
15524
|
}
|
|
15508
15525
|
deleteCodecParameters(parameters) {
|
|
15509
15526
|
return __awaiter(this, void 0, void 0, function* () {
|
|
15510
|
-
|
|
15527
|
+
[exports.MediaCodecMimeType.H264, exports.MediaCodecMimeType.OPUS].forEach((codecMimeType) => {
|
|
15528
|
+
this.markCustomCodecParametersForDeletion(codecMimeType, parameters);
|
|
15529
|
+
});
|
|
15530
|
+
});
|
|
15531
|
+
}
|
|
15532
|
+
setCustomCodecParameters(codecMimeType, parameters) {
|
|
15533
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
15534
|
+
this.sendTransceiver.setCustomCodecParameters(codecMimeType, parameters);
|
|
15535
|
+
});
|
|
15536
|
+
}
|
|
15537
|
+
markCustomCodecParametersForDeletion(codecMimeType, parameters) {
|
|
15538
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
15539
|
+
this.sendTransceiver.markCustomCodecParametersForDeletion(codecMimeType, parameters);
|
|
15511
15540
|
});
|
|
15512
15541
|
}
|
|
15513
15542
|
setSourceStateOverride(state) {
|
|
@@ -15591,31 +15620,6 @@ const organizeTransceiverStats = (sendTransceivers, recvTransceivers, peerConnec
|
|
|
15591
15620
|
return result;
|
|
15592
15621
|
});
|
|
15593
15622
|
|
|
15594
|
-
var WorkerClass = null;
|
|
15595
|
-
|
|
15596
|
-
try {
|
|
15597
|
-
var WorkerThreads =
|
|
15598
|
-
typeof module !== 'undefined' && typeof module.require === 'function' && module.require('worker_threads') ||
|
|
15599
|
-
typeof __non_webpack_require__ === 'function' && __non_webpack_require__('worker_threads') ||
|
|
15600
|
-
typeof require === 'function' && require('worker_threads');
|
|
15601
|
-
WorkerClass = WorkerThreads.Worker;
|
|
15602
|
-
} catch(e) {} // eslint-disable-line
|
|
15603
|
-
|
|
15604
|
-
function decodeBase64$1(base64, enableUnicode) {
|
|
15605
|
-
return Buffer.from(base64, 'base64').toString(enableUnicode ? 'utf16' : 'utf8');
|
|
15606
|
-
}
|
|
15607
|
-
|
|
15608
|
-
function createBase64WorkerFactory$2(base64, sourcemapArg, enableUnicodeArg) {
|
|
15609
|
-
var sourcemap = sourcemapArg === undefined ? null : sourcemapArg;
|
|
15610
|
-
var enableUnicode = enableUnicodeArg === undefined ? false : enableUnicodeArg;
|
|
15611
|
-
var source = decodeBase64$1(base64, enableUnicode);
|
|
15612
|
-
var start = source.indexOf('\n', 10) + 1;
|
|
15613
|
-
var body = source.substring(start) + (sourcemap ? '\/\/# sourceMappingURL=' + sourcemap : '');
|
|
15614
|
-
return function WorkerFactory(options) {
|
|
15615
|
-
return new WorkerClass(body, Object.assign({}, options, { eval: true }));
|
|
15616
|
-
};
|
|
15617
|
-
}
|
|
15618
|
-
|
|
15619
15623
|
function decodeBase64(base64, enableUnicode) {
|
|
15620
15624
|
var binaryString = atob(base64);
|
|
15621
15625
|
if (enableUnicode) {
|
|
@@ -15639,7 +15643,7 @@ function createURL(base64, sourcemapArg, enableUnicodeArg) {
|
|
|
15639
15643
|
return URL.createObjectURL(blob);
|
|
15640
15644
|
}
|
|
15641
15645
|
|
|
15642
|
-
function createBase64WorkerFactory
|
|
15646
|
+
function createBase64WorkerFactory(base64, sourcemapArg, enableUnicodeArg) {
|
|
15643
15647
|
var url;
|
|
15644
15648
|
return function WorkerFactory(options) {
|
|
15645
15649
|
url = url || createURL(base64, sourcemapArg, enableUnicodeArg);
|
|
@@ -15647,19 +15651,6 @@ function createBase64WorkerFactory$1(base64, sourcemapArg, enableUnicodeArg) {
|
|
|
15647
15651
|
};
|
|
15648
15652
|
}
|
|
15649
15653
|
|
|
15650
|
-
var kIsNodeJS = Object.prototype.toString.call(typeof process !== 'undefined' ? process : 0) === '[object process]';
|
|
15651
|
-
|
|
15652
|
-
function isNodeJS() {
|
|
15653
|
-
return kIsNodeJS;
|
|
15654
|
-
}
|
|
15655
|
-
|
|
15656
|
-
function createBase64WorkerFactory(base64, sourcemapArg, enableUnicodeArg) {
|
|
15657
|
-
if (isNodeJS()) {
|
|
15658
|
-
return createBase64WorkerFactory$2(base64, sourcemapArg, enableUnicodeArg);
|
|
15659
|
-
}
|
|
15660
|
-
return createBase64WorkerFactory$1(base64, sourcemapArg, enableUnicodeArg);
|
|
15661
|
-
}
|
|
15662
|
-
|
|
15663
15654
|
var WorkerFactory = /*#__PURE__*/createBase64WorkerFactory('/* rollup-plugin-web-worker-loader */
(function () {
    'use strict';

    var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};

    var logger = {exports: {}};

    /*!
     * js-logger - http://github.com/jonnyreeves/js-logger
     * Jonny Reeves, http://jonnyreeves.co.uk/
     * js-logger may be freely distributed under the MIT license.
     */

    (function (module) {
    (function (global) {

    	// Top level module for the global, static logger instance.
    	var Logger = { };

    	// For those that are at home that are keeping score.
    	Logger.VERSION = "1.6.1";

    	// Function which handles all incoming log messages.
    	var logHandler;

    	// Map of ContextualLogger instances by name; used by Logger.get() to return the same named instance.
    	var contextualLoggersByNameMap = {};

    	// Polyfill for ES5's Function.bind.
    	var bind = function(scope, func) {
    		return function() {
    			return func.apply(scope, arguments);
    		};
    	};

    	// Super exciting object merger-matron 9000 adding another 100 bytes to your download.
    	var merge = function () {
    		var args = arguments, target = args[0], key, i;
    		for (i = 1; i < args.length; i++) {
    			for (key in args[i]) {
    				if (!(key in target) && args[i].hasOwnProperty(key)) {
    					target[key] = args[i][key];
    				}
    			}
    		}
    		return target;
    	};

    	// Helper to define a logging level object; helps with optimisation.
    	var defineLogLevel = function(value, name) {
    		return { value: value, name: name };
    	};

    	// Predefined logging levels.
    	Logger.TRACE = defineLogLevel(1, 'TRACE');
    	Logger.DEBUG = defineLogLevel(2, 'DEBUG');
    	Logger.INFO = defineLogLevel(3, 'INFO');
    	Logger.TIME = defineLogLevel(4, 'TIME');
    	Logger.WARN = defineLogLevel(5, 'WARN');
    	Logger.ERROR = defineLogLevel(8, 'ERROR');
    	Logger.OFF = defineLogLevel(99, 'OFF');

    	// Inner class which performs the bulk of the work; ContextualLogger instances can be configured independently
    	// of each other.
    	var ContextualLogger = function(defaultContext) {
    		this.context = defaultContext;
    		this.setLevel(defaultContext.filterLevel);
    		this.log = this.info;  // Convenience alias.
    	};

    	ContextualLogger.prototype = {
    		// Changes the current logging level for the logging instance.
    		setLevel: function (newLevel) {
    			// Ensure the supplied Level object looks valid.
    			if (newLevel && "value" in newLevel) {
    				this.context.filterLevel = newLevel;
    			}
    		},
    		
    		// Gets the current logging level for the logging instance
    		getLevel: function () {
    			return this.context.filterLevel;
    		},

    		// Is the logger configured to output messages at the supplied level?
    		enabledFor: function (lvl) {
    			var filterLevel = this.context.filterLevel;
    			return lvl.value >= filterLevel.value;
    		},

    		trace: function () {
    			this.invoke(Logger.TRACE, arguments);
    		},

    		debug: function () {
    			this.invoke(Logger.DEBUG, arguments);
    		},

    		info: function () {
    			this.invoke(Logger.INFO, arguments);
    		},

    		warn: function () {
    			this.invoke(Logger.WARN, arguments);
    		},

    		error: function () {
    			this.invoke(Logger.ERROR, arguments);
    		},

    		time: function (label) {
    			if (typeof label === 'string' && label.length > 0) {
    				this.invoke(Logger.TIME, [ label, 'start' ]);
    			}
    		},

    		timeEnd: function (label) {
    			if (typeof label === 'string' && label.length > 0) {
    				this.invoke(Logger.TIME, [ label, 'end' ]);
    			}
    		},

    		// Invokes the logger callback if it's not being filtered.
    		invoke: function (level, msgArgs) {
    			if (logHandler && this.enabledFor(level)) {
    				logHandler(msgArgs, merge({ level: level }, this.context));
    			}
    		}
    	};

    	// Protected instance which all calls to the to level `Logger` module will be routed through.
    	var globalLogger = new ContextualLogger({ filterLevel: Logger.OFF });

    	// Configure the global Logger instance.
    	(function() {
    		// Shortcut for optimisers.
    		var L = Logger;

    		L.enabledFor = bind(globalLogger, globalLogger.enabledFor);
    		L.trace = bind(globalLogger, globalLogger.trace);
    		L.debug = bind(globalLogger, globalLogger.debug);
    		L.time = bind(globalLogger, globalLogger.time);
    		L.timeEnd = bind(globalLogger, globalLogger.timeEnd);
    		L.info = bind(globalLogger, globalLogger.info);
    		L.warn = bind(globalLogger, globalLogger.warn);
    		L.error = bind(globalLogger, globalLogger.error);

    		// Don't forget the convenience alias!
    		L.log = L.info;
    	}());

    	// Set the global logging handler.  The supplied function should expect two arguments, the first being an arguments
    	// object with the supplied log messages and the second being a context object which contains a hash of stateful
    	// parameters which the logging function can consume.
    	Logger.setHandler = function (func) {
    		logHandler = func;
    	};

    	// Sets the global logging filter level which applies to *all* previously registered, and future Logger instances.
    	// (note that named loggers (retrieved via `Logger.get`) can be configured independently if required).
    	Logger.setLevel = function(level) {
    		// Set the globalLogger's level.
    		globalLogger.setLevel(level);

    		// Apply this level to all registered contextual loggers.
    		for (var key in contextualLoggersByNameMap) {
    			if (contextualLoggersByNameMap.hasOwnProperty(key)) {
    				contextualLoggersByNameMap[key].setLevel(level);
    			}
    		}
    	};

    	// Gets the global logging filter level
    	Logger.getLevel = function() {
    		return globalLogger.getLevel();
    	};

    	// Retrieve a ContextualLogger instance.  Note that named loggers automatically inherit the global logger's level,
    	// default context and log handler.
    	Logger.get = function (name) {
    		// All logger instances are cached so they can be configured ahead of use.
    		return contextualLoggersByNameMap[name] ||
    			(contextualLoggersByNameMap[name] = new ContextualLogger(merge({ name: name }, globalLogger.context)));
    	};

    	// CreateDefaultHandler returns a handler function which can be passed to `Logger.setHandler()` which will
    	// write to the window's console object (if present); the optional options object can be used to customise the
    	// formatter used to format each log message.
    	Logger.createDefaultHandler = function (options) {
    		options = options || {};

    		options.formatter = options.formatter || function defaultMessageFormatter(messages, context) {
    			// Prepend the logger's name to the log message for easy identification.
    			if (context.name) {
    				messages.unshift("[" + context.name + "]");
    			}
    		};

    		// Map of timestamps by timer labels used to track `#time` and `#timeEnd()` invocations in environments
    		// that don't offer a native console method.
    		var timerStartTimeByLabelMap = {};

    		// Support for IE8+ (and other, slightly more sane environments)
    		var invokeConsoleMethod = function (hdlr, messages) {
    			Function.prototype.apply.call(hdlr, console, messages);
    		};

    		// Check for the presence of a logger.
    		if (typeof console === "undefined") {
    			return function () { /* no console */ };
    		}

    		return function(messages, context) {
    			// Convert arguments object to Array.
    			messages = Array.prototype.slice.call(messages);

    			var hdlr = console.log;
    			var timerLabel;

    			if (context.level === Logger.TIME) {
    				timerLabel = (context.name ? '[' + context.name + '] ' : '') + messages[0];

    				if (messages[1] === 'start') {
    					if (console.time) {
    						console.time(timerLabel);
    					}
    					else {
    						timerStartTimeByLabelMap[timerLabel] = new Date().getTime();
    					}
    				}
    				else {
    					if (console.timeEnd) {
    						console.timeEnd(timerLabel);
    					}
    					else {
    						invokeConsoleMethod(hdlr, [ timerLabel + ': ' +
    							(new Date().getTime() - timerStartTimeByLabelMap[timerLabel]) + 'ms' ]);
    					}
    				}
    			}
    			else {
    				// Delegate through to custom warn/error loggers if present on the console.
    				if (context.level === Logger.WARN && console.warn) {
    					hdlr = console.warn;
    				} else if (context.level === Logger.ERROR && console.error) {
    					hdlr = console.error;
    				} else if (context.level === Logger.INFO && console.info) {
    					hdlr = console.info;
    				} else if (context.level === Logger.DEBUG && console.debug) {
    					hdlr = console.debug;
    				} else if (context.level === Logger.TRACE && console.trace) {
    					hdlr = console.trace;
    				}

    				options.formatter(messages, context);
    				invokeConsoleMethod(hdlr, messages);
    			}
    		};
    	};

    	// Configure and example a Default implementation which writes to the `window.console` (if present).  The
    	// `options` hash can be used to configure the default logLevel and provide a custom message formatter.
    	Logger.useDefaults = function(options) {
    		Logger.setLevel(options && options.defaultLevel || Logger.DEBUG);
    		Logger.setHandler(Logger.createDefaultHandler(options));
    	};

    	// Createa an alias to useDefaults to avoid reaking a react-hooks rule.
    	Logger.setDefaults = Logger.useDefaults;

    	// Export to popular environments boilerplate.
    	if (module.exports) {
    		module.exports = Logger;
    	}
    	else {
    		Logger._prevLogger = global.Logger;

    		Logger.noConflict = function () {
    			global.Logger = Logger._prevLogger;
    			return Logger;
    		};

    		global.Logger = Logger;
    	}
    }(commonjsGlobal));
    }(logger));

    var Logger = logger.exports;

    Logger.useDefaults({
        defaultLevel: Logger.DEBUG,
        formatter: (messages, context) => {
            messages.unshift(`[${context.name}] `);
        },
    });

    var MediaFamily;
    (function (MediaFamily) {
        MediaFamily["Audio"] = "AUDIO";
        MediaFamily["Video"] = "VIDEO";
    })(MediaFamily || (MediaFamily = {}));
    var MediaContent;
    (function (MediaContent) {
        MediaContent["Main"] = "MAIN";
        MediaContent["Slides"] = "SLIDES";
    })(MediaContent || (MediaContent = {}));
    var Policy;
    (function (Policy) {
        Policy["ActiveSpeaker"] = "active-speaker";
        Policy["ReceiverSelected"] = "receiver-selected";
    })(Policy || (Policy = {}));
    var MediaType;
    (function (MediaType) {
        MediaType["VideoMain"] = "VIDEO-MAIN";
        MediaType["VideoSlides"] = "VIDEO-SLIDES";
        MediaType["AudioMain"] = "AUDIO-MAIN";
        MediaType["AudioSlides"] = "AUDIO-SLIDES";
    })(MediaType || (MediaType = {}));

    var JmpMsgType;
    (function (JmpMsgType) {
        JmpMsgType["MediaRequest"] = "mediaRequest";
        JmpMsgType["MediaRequestAck"] = "mediaRequestAck";
        JmpMsgType["MediaRequestStatus"] = "mediaRequestStatus";
        JmpMsgType["MediaRequestStatusAck"] = "mediaRequestStatusAck";
        JmpMsgType["SourceAdvertisement"] = "sourceAdvertisement";
        JmpMsgType["SourceAdvertisementAck"] = "sourceAdvertisementAck";
        JmpMsgType["ActiveSpeakerNotification"] = "activeSpeakerNotification";
    })(JmpMsgType || (JmpMsgType = {}));

    var JmpSessionEvents;
    (function (JmpSessionEvents) {
        JmpSessionEvents["ActiveSpeaker"] = "active-speaker";
        JmpSessionEvents["MediaRequestReceived"] = "media-request-received";
        JmpSessionEvents["MediaRequestStatusReceived"] = "media-request-status-received";
        JmpSessionEvents["SourceAdvertisementReceived"] = "source-advertisement-received";
    })(JmpSessionEvents || (JmpSessionEvents = {}));

    var EncodedTransformType;
    (function (EncodedTransformType) {
        EncodedTransformType["AudioLevelMonitor"] = "audio-level-monitor";
    })(EncodedTransformType || (EncodedTransformType = {}));
    var MainMsgType;
    (function (MainMsgType) {
        MainMsgType["GetMetadata"] = "get-metadata";
        MainMsgType["ClearMetadata"] = "clear-metadata";
    })(MainMsgType || (MainMsgType = {}));
    var WorkerMsgType;
    (function (WorkerMsgType) {
        WorkerMsgType["Response"] = "response";
        WorkerMsgType["Log"] = "log";
    })(WorkerMsgType || (WorkerMsgType = {}));

    const workerLogger = {
        info: (...args) => {
            postMessage({ type: WorkerMsgType.Log, level: 'info', messageArgs: args });
        },
        warn: (...args) => {
            postMessage({ type: WorkerMsgType.Log, level: 'warn', messageArgs: args });
        },
        error: (...args) => {
            postMessage({ type: WorkerMsgType.Log, level: 'error', messageArgs: args });
        },
    };
    const collectedMetadata = {};
    const createAudioLevelMonitorTransform = (multistreamConnectionId, encodedTransformId) => {
        if (!(multistreamConnectionId in collectedMetadata)) {
            collectedMetadata[multistreamConnectionId] = {
                [MediaType.AudioMain]: {},
                [MediaType.AudioSlides]: {},
                [MediaType.VideoMain]: {},
                [MediaType.VideoSlides]: {},
            };
        }
        collectedMetadata[multistreamConnectionId][MediaType.AudioMain][encodedTransformId] = {
            maxAudioLevel: undefined,
        };
        const collectedStreamMetadata = collectedMetadata[multistreamConnectionId][MediaType.AudioMain][encodedTransformId];
        workerLogger.info(`creating encoded transform for ${multistreamConnectionId}:${encodedTransformId}`);
        return new TransformStream({
            transform: (encodedFrame, controller) => {
                const metadata = encodedFrame.getMetadata();
                if (!collectedStreamMetadata.maxAudioLevel ||
                    metadata.audioLevel > collectedStreamMetadata.maxAudioLevel) {
                    collectedStreamMetadata.maxAudioLevel = metadata.audioLevel;
                }
                controller.enqueue(encodedFrame);
            },
        });
    };
    addEventListener('rtctransform', (event) => {
        let transform;
        if (!event.transformer.options || !event.transformer.options.type) {
            workerLogger.warn('missing or invalid transformer options=', event.transformer.options);
            return;
        }
        const options = event.transformer.options;
        const { encodedTransformId, multistreamConnectionId, type } = options;
        switch (type) {
            case EncodedTransformType.AudioLevelMonitor:
                transform = createAudioLevelMonitorTransform(multistreamConnectionId, encodedTransformId);
                break;
            default:
                workerLogger.warn('unexpected transformer type=', type);
        }
        if (transform) {
            event.transformer.readable.pipeThrough(transform).pipeTo(event.transformer.writable);
        }
    });
    addEventListener('message', (event) => {
        var _a, _b;
        const { requestId } = event.data;
        const { type } = event.data.payload;
        let responseData;
        switch (type) {
            case MainMsgType.GetMetadata: {
                const { multistreamConnectionId, mediaType, encodedTransformId } = event.data.payload;
                responseData = (_b = (_a = collectedMetadata[multistreamConnectionId]) === null || _a === void 0 ? void 0 : _a[mediaType]) === null || _b === void 0 ? void 0 : _b[encodedTransformId];
                break;
            }
            case MainMsgType.ClearMetadata: {
                const { multistreamConnectionId } = event.data.payload;
                delete collectedMetadata[multistreamConnectionId];
                break;
            }
            default:
                workerLogger.warn('unexpected message type=', type);
                break;
        }
        postMessage({
            type: WorkerMsgType.Response,
            requestId,
            responseData,
        });
    });
    workerLogger.info('Worker fully started.');

})();

', null, false);
|
|
15664
15655
|
/* eslint-enable */
|
|
15665
15656
|
|
|
@@ -15739,7 +15730,7 @@ function getWorkerManager() {
|
|
|
15739
15730
|
return WorkerManager.workerManagerInstance;
|
|
15740
15731
|
}
|
|
15741
15732
|
|
|
15742
|
-
function
|
|
15733
|
+
function mediaTypeToTrackKind(mediaType) {
|
|
15743
15734
|
return [exports.MediaType.VideoMain, exports.MediaType.VideoSlides].includes(mediaType)
|
|
15744
15735
|
? exports.MediaStreamTrackKind.Video
|
|
15745
15736
|
: exports.MediaStreamTrackKind.Audio;
|
|
@@ -15809,9 +15800,10 @@ class MultistreamConnection extends EventEmitter$2 {
|
|
|
15809
15800
|
const slidesSceneId = generateSceneId();
|
|
15810
15801
|
const videoMainEncodingOptions = this.getVideoEncodingOptions(exports.MediaContent.Main);
|
|
15811
15802
|
const videoSlidesEncodingOptions = this.getVideoEncodingOptions(exports.MediaContent.Slides);
|
|
15812
|
-
this.
|
|
15803
|
+
const sendVideoCodecParams = this.getCustomSendVideoCodecParams();
|
|
15804
|
+
this.createSendTransceiver(exports.MediaType.VideoMain, mainSceneId, videoMainEncodingOptions, sendVideoCodecParams);
|
|
15813
15805
|
this.createSendTransceiver(exports.MediaType.AudioMain, mainSceneId);
|
|
15814
|
-
this.createSendTransceiver(exports.MediaType.VideoSlides, slidesSceneId, videoSlidesEncodingOptions);
|
|
15806
|
+
this.createSendTransceiver(exports.MediaType.VideoSlides, slidesSceneId, videoSlidesEncodingOptions, sendVideoCodecParams);
|
|
15815
15807
|
this.createSendTransceiver(exports.MediaType.AudioSlides, slidesSceneId);
|
|
15816
15808
|
}
|
|
15817
15809
|
startWorkerIfNeeded() {
|
|
@@ -15889,10 +15881,29 @@ class MultistreamConnection extends EventEmitter$2 {
|
|
|
15889
15881
|
]
|
|
15890
15882
|
: [{ active: false }];
|
|
15891
15883
|
}
|
|
15892
|
-
|
|
15884
|
+
getCustomSendVideoCodecParams() {
|
|
15885
|
+
return {
|
|
15886
|
+
[exports.MediaCodecMimeType.H264]: {
|
|
15887
|
+
'x-google-start-bitrate': `${this.options.preferredStartingBitrateKbps}`,
|
|
15888
|
+
'max-mbps': `${defaultMaxVideoEncodeMbps}`,
|
|
15889
|
+
'max-fs': `${defaultMaxVideoEncodeFrameSize}`,
|
|
15890
|
+
},
|
|
15891
|
+
};
|
|
15892
|
+
}
|
|
15893
|
+
getCustomReceiveVideoCodecParams(mediaType) {
|
|
15894
|
+
return {
|
|
15895
|
+
[exports.MediaCodecMimeType.H264]: {
|
|
15896
|
+
'sps-pps-idr-in-keyframe': '1',
|
|
15897
|
+
},
|
|
15898
|
+
[exports.MediaCodecMimeType.RTX]: {
|
|
15899
|
+
'rtx-time': mediaType === exports.MediaType.VideoMain ? defaultVideoMainRtxTime : defaultVideoSlidesRtxTime,
|
|
15900
|
+
},
|
|
15901
|
+
};
|
|
15902
|
+
}
|
|
15903
|
+
createSendTransceiver(mediaType, sceneId, sendEncodingsOptions, codecParams) {
|
|
15893
15904
|
let rtcRtpTransceiver;
|
|
15894
15905
|
try {
|
|
15895
|
-
rtcRtpTransceiver = this.pc.addTransceiver(
|
|
15906
|
+
rtcRtpTransceiver = this.pc.addTransceiver(mediaTypeToTrackKind(mediaType), {
|
|
15896
15907
|
direction: 'sendrecv',
|
|
15897
15908
|
sendEncodings: sendEncodingsOptions,
|
|
15898
15909
|
});
|
|
@@ -15911,14 +15922,12 @@ class MultistreamConnection extends EventEmitter$2 {
|
|
|
15911
15922
|
munger,
|
|
15912
15923
|
csi,
|
|
15913
15924
|
});
|
|
15914
|
-
let codecParameters = {
|
|
15915
|
-
'x-google-start-bitrate': `${this.options.preferredStartingBitrateKbps}`,
|
|
15916
|
-
};
|
|
15917
15925
|
if (getMediaFamily(mediaType) === exports.MediaFamily.Video) {
|
|
15918
15926
|
transceiver.rtxEnabled = true;
|
|
15919
|
-
codecParameters = Object.assign(Object.assign({}, codecParameters), { 'max-mbps': `${defaultMaxVideoEncodeMbps}`, 'max-fs': `${defaultMaxVideoEncodeFrameSize}` });
|
|
15920
15927
|
}
|
|
15921
|
-
|
|
15928
|
+
Object.entries(codecParams !== null && codecParams !== void 0 ? codecParams : {}).forEach(([codec, params]) => {
|
|
15929
|
+
transceiver.setCustomCodecParameters(codec, params);
|
|
15930
|
+
});
|
|
15922
15931
|
transceiver.twccDisabled =
|
|
15923
15932
|
getMediaFamily(mediaType) === exports.MediaFamily.Audio ? this.options.disableAudioTwcc : false;
|
|
15924
15933
|
transceiver.dtxDisabled = mediaType !== exports.MediaType.AudioMain || this.options.disableAudioMainDtx;
|
|
@@ -16219,8 +16228,8 @@ SCTP Max Message Size: ${maxMessageSize}`);
|
|
|
16219
16228
|
static getEncodedTransformId(mediaType, mid) {
|
|
16220
16229
|
return `INBOUND-${mediaType}-${mid}`;
|
|
16221
16230
|
}
|
|
16222
|
-
createReceiveTransceiver(mediaType) {
|
|
16223
|
-
const rtcRtpTransceiver = this.pc.addTransceiver(
|
|
16231
|
+
createReceiveTransceiver(mediaType, codecParams) {
|
|
16232
|
+
const rtcRtpTransceiver = this.pc.addTransceiver(mediaTypeToTrackKind(mediaType), {
|
|
16224
16233
|
direction: 'recvonly',
|
|
16225
16234
|
});
|
|
16226
16235
|
const mid = this.midPredictor.getNextMid(mediaType);
|
|
@@ -16248,14 +16257,9 @@ SCTP Max Message Size: ${maxMessageSize}`);
|
|
|
16248
16257
|
logger.warn(`Failed to setup encoded transform for audio level monitoring of mid=${mid}: ${e}`);
|
|
16249
16258
|
}
|
|
16250
16259
|
}
|
|
16251
|
-
|
|
16252
|
-
recvOnlyTransceiver.
|
|
16253
|
-
|
|
16254
|
-
});
|
|
16255
|
-
recvOnlyTransceiver.setRtxCodecParameters({
|
|
16256
|
-
'rtx-time': mediaType === exports.MediaType.VideoMain ? defaultVideoMainRtxTime : defaultVideoSlidesRtxTime,
|
|
16257
|
-
});
|
|
16258
|
-
}
|
|
16260
|
+
Object.entries(codecParams !== null && codecParams !== void 0 ? codecParams : {}).forEach(([codec, params]) => {
|
|
16261
|
+
recvOnlyTransceiver.setCustomCodecParameters(codec, params);
|
|
16262
|
+
});
|
|
16259
16263
|
recvOnlyTransceiver.twccDisabled =
|
|
16260
16264
|
getMediaFamily(mediaType) === exports.MediaFamily.Audio ? this.options.disableAudioTwcc : false;
|
|
16261
16265
|
this.recvTransceivers.set(mediaType, [
|
|
@@ -16274,8 +16278,11 @@ SCTP Max Message Size: ${maxMessageSize}`);
|
|
|
16274
16278
|
return new Promise((createReceiveSlotsResolve) => {
|
|
16275
16279
|
this.offerAnswerQueue.push(() => __awaiter(this, void 0, void 0, function* () {
|
|
16276
16280
|
const createdReceiveOnlyTransceivers = [];
|
|
16281
|
+
const codecParams = mediaTypeToTrackKind(mediaType) === exports.MediaStreamTrackKind.Video
|
|
16282
|
+
? this.getCustomReceiveVideoCodecParams(mediaType)
|
|
16283
|
+
: undefined;
|
|
16277
16284
|
for (let i = 0; i < count; i++) {
|
|
16278
|
-
const recvOnlyTransceiver = this.createReceiveTransceiver(mediaType);
|
|
16285
|
+
const recvOnlyTransceiver = this.createReceiveTransceiver(mediaType, codecParams);
|
|
16279
16286
|
createdReceiveOnlyTransceivers.push(recvOnlyTransceiver);
|
|
16280
16287
|
}
|
|
16281
16288
|
if (this.pc.getRemoteDescription()) {
|
|
@@ -16652,7 +16659,7 @@ SCTP Max Message Size: ${maxMessageSize}`);
|
|
|
16652
16659
|
const mediaContent = getMediaContent(mediaType);
|
|
16653
16660
|
const sceneId = mediaContent === exports.MediaContent.Main ? mainSceneId : slidesSceneId;
|
|
16654
16661
|
const mid = this.midPredictor.getNextMid(mediaType);
|
|
16655
|
-
transceiver.replaceTransceiver(this.pc.addTransceiver(
|
|
16662
|
+
transceiver.replaceTransceiver(this.pc.addTransceiver(mediaTypeToTrackKind(mediaType), {
|
|
16656
16663
|
direction: 'sendrecv',
|
|
16657
16664
|
sendEncodings: getMediaFamily(mediaType) === exports.MediaFamily.Video
|
|
16658
16665
|
? this.getVideoEncodingOptions(mediaContent)
|
|
@@ -16667,7 +16674,7 @@ SCTP Max Message Size: ${maxMessageSize}`);
|
|
|
16667
16674
|
this.recvTransceivers.forEach((transceivers, mediaType) => {
|
|
16668
16675
|
transceivers.forEach((t) => {
|
|
16669
16676
|
const mid = this.midPredictor.getNextMid(mediaType);
|
|
16670
|
-
const rtcRtpTransceiver = this.pc.addTransceiver(
|
|
16677
|
+
const rtcRtpTransceiver = this.pc.addTransceiver(mediaTypeToTrackKind(mediaType), {
|
|
16671
16678
|
direction: 'recvonly',
|
|
16672
16679
|
});
|
|
16673
16680
|
t.replaceTransceiver(rtcRtpTransceiver);
|