mediasoup-client 3.6.46 → 3.6.50

package/src/handlers/Firefox60.ts

@@ -643,23 +643,34 @@ export class Firefox60 extends HandlerInterface
 	}
 
 	async receive(
-		{ trackId, kind, rtpParameters }: HandlerReceiveOptions
-	): Promise<HandlerReceiveResult>
+		// eslint-disable-next-line @typescript-eslint/no-unused-vars
+		optionsList: HandlerReceiveOptions[]
+	) : Promise<HandlerReceiveResult[]>
 	{
 		this._assertRecvDirection();
 
-		logger.debug('receive() [trackId:%s, kind:%s]', trackId, kind);
+		const results: HandlerReceiveResult[] = [];
+		const mapLocalId: Map<string, string> = new Map();
 
-		const localId = rtpParameters.mid || String(this._mapMidTransceiver.size);
+		for (const options of optionsList)
+		{
+			const { trackId, kind, rtpParameters } = options;
 
-		this._remoteSdp!.receive(
-			{
-				mid                : localId,
-				kind,
-				offerRtpParameters : rtpParameters,
-				streamId           : rtpParameters.rtcp!.cname!,
-				trackId
-			});
+			logger.debug('receive() [trackId:%s, kind:%s]', trackId, kind);
+
+			const localId = rtpParameters.mid || String(this._mapMidTransceiver.size);
+
+			mapLocalId.set(trackId, localId);
+
+			this._remoteSdp!.receive(
+				{
+					mid                : localId,
+					kind,
+					offerRtpParameters : rtpParameters,
+					streamId           : rtpParameters.rtcp!.cname!,
+					trackId
+				});
+		}
 
 		const offer = { type: 'offer', sdp: this._remoteSdp!.getSdp() };
 
@@ -671,18 +682,24 @@ export class Firefox60 extends HandlerInterface
 
 		let answer = await this._pc.createAnswer();
 		const localSdpObject = sdpTransform.parse(answer.sdp);
-		const answerMediaObject = localSdpObject.media
-			.find((m: any) => String(m.mid) === localId);
 
-		// May need to modify codec parameters in the answer based on codec
-		// parameters in the offer.
-		sdpCommonUtils.applyCodecParameters(
-			{
-				offerRtpParameters : rtpParameters,
-				answerMediaObject
-			});
+		for (const options of optionsList)
+		{
+			const { trackId, rtpParameters } = options;
+			const localId = mapLocalId.get(trackId);
+			const answerMediaObject = localSdpObject.media
+				.find((m: any) => String(m.mid) === localId);
+
+			// May need to modify codec parameters in the answer based on codec
+			// parameters in the offer.
+			sdpCommonUtils.applyCodecParameters(
+				{
+					offerRtpParameters : rtpParameters,
+					answerMediaObject
+				});
 
-		answer = { type: 'answer', sdp: sdpTransform.write(localSdpObject) };
+			answer = { type: 'answer', sdp: sdpTransform.write(localSdpObject) };
+		}
 
 		if (!this._transportReady)
 			await this._setupTransport({ localDtlsRole: 'client', localSdpObject });
@@ -693,20 +710,27 @@ export class Firefox60 extends HandlerInterface
 
 		await this._pc.setLocalDescription(answer);
 
-		const transceiver = this._pc.getTransceivers()
-			.find((t: RTCRtpTransceiver) => t.mid === localId);
+		for (const options of optionsList)
+		{
+			const { trackId } = options;
+			const localId = mapLocalId.get(trackId)!;
+			const transceiver = this._pc.getTransceivers()
+				.find((t: RTCRtpTransceiver) => t.mid === localId);
 
-		if (!transceiver)
-			throw new Error('new RTCRtpTransceiver not found');
+			if (!transceiver)
+				throw new Error('new RTCRtpTransceiver not found');
 
-		// Store in the map.
-		this._mapMidTransceiver.set(localId, transceiver);
+			// Store in the map.
+			this._mapMidTransceiver.set(localId, transceiver);
 
-		return {
-			localId,
-			track       : transceiver.receiver.track,
-			rtpReceiver : transceiver.receiver
-		};
+			results.push({
+				localId,
+				track       : transceiver.receiver.track,
+				rtpReceiver : transceiver.receiver
+			});
+		}
+
+		return results;
 	}
 
 	async stopReceiving(localId: string): Promise<void>

package/src/handlers/HandlerInterface.ts

