mediasoup-client - npm Package Compare versions

Comparing version 0.6.1 to 0.6.2

lib/handlers/Chrome55.js

@@ -5,2 +5,3 @@ import sdpTransform from 'sdp-transform';
 import * as utils from '../utils';
+import * as ortc from '../ortc';
 import * as sdpCommonUtils from './sdp/commonUtils';
@@ -560,4 +561,4 @@ import * as sdpPlanBUtils from './sdp/planBUtils';
 				{
-					audio : utils.getSendingRtpParameters('audio', extendedRtpCapabilities),
-					video : utils.getSendingRtpParameters('video', extendedRtpCapabilities)
+					audio : ortc.getSendingRtpParameters('audio', extendedRtpCapabilities),
+					video : ortc.getSendingRtpParameters('video', extendedRtpCapabilities)
 				};
@@ -571,4 +572,4 @@
 				{
-					audio : utils.getReceivingFullRtpParameters('audio', extendedRtpCapabilities),
-					video : utils.getReceivingFullRtpParameters('video', extendedRtpCapabilities)
+					audio : ortc.getReceivingFullRtpParameters('audio', extendedRtpCapabilities),
+					video : ortc.getReceivingFullRtpParameters('video', extendedRtpCapabilities)
 				};
@@ -575,0 +576,0 @@

lib/handlers/Edge11.js

@@ -6,2 +6,3 @@ /* global RTCIceGatherer, RTCIceTransport, RTCDtlsTransport, RTCRtpReceiver, RTCRtpSender */
 import * as utils from '../utils';
+import * as ortc from '../ortc';
 import * as edgeUtils from './ortc/edgeUtils';
@@ -39,4 +40,4 @@
 		{
-			audio : utils.getSendingRtpParameters('audio', extendedRtpCapabilities),
-			video : utils.getSendingRtpParameters('video', extendedRtpCapabilities)
+			audio : ortc.getSendingRtpParameters('audio', extendedRtpCapabilities),
+			video : ortc.getSendingRtpParameters('video', extendedRtpCapabilities)
 		};
@@ -43,0 +44,0 @@

lib/handlers/Firefox50.js

@@ -5,2 +5,3 @@ import sdpTransform from 'sdp-transform';
 import * as utils from '../utils';
+import * as ortc from '../ortc';
 import * as sdpCommonUtils from './sdp/commonUtils';
@@ -545,4 +546,4 @@ import * as sdpUnifiedPlanUtils from './sdp/unifiedPlanUtils';
 				{
-					audio : utils.getSendingRtpParameters('audio', extendedRtpCapabilities),
-					video : utils.getSendingRtpParameters('video', extendedRtpCapabilities)
+					audio : ortc.getSendingRtpParameters('audio', extendedRtpCapabilities),
+					video : ortc.getSendingRtpParameters('video', extendedRtpCapabilities)
 				};
@@ -556,4 +557,4 @@
 				{
-					audio : utils.getReceivingFullRtpParameters('audio', extendedRtpCapabilities),
-					video : utils.getReceivingFullRtpParameters('video', extendedRtpCapabilities)
+					audio : ortc.getReceivingFullRtpParameters('audio', extendedRtpCapabilities),
+					video : ortc.getReceivingFullRtpParameters('video', extendedRtpCapabilities)
 				};
@@ -560,0 +561,0 @@

lib/handlers/Safari11.js

@@ -5,2 +5,3 @@ import sdpTransform from 'sdp-transform';
 import * as utils from '../utils';
+import * as ortc from '../ortc';
 import * as sdpCommonUtils from './sdp/commonUtils';
@@ -547,4 +548,4 @@ import * as sdpPlanBUtils from './sdp/planBUtils';
 				{
-					audio : utils.getSendingRtpParameters('audio', extendedRtpCapabilities),
-					video : utils.getSendingRtpParameters('video', extendedRtpCapabilities)
+					audio : ortc.getSendingRtpParameters('audio', extendedRtpCapabilities),
+					video : ortc.getSendingRtpParameters('video', extendedRtpCapabilities)
 				};