@@ -136,8 +136,8 @@ export abstract class HandlerInterface extends EnhancedEventEmitter
 	): Promise<HandlerSendDataChannelResult>;
 
 	abstract receive(
-		options: HandlerReceiveOptions
-	): Promise<HandlerReceiveResult>;
+		optionsList: HandlerReceiveOptions[]
+	) : Promise<HandlerReceiveResult[]>
 
 	abstract stopReceiving(localId: string): Promise<void>;
 

package/src/handlers/ReactNative.ts

@@ -588,34 +588,43 @@ export class ReactNative extends HandlerInterface
 	}
 
 	async receive(
-		{ trackId, kind, rtpParameters }: HandlerReceiveOptions
-	): Promise<HandlerReceiveResult>
+		optionsList: HandlerReceiveOptions[]
+	) : Promise<HandlerReceiveResult[]>
 	{
 		this._assertRecvDirection();
 
-		logger.debug('receive() [trackId:%s, kind:%s]', trackId, kind);
+		const results: HandlerReceiveResult[] = [];
+		const mapStreamId: Map<string, string> = new Map();
 
-		const localId = trackId;
-		const mid = kind;
-		let streamId = rtpParameters.rtcp!.cname!;
+		for (const options of optionsList)
+		{
+			const { trackId, kind, rtpParameters } = options;
 
-		// NOTE: In React-Native we cannot reuse the same remote MediaStream for new
-		// remote tracks. This is because react-native-webrtc does not react on new
-		// tracks generated within already existing streams, so force the streamId
-		// to be different.
-		logger.debug(
-			'receive() | forcing a random remote streamId to avoid well known bug in react-native-webrtc');
+			logger.debug('receive() [trackId:%s, kind:%s]', trackId, kind);
 
-		streamId += `-hack-${utils.generateRandomNumber()}`;
+			const mid = kind;
+			let streamId = rtpParameters.rtcp!.cname!;
 
-		this._remoteSdp!.receive(
-			{
-				mid,
-				kind,
-				offerRtpParameters : rtpParameters,
-				streamId,
-				trackId
-			});
+			// NOTE: In React-Native we cannot reuse the same remote MediaStream for new
+			// remote tracks. This is because react-native-webrtc does not react on new
+			// tracks generated within already existing streams, so force the streamId
+			// to be different.
+			logger.debug(
+				'receive() | forcing a random remote streamId to avoid well known bug in react-native-webrtc');
+
+			streamId += `-hack-${utils.generateRandomNumber()}`;
+
+			mapStreamId.set(trackId, streamId);
+
+			this._remoteSdp!.receive(
+				{
+					mid,
+					kind,
+					offerRtpParameters : rtpParameters,
+					streamId,
+					trackId
+				});
+		}
 
 		const offer = { type: 'offer', sdp: this._remoteSdp!.getSdp() };
 
@@ -627,16 +636,22 @@ export class ReactNative extends HandlerInterface
 
 		let answer = await this._pc.createAnswer();
 		const localSdpObject = sdpTransform.parse(answer.sdp);
-		const answerMediaObject = localSdpObject.media
-			.find((m: any) => String(m.mid) === mid);
 
-		// May need to modify codec parameters in the answer based on codec
-		// parameters in the offer.
-		sdpCommonUtils.applyCodecParameters(
-			{
-				offerRtpParameters : rtpParameters,
-				answerMediaObject
-			});
+		for (const options of optionsList)
+		{
+			const { kind, rtpParameters } = options;
+			const mid = kind;
+			const answerMediaObject = localSdpObject.media
+				.find((m: any) => String(m.mid) === mid);
+
+			// May need to modify codec parameters in the answer based on codec
+			// parameters in the offer.
+			sdpCommonUtils.applyCodecParameters(
+				{
+					offerRtpParameters : rtpParameters,
+					answerMediaObject
+				});
+		}
 
 		answer = { type: 'answer', sdp: sdpTransform.write(localSdpObject) };
 
@@ -655,17 +670,26 @@ export class ReactNative extends HandlerInterface
 
 		await this._pc.setLocalDescription(answer);
 
-		const stream = this._pc.getRemoteStreams()
-			.find((s: MediaStream) => s.id === streamId);
-		const track = stream.getTrackById(localId);
+		for (const options of optionsList)
+		{
+			const { kind, trackId, rtpParameters } = options;
+			const localId = trackId;
+			const mid = kind;
+			const streamId = mapStreamId.get(trackId);
+			const stream = this._pc.getRemoteStreams()
+				.find((s: MediaStream) => s.id === streamId);
+			const track = stream.getTrackById(localId);
 
-		if (!track)
-			throw new Error('remote track not found');
+			if (!track)
+				throw new Error('remote track not found');
 
-		// Insert into the map.
-		this._mapRecvLocalIdInfo.set(localId, { mid, rtpParameters });
+			// Insert into the map.
+			this._mapRecvLocalIdInfo.set(localId, { mid, rtpParameters });
+
+			results.push({ localId, track });
+		}
 
-		return { localId, track };
+		return results;
 	}
 
 	async stopReceiving(localId: string): Promise<void>

package/src/handlers/Safari11.ts

@@ -651,24 +651,30 @@ export class Safari11 extends HandlerInterface
 	}
 
 	async receive(
-		{ trackId, kind, rtpParameters }: HandlerReceiveOptions
-	): Promise<HandlerReceiveResult>
+		optionsList: HandlerReceiveOptions[]
+	) : Promise<HandlerReceiveResult[]>
 	{
 		this._assertRecvDirection();
 
-		logger.debug('receive() [trackId:%s, kind:%s]', trackId, kind);
+		const results: HandlerReceiveResult[] = [];
 
-		const localId = trackId;
-		const mid = kind;
+		for (const options of optionsList)
+		{
+			const { trackId, kind, rtpParameters } = options;
 
-		this._remoteSdp!.receive(
-			{
-				mid,
-				kind,
-				offerRtpParameters : rtpParameters,
-				streamId           : rtpParameters.rtcp!.cname!,
-				trackId
-			});
+			logger.debug('receive() [trackId:%s, kind:%s]', trackId, kind);
+
+			const mid = kind;
+
+			this._remoteSdp!.receive(
+				{
+					mid,
+					kind,
+					offerRtpParameters : rtpParameters,
+					streamId           : rtpParameters.rtcp!.cname!,
+					trackId
+				});
+		}
 
 		const offer = { type: 'offer', sdp: this._remoteSdp!.getSdp() };
 
@@ -680,16 +686,22 @@ export class Safari11 extends HandlerInterface
 
 		let answer = await this._pc.createAnswer();
 		const localSdpObject = sdpTransform.parse(answer.sdp);
-		const answerMediaObject = localSdpObject.media
-			.find((m: any) => String(m.mid) === mid);
 
-		// May need to modify codec parameters in the answer based on codec
-		// parameters in the offer.
-		sdpCommonUtils.applyCodecParameters(
-			{
-				offerRtpParameters : rtpParameters,
-				answerMediaObject
-			});
+		for (const options of optionsList)
+		{
+			const { kind, rtpParameters } = options;
+			const mid = kind;
+			const answerMediaObject = localSdpObject.media
+				.find((m: any) => String(m.mid) === mid);
+
+			// May need to modify codec parameters in the answer based on codec
+			// parameters in the offer.
+			sdpCommonUtils.applyCodecParameters(
+				{
+					offerRtpParameters : rtpParameters,
+					answerMediaObject
+				});
+		}
 
 		answer = { type: 'answer', sdp: sdpTransform.write(localSdpObject) };
 
@@ -708,20 +720,29 @@ export class Safari11 extends HandlerInterface
 
 		await this._pc.setLocalDescription(answer);
 
-		const rtpReceiver = this._pc.getReceivers()
-			.find((r: RTCRtpReceiver) => r.track && r.track.id === localId);
+		for (const options of optionsList)
+		{
+			const { kind, trackId, rtpParameters } = options;
+			const mid = kind;
+			const localId = trackId;
 
-		if (!rtpReceiver)
-			throw new Error('new RTCRtpReceiver not');
+			const rtpReceiver = this._pc.getReceivers()
+				.find((r: RTCRtpReceiver) => r.track && r.track.id === localId);
 
-		// Insert into the map.
-		this._mapRecvLocalIdInfo.set(localId, { mid, rtpParameters, rtpReceiver });
+			if (!rtpReceiver)
+				throw new Error('new RTCRtpReceiver not');
 
-		return {
-			localId,
-			track : rtpReceiver.track,
-			rtpReceiver
-		};
+			// Insert into the map.
+			this._mapRecvLocalIdInfo.set(localId, { mid, rtpParameters, rtpReceiver });
+
+			results.push({
+				localId,
+				track : rtpReceiver.track,
+				rtpReceiver
+			});
+		}
+
+		return results;
 	}
 
 	async stopReceiving(localId: string): Promise<void>

package/src/handlers/Safari12.ts