@@ -558,4 +559,4 @@
 				{
-					audio : utils.getReceivingFullRtpParameters('audio', extendedRtpCapabilities),
-					video : utils.getReceivingFullRtpParameters('video', extendedRtpCapabilities)
+					audio : ortc.getReceivingFullRtpParameters('audio', extendedRtpCapabilities),
+					video : ortc.getReceivingFullRtpParameters('video', extendedRtpCapabilities)
 				};
@@ -562,0 +563,0 @@

lib/Room.js

 import Logger from './Logger';
 import EnhancedEventEmitter from './EnhancedEventEmitter';
 import { InvalidStateError, TimeoutError, UnsupportedError } from './errors';
-import * as utils from './utils';
+import * as ortc from './ortc';
 import Device from './Device';
@@ -253,3 +253,3 @@ import Transport from './Transport';
 				// Get extended RTP capabilities.
-				this._extendedRtpCapabilities = utils.getExtendedRtpCapabilities(
+				this._extendedRtpCapabilities = ortc.getExtendedRtpCapabilities(
 					nativeRtpCapabilities, roomSettings.rtpCapabilities);
@@ -261,3 +261,3 @@
 				// Check unsupported codecs.
-				const unsupportedRoomCodecs = utils.getUnsupportedCodecs(
+				const unsupportedRoomCodecs = ortc.getUnsupportedCodecs(
 					roomSettings.rtpCapabilities,
@@ -280,9 +280,9 @@ roomSettings.mandatoryCodecPayloadTypes,
 				this._canSendByKind.audio =
-					utils.canSend('audio', this._extendedRtpCapabilities);
+					ortc.canSend('audio', this._extendedRtpCapabilities);
 				this._canSendByKind.video =
-					utils.canSend('video', this._extendedRtpCapabilities);
+					ortc.canSend('video', this._extendedRtpCapabilities);
 
 				// Generate our effective RTP capabilities for receiving media.
 				const effectiveLocalRtpCapabilities =
-					utils.getRtpCapabilities(this._extendedRtpCapabilities);
+					ortc.getRtpCapabilities(this._extendedRtpCapabilities);
 
@@ -859,3 +859,3 @@ logger.debug(
 		const supported =
-			utils.canReceive(consumer.rtpParameters, this._extendedRtpCapabilities);
+			ortc.canReceive(consumer.rtpParameters, this._extendedRtpCapabilities);
 
@@ -862,0 +862,0 @@ if (supported)

lib/utils.js

@@ -31,447 +31,1 @@ import randomNumberLib from 'random-number';
 }
-
-/**
- * Generate extended RTP capabilities for sending and receiving.
- *
- * @param {RTCRtpCapabilities} localCaps - Local capabilities.
- * @param {RTCRtpCapabilities} remoteCaps - Remote capabilities.
- *
- * @return {RTCExtendedRtpCapabilities}
- */
-export function getExtendedRtpCapabilities(localCaps, remoteCaps)
-{
-	const extendedCaps =
-	{
-		codecs           : [],
-		headerExtensions : [],
-		fecMechanisms    : []
-	};
-
-	// Match media codecs and keep the order preferred by remoteCaps.
-	for (const remoteCodec of remoteCaps.codecs || [])
-	{
-		// TODO: Ignore pseudo-codecs and feature codecs.
-		if (remoteCodec.name === 'rtx')
-			continue;
-
-		const matchingLocalCodec = (localCaps.codecs || [])
-			.find((localCodec) => matchCodecs(localCodec, remoteCodec));
-
-		if (matchingLocalCodec)
-		{
-			const extendedCodec =
-			{
-				name               : remoteCodec.name,
-				mimeType           : remoteCodec.mimeType,
-				kind               : remoteCodec.kind,
-				clockRate          : remoteCodec.clockRate,
-				sendPayloadType    : matchingLocalCodec.preferredPayloadType,
-				sendRtxPayloadType : null,
-				recvPayloadType    : remoteCodec.preferredPayloadType,
-				recvRtxPayloadType : null,
-				channels           : remoteCodec.channels,
-				rtcpFeedback       : reduceRtcpFeedback(matchingLocalCodec, remoteCodec),
-				parameters         : remoteCodec.parameters
-			};
-
-			if (!extendedCodec.channels)
-				delete extendedCodec.channels;
-
-			extendedCaps.codecs.push(extendedCodec);
-		}
-	}
-
-	// Match RTX codecs.
-	for (const extendedCodec of extendedCaps.codecs || [])
-	{
-		const matchingLocalRtxCodec = (localCaps.codecs || [])
-			.find((localCodec) =>
-			{
-				return (
-					localCodec.name === 'rtx' &&
-					localCodec.parameters.apt === extendedCodec.sendPayloadType
-				);
-			});
-
-		const matchingRemoteRtxCodec = (remoteCaps.codecs || [])
-			.find((remoteCodec) =>
-			{
-				return (
-					remoteCodec.name === 'rtx' &&
-					remoteCodec.parameters.apt === extendedCodec.recvPayloadType
-				);
-			});
-
-		if (matchingLocalRtxCodec && matchingRemoteRtxCodec)
-		{
-			extendedCodec.sendRtxPayloadType = matchingLocalRtxCodec.preferredPayloadType;
-			extendedCodec.recvRtxPayloadType = matchingRemoteRtxCodec.preferredPayloadType;
-		}
-	}
-
-	// Match header extensions.
-	for (const remoteExt of remoteCaps.headerExtensions || [])
-	{
-		const matchingLocalExt = (localCaps.headerExtensions || [])
-			.find((localExt) => matchHeaderExtensions(localExt, remoteExt));
-
-		if (matchingLocalExt)
-		{
-			const extendedExt =
-			{
-				kind   : remoteExt.kind,
-				uri    : remoteExt.uri,
-				sendId : matchingLocalExt.preferredId,
-				recvId : remoteExt.preferredId
-			};
-
-			extendedCaps.headerExtensions.push(extendedExt);
-		}
-	}
-
-	return extendedCaps;
-}
-
-/**
- * Generate RTP capabilities for receiving media based on the given extended
- * RTP capabilities.
- *
- * @param {RTCExtendedRtpCapabilities} extendedRtpCapabilities
- *
- * @return {RTCRtpCapabilities}
- */
-export function getRtpCapabilities(extendedRtpCapabilities)
-{
-	const caps =
-	{
-		codecs           : [],
-		headerExtensions : [],
-		fecMechanisms    : []
-	};
-
-	for (const capCodec of extendedRtpCapabilities.codecs)
-	{
-		const codec =
-		{
-			name                 : capCodec.name,
-			mimeType             : capCodec.mimeType,
-			kind                 : capCodec.kind,
-			clockRate            : capCodec.clockRate,
-			preferredPayloadType : capCodec.recvPayloadType,
-			channels             : capCodec.channels,
-			rtcpFeedback         : capCodec.rtcpFeedback,
-			parameters           : capCodec.parameters
-		};
-
-		if (!codec.channels)
-			delete codec.channels;
-
-		caps.codecs.push(codec);
-
-		// Add RTX codec.
-		if (capCodec.recvRtxPayloadType)
-		{
-			const rtxCapCodec =
-			{
-				name                 : 'rtx',
-				mimeType             : `${capCodec.kind}/rtx`,
-				kind                 : capCodec.kind,
-				clockRate            : capCodec.clockRate,
-				preferredPayloadType : capCodec.recvRtxPayloadType,
-				parameters           :
-				{
-					apt : capCodec.recvPayloadType
-				}
-			};
-
-			caps.codecs.push(rtxCapCodec);
-		}
-
-		// TODO: In the future, we need to add FEC, CN, etc, codecs.
-	}
-
-	for (const capExt of extendedRtpCapabilities.headerExtensions)
-	{
-		const ext =
-		{
-			kind        : capExt.kind,
-			uri         : capExt.uri,
-			preferredId : capExt.recvId
-		};
-
-		caps.headerExtensions.push(ext);
-	}
-
-	caps.fecMechanisms = extendedRtpCapabilities.fecMechanisms;
-
-	return caps;
-}
-
-/**
- * Get unsupported remote codecs.
- *
- * @param {RTCRtpCapabilities} remoteCaps - Remote capabilities.
- * @param {Array<Number>} mandatoryCodecPayloadTypes - List of codec PT values.
- * @param {RTCExtendedRtpCapabilities} extendedRtpCapabilities
- *
- * @return {Boolean}
- */
-export function getUnsupportedCodecs(
-	remoteCaps, mandatoryCodecPayloadTypes, extendedRtpCapabilities)
-{
-	// If not given just ignore.
-	if (!Array.isArray(mandatoryCodecPayloadTypes))
-		return [];
-
-	const unsupportedCodecs = [];
-	const remoteCodecs = remoteCaps.codecs;
-	const supportedCodecs = extendedRtpCapabilities.codecs;
-
-	for (const pt of mandatoryCodecPayloadTypes)
-	{
-		if (!supportedCodecs.some((codec) => codec.recvPayloadType === pt))
-		{
-			const unsupportedCodec = remoteCodecs
-				.find((codec) => codec.preferredPayloadType === pt);
-
-			if (!unsupportedCodec)
-				throw new Error(`mandatory codec PT ${pt} not found in remote codecs`);
-
-			unsupportedCodecs.push(unsupportedCodec);
-		}
-	}
-
-	return unsupportedCodecs;
-}
-
-/**
- * Whether media can be sent based on the given RTP capabilities.
- *
- * @param {String} kind
- * @param {RTCExtendedRtpCapabilities} extendedRtpCapabilities
- *
- * @return {Boolean}
- */
-export function canSend(kind, extendedRtpCapabilities)
-{
-	return extendedRtpCapabilities.codecs.
-		some((codec) => codec.kind === kind);
-}
-
-/**
- * Whether the given RTP parameters can be received with the given RTP
- * capabilities.
- *
- * @param {RTCRtpParameters} rtpParameters
- * @param {RTCExtendedRtpCapabilities} extendedRtpCapabilities
- *
- * @return {Boolean}
- */
-export function canReceive(rtpParameters, extendedRtpCapabilities)
-{
-	const firstMediaCodec = rtpParameters.codecs[0];
-
-	return extendedRtpCapabilities.codecs
-		.some((codec) => codec.recvPayloadType === firstMediaCodec.payloadType);
-}
-
-/**
- * Generate RTP parameters of the given kind for sending media.
- * Just the first media codec per kind is considered.
- * NOTE: muxId, encodings and rtcp fields are left empty.
- *
- * @param {kind} kind
- * @param {RTCExtendedRtpCapabilities} extendedRtpCapabilities
- *
- * @return {RTCRtpParameters}
- */
-export function getSendingRtpParameters(kind, extendedRtpCapabilities)
-{
-	const params =
-	{
-		muxId            : null,
-		codecs           : [],
-		headerExtensions : [],
-		encodings        : [],
-		rtcp             : {}
-	};
-
-	for (const capCodec of extendedRtpCapabilities.codecs)
-	{
-		if (capCodec.kind !== kind)
-			continue;
-
-		const codec =
-		{
-			name         : capCodec.name,
-			mimeType     : capCodec.mimeType,
-			clockRate    : capCodec.clockRate,
-			payloadType  : capCodec.sendPayloadType,
-			channels     : capCodec.channels,
-			rtcpFeedback : capCodec.rtcpFeedback,
-			parameters   : capCodec.parameters
-		};
-
-		if (!codec.channels)
-			delete codec.channels;
-
-		params.codecs.push(codec);
-
-		// Add RTX codec.
-		if (capCodec.sendRtxPayloadType)
-		{
-			const rtxCodec =
-			{
-				name        : 'rtx',
-				mimeType    : `${capCodec.kind}/rtx`,
-				clockRate   : capCodec.clockRate,
-				payloadType : capCodec.sendRtxPayloadType,
-				parameters  :
-				{
-					apt : capCodec.sendPayloadType
-				}
-			};
-
-			params.codecs.push(rtxCodec);
-		}
-
-		// NOTE: We assume a single media codec plus an optional RTX codec for now.
-		// TODO: In the future, we need to add FEC, CN, etc, codecs.
-		break;
-	}
-
-	for (const capExt of extendedRtpCapabilities.headerExtensions)
-	{
-		if (capExt.kind && capExt.kind !== kind)
-			continue;
-
-		const ext =
-		{
-			uri : capExt.uri,
-			id  : capExt.sendId
-		};
-
-		params.headerExtensions.push(ext);
-	}
-
-	return params;
-}
-
-/**
- * Generate RTP parameters of the given kind for receiving media.
- * All the media codecs per kind are considered. This is useful for generating
- * a SDP remote offer.
- * NOTE: muxId, encodings and rtcp fields are left empty.
- *
- * @param {String} kind
- * @param {RTCExtendedRtpCapabilities} extendedRtpCapabilities
- *
- * @return {RTCRtpParameters}
- */
-export function getReceivingFullRtpParameters(kind, extendedRtpCapabilities)
-{
-	const params =
-	{
-		muxId            : null,
-		codecs           : [],
-		headerExtensions : [],
-		encodings        : [],
-		rtcp             : {}
-	};
-
-	for (const capCodec of extendedRtpCapabilities.codecs)
-	{
-		if (capCodec.kind !== kind)
-			continue;
-
-		const codec =
-		{
-			name         : capCodec.name,
-			mimeType     : capCodec.mimeType,
-			clockRate    : capCodec.clockRate,
-			payloadType  : capCodec.recvPayloadType,
-			channels     : capCodec.channels,
-			rtcpFeedback : capCodec.rtcpFeedback,
-			parameters   : capCodec.parameters
-		};
-
-		if (!codec.channels)
-			delete codec.channels;
-
-		params.codecs.push(codec);
-
-		// Add RTX codec.
-		if (capCodec.recvRtxPayloadType)
-		{
-			const rtxCodec =
-			{
-				name        : 'rtx',
-				mimeType    : `${capCodec.kind}/rtx`,
-				clockRate   : capCodec.clockRate,
-				payloadType : capCodec.recvRtxPayloadType,
-				parameters  :
-				{
-					apt : capCodec.recvPayloadType
-				}
-			};
-
-			params.codecs.push(rtxCodec);
-		}
-
-		// TODO: In the future, we need to add FEC, CN, etc, codecs.
-	}
-
-	for (const capExt of extendedRtpCapabilities.headerExtensions)
-	{
-		if (capExt.kind && capExt.kind !== kind)
-			continue;
-
-		const ext =
-		{
-			uri : capExt.uri,
-			id  : capExt.recvId
-		};
-
-		params.headerExtensions.push(ext);
-	}
-
-	return params;
-}
-
-function matchCodecs(aCodec, bCodec)
-{
-	return (
-		aCodec.mimeType === bCodec.mimeType &&
-		aCodec.clockRate === bCodec.clockRate
-	);
-}
-
-function matchHeaderExtensions(aExt, bExt)
-{
-	return (
-		(aExt.kind === bExt.kind || !aExt.kind || !bExt.kind) &&
-		aExt.uri === bExt.uri
-	);
-}
-
-function reduceRtcpFeedback(codecA, codecB)
-{
-	const reducedRtcpFeedback = [];
-
-	for (const aFb of codecA.rtcpFeedback || [])
-	{
-		const matchingBFb = (codecB.rtcpFeedback || [])
-			.find((bFb) =>
-			{
-				return (
-					bFb.type === aFb.type &&
-					bFb.parameter === aFb.parameter
-				);
-			});
-
-		if (matchingBFb)
-			reducedRtcpFeedback.push(matchingBFb);
-	}
-
-	return reducedRtcpFeedback;
-}

package.json

 {
   "name": "mediasoup-client",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "mediasoup client SDK for mediasoup >= 2.0.0",
@@ -5,0 +5,0 @@ "author": "Iñaki Baz Castillo <[e-mail]> (https://inakibaz.me)",

No alert changes

Improved metrics

Total package byte prevSize

180639

increased by0.06%

Number of package files

36

increased by2.86%

Lines of code

6324

increased by0.06%

No dependency changes