@@ -603,23 +603,33 @@ export class Safari12 extends HandlerInterface
 	}
 
 	async receive(
-		{ trackId, kind, rtpParameters }: HandlerReceiveOptions
-	): Promise<HandlerReceiveResult>
+		optionsList: HandlerReceiveOptions[]
+	) : Promise<HandlerReceiveResult[]>
 	{
 		this._assertRecvDirection();
 
-		logger.debug('receive() [trackId:%s, kind:%s]', trackId, kind);
+		const results: HandlerReceiveResult[] = [];
+		const mapLocalId: Map<string, string> = new Map();
 
-		const localId = rtpParameters.mid || String(this._mapMidTransceiver.size);
+		for (const options of optionsList)
+		{
+			const { trackId, kind, rtpParameters } = options;
 
-		this._remoteSdp!.receive(
-			{
-				mid                : localId,
-				kind,
-				offerRtpParameters : rtpParameters,
-				streamId           : rtpParameters.rtcp!.cname!,
-				trackId
-			});
+			logger.debug('receive() [trackId:%s, kind:%s]', trackId, kind);
+
+			const localId = rtpParameters.mid || String(this._mapMidTransceiver.size);
+
+			mapLocalId.set(trackId, localId);
+
+			this._remoteSdp!.receive(
+				{
+					mid                : localId,
+					kind,
+					offerRtpParameters : rtpParameters,
+					streamId           : rtpParameters.rtcp!.cname!,
+					trackId
+				});
+		}
 
 		const offer = { type: 'offer', sdp: this._remoteSdp!.getSdp() };
 
@@ -631,16 +641,22 @@ export class Safari12 extends HandlerInterface
 
 		let answer = await this._pc.createAnswer();
 		const localSdpObject = sdpTransform.parse(answer.sdp);
-		const answerMediaObject = localSdpObject.media
-			.find((m: any) => String(m.mid) === localId);
 
-		// May need to modify codec parameters in the answer based on codec
-		// parameters in the offer.
-		sdpCommonUtils.applyCodecParameters(
-			{
-				offerRtpParameters : rtpParameters,
-				answerMediaObject
-			});
+		for (const options of optionsList)
+		{
+			const { trackId, rtpParameters } = options;
+			const localId = mapLocalId.get(trackId);
+			const answerMediaObject = localSdpObject.media
+				.find((m: any) => String(m.mid) === localId);
+
+			// May need to modify codec parameters in the answer based on codec
+			// parameters in the offer.
+			sdpCommonUtils.applyCodecParameters(
+				{
+					offerRtpParameters : rtpParameters,
+					answerMediaObject
+				});
+		}
 
 		answer = { type: 'answer', sdp: sdpTransform.write(localSdpObject) };
 
@@ -659,20 +675,27 @@ export class Safari12 extends HandlerInterface
 
 		await this._pc.setLocalDescription(answer);
 
-		const transceiver = this._pc.getTransceivers()
-			.find((t: RTCRtpTransceiver) => t.mid === localId);
+		for (const options of optionsList)
+		{
+			const { trackId } = options;
+			const localId = mapLocalId.get(trackId)!;
+			const transceiver = this._pc.getTransceivers()
+				.find((t: RTCRtpTransceiver) => t.mid === localId);
 
-		if (!transceiver)
-			throw new Error('new RTCRtpTransceiver not found');
+			if (!transceiver)
+				throw new Error('new RTCRtpTransceiver not found');
 
-		// Store in the map.
-		this._mapMidTransceiver.set(localId, transceiver);
+			// Store in the map.
+			this._mapMidTransceiver.set(localId, transceiver);
 
-		return {
-			localId,
-			track       : transceiver.receiver.track,
-			rtpReceiver : transceiver.receiver
-		};
+			results.push({
+				localId,
+				track       : transceiver.receiver.track,
+				rtpReceiver : transceiver.receiver
+			});
+		}
+
+		return results;
 	}
 
 	async stopReceiving(localId: string): Promise<void>

package/src/ortc.ts

@@ -1073,15 +1073,14 @@ function matchCodecs(
 	{
 		case 'video/h264':
 		{
-			const aPacketizationMode = aCodec.parameters['packetization-mode'] || 0;
-			const bPacketizationMode = bCodec.parameters['packetization-mode'] || 0;
-
-			if (aPacketizationMode !== bPacketizationMode)
-				return false;
-
-			// If strict matching check profile-level-id.
 			if (strict)
 			{
+				const aPacketizationMode = aCodec.parameters['packetization-mode'] || 0;
+				const bPacketizationMode = bCodec.parameters['packetization-mode'] || 0;
+
+				if (aPacketizationMode !== bPacketizationMode)
+					return false;
+
 				if (!h264.isSameProfile(aCodec.parameters, bCodec.parameters))
 					return false;
 
@@ -1117,7 +1116,6 @@ function matchCodecs(
 
 		case 'video/vp9':
 		{
-			// If strict matching check profile-id.
 			if (strict)
 			{
 				const aProfileId = aCodec.parameters['profile-id'] || 0;