RtpParameters: add msid optional field

src/Consumer.ts

@@ -7,9 +7,9 @@ import type { AppData } from './types';
 const logger = new Logger('Consumer');
 
 export type ConsumerOptions<ConsumerAppData extends AppData = AppData> = {
-	id?: string;
-	producerId?: string;
-	kind?: 'audio' | 'video';
+	id: string;
+	producerId: string;
+	kind: 'audio' | 'video';
 	rtpParameters: RtpParameters;
 	streamId?: string;
 	onRtpReceiver?: OnRtpReceiverCallback;

src/DataConsumer.ts

@@ -7,8 +7,8 @@ const logger = new Logger('DataConsumer');
 
 export type DataConsumerOptions<DataConsumerAppData extends AppData = AppData> =
 	{
-		id?: string;
-		dataProducerId?: string;
+		id: string;
+		dataProducerId: string;
 		sctpStreamParameters: SctpStreamParameters;
 		label?: string;
 		protocol?: string;

src/Producer.ts

@@ -13,6 +13,7 @@ const logger = new Logger('Producer');
 
 export type ProducerOptions<ProducerAppData extends AppData = AppData> = {
 	track?: MediaStreamTrack;
+	stream?: MediaStream;
 	encodings?: RtpEncodingParameters[];
 	codecOptions?: ProducerCodecOptions;
 	headerExtensionOptions?: ProducerHeaderExtensionOptions;

src/RtpParameters.ts

@@ -164,6 +164,12 @@ export type RtpParameters = {
 	 * Parameters used for RTCP.
 	 */
 	rtcp?: RtcpParameters;
+	/**
+	 * MSID (WebRTC MediaStream Identification).
+	 *
+	 * @see https://datatracker.ietf.org/doc/html/rfc8830
+	 */
+	msid?: string;
 };
 
 /**

src/Transport.ts

@@ -500,6 +500,7 @@ export class Transport<
 	 */
 	async produce<ProducerAppData extends AppData = AppData>({
 		track,
+		stream,
 		encodings,
 		codecOptions,
 		headerExtensionOptions,
@@ -587,6 +588,7 @@ export class Transport<
 					const { localId, rtpParameters, rtpSender } =
 						await this._handler.send({
 							track,
+							stream,
 							encodings: normalizedEncodings,
 							codecOptions,
 							headerExtensionOptions,
@@ -902,8 +904,8 @@ export class Transport<
 						task.consumerOptions;
 
 					optionsList.push({
-						trackId: id!,
-						kind: kind!,
+						trackId: id,
+						kind: kind,
 						rtpParameters,
 						streamId,
 						onRtpReceiver,
@@ -920,9 +922,9 @@ export class Transport<
 							task.consumerOptions;
 						const { localId, rtpReceiver, track } = result;
 						const consumer: Consumer<ConsumerAppData> = new Consumer({
-							id: id!,
+							id,
 							localId,
-							producerId: producerId!,
+							producerId,
 							rtpReceiver,
 							track,
 							rtpParameters,

src/handlers/Chrome111.ts

@@ -60,7 +60,7 @@ export class Chrome111
 	// Map of RTCTransceivers indexed by MID.
 	private readonly _mapMidTransceiver: Map<string, RTCRtpTransceiver> =
 		new Map();
-	// Local stream for sending.
+	// Default local stream for sending if no stream is given.
 	private readonly _sendStream = new MediaStream();
 	// Whether a DataChannel m=application section has been created.
 	private _hasDataChannelMediaSection = false;
@@ -336,6 +336,7 @@ export class Chrome111
 
 	async send({
 		track,
+		stream,
 		encodings,
 		codecOptions,
 		headerExtensionOptions,
@@ -345,7 +346,12 @@ export class Chrome111
 		this.assertNotClosed();
 		this.assertSendDirection();
 
-		logger.debug('send() [kind:%s, track.id:%s]', track.kind, track.id);
+		logger.debug(
+			'send() [kind:%s, track.id:%s, stream.id:%s]',
+			track.kind,
+			track.id,
+			stream?.id
+		);
 
 		if (encodings && encodings.length > 1) {
 			// Set rid and verify scalabilityMode in each encoding.
@@ -374,7 +380,7 @@ export class Chrome111
 		const mediaSectionIdx = this._remoteSdp.getNextMediaSectionIdx();
 		const transceiver = this._pc.addTransceiver(track, {
 			direction: 'sendonly',
-			streams: [this._sendStream],
+			streams: [stream ?? this._sendStream],
 			sendEncodings: encodings,
 		});
 
@@ -481,6 +487,9 @@ export class Chrome111
 			offerMediaObject,
 		});
 
+		// Set msid.
+		sendingRtpParameters.msid = offerMediaObject.msid;
+
 		// Set RTP encodings by parsing the SDP offer if no encodings are given.
 		if (!encodings) {
 			sendingRtpParameters.encodings = sdpUnifiedPlanUtils.getRtpEncodings({
@@ -905,11 +914,17 @@ export class Chrome111
 
 			mapLocalId.set(trackId, localId);
 
+			// We ignore MSID `trackId` when consuming and always us our computed
+			// `trackId` which matches the `consumer.id`.
+			const { msidStreamId } = ortcUtils.getMsidStreamIdAndTrackId(
+				rtpParameters.msid
+			);
+
 			this._remoteSdp.receive({
 				mid: localId,
 				kind,
 				offerRtpParameters: rtpParameters,
-				streamId: streamId ?? rtpParameters.rtcp!.cname!,
+				streamId: streamId ?? msidStreamId ?? rtpParameters.rtcp?.cname ?? '-',
 				trackId,
 			});
 		}

src/handlers/Chrome74.ts

@@ -61,7 +61,7 @@ export class Chrome74
 	// Map of RTCTransceivers indexed by MID.
 	private readonly _mapMidTransceiver: Map<string, RTCRtpTransceiver> =
 		new Map();
-	// Local stream for sending.
+	// Default local stream for sending if no stream is given.
 	private readonly _sendStream = new MediaStream();
 	// Whether a DataChannel m=application section has been created.
 	private _hasDataChannelMediaSection = false;
@@ -333,6 +333,7 @@ export class Chrome74
 
 	async send({
 		track,
+		stream,
 		encodings,
 		codecOptions,
 		headerExtensionOptions,
@@ -341,7 +342,12 @@ export class Chrome74
 		this.assertNotClosed();
 		this.assertSendDirection();
 
-		logger.debug('send() [kind:%s, track.id:%s]', track.kind, track.id);
+		logger.debug(
+			'send() [kind:%s, track.id:%s, stream.id:%s]',
+			track.kind,
+			track.id,
+			stream?.id
+		);
 
 		if (encodings && encodings.length > 1) {
 			encodings.forEach((encoding: RtpEncodingParameters, idx: number) => {
@@ -352,7 +358,7 @@ export class Chrome74
 		const mediaSectionIdx = this._remoteSdp.getNextMediaSectionIdx();
 		const transceiver = this._pc.addTransceiver(track, {
 			direction: 'sendonly',
-			streams: [this._sendStream],
+			streams: [stream ?? this._sendStream],
 			sendEncodings: encodings,
 		});
 		let offer = await this._pc.createOffer();

src/handlers/FakeHandler.ts

@@ -179,7 +179,7 @@ export class FakeHandler
 
 	async send(
 		// eslint-disable-next-line @typescript-eslint/no-unused-vars
-		{ track, encodings, codecOptions, codec }: HandlerSendOptions
+		{ track, stream, encodings, codecOptions, codec }: HandlerSendOptions
 	): Promise<HandlerSendResult> {
 		this.assertNotClosed();
 
@@ -214,6 +214,8 @@ export class FakeHandler
 
 		sendingRtpParameters.mid = `mid-${utils.generateRandomNumber()}`;
 
+		sendingRtpParameters.msid = `${stream?.id ?? '-'} ${track.id}`;
+
 		if (!encodings) {
 			encodings = [{}];
 		}

src/handlers/Firefox120.ts

@@ -55,7 +55,7 @@ export class Firefox120
 	// Map of RTCTransceivers indexed by MID.
 	private readonly _mapMidTransceiver: Map<string, RTCRtpTransceiver> =
 		new Map();
-	// Local stream for sending.
+	// Default local stream for sending if no stream is given.
 	private readonly _sendStream = new MediaStream();
 	// Whether a DataChannel m=application section has been created.
 	private _hasDataChannelMediaSection = false;
@@ -336,6 +336,7 @@ export class Firefox120
 
 	async send({
 		track,
+		stream,
 		encodings,
 		codecOptions,
 		codec,
@@ -344,7 +345,12 @@ export class Firefox120
 		this.assertNotClosed();
 		this.assertSendDirection();
 
-		logger.debug('send() [kind:%s, track.id:%s]', track.kind, track.id);
+		logger.debug(
+			'send() [kind:%s, track.id:%s, stream.id:%s]',
+			track.kind,
+			track.id,
+			stream?.id
+		);
 
 		if (encodings && encodings.length > 1) {
 			encodings.forEach((encoding: RtpEncodingParameters, idx: number) => {
@@ -360,7 +366,7 @@ export class Firefox120
 
 		const transceiver = this._pc.addTransceiver(track, {
 			direction: 'sendonly',
-			streams: [this._sendStream],
+			streams: [stream ?? this._sendStream],
 			sendEncodings: encodings,
 		});
 

src/handlers/HandlerInterface.ts

@@ -48,6 +48,7 @@ export type HandlerFactory = {
 
 export type HandlerSendOptions = {
 	track: MediaStreamTrack;
+	stream?: MediaStream;
 	encodings?: RtpEncodingParameters[];
 	codecOptions?: ProducerCodecOptions;
 	headerExtensionOptions?: ProducerHeaderExtensionOptions;

src/handlers/ReactNative106.ts

@@ -61,7 +61,7 @@ export class ReactNative106
 	// Map of RTCTransceivers indexed by MID.
 	private readonly _mapMidTransceiver: Map<string, RTCRtpTransceiver> =
 		new Map();
-	// Local stream for sending.
+	// Default local stream for sending if no stream is given.
 	private readonly _sendStream = new MediaStream();
 	// Whether a DataChannel m=application section has been created.
 	private _hasDataChannelMediaSection = false;
@@ -339,6 +339,7 @@ export class ReactNative106
 
 	async send({
 		track,
+		stream,
 		encodings,
 		codecOptions,
 		headerExtensionOptions,
@@ -348,7 +349,12 @@ export class ReactNative106
 		this.assertNotClosed();
 		this.assertSendDirection();
 
-		logger.debug('send() [kind:%s, track.id:%s]', track.kind, track.id);
+		logger.debug(
+			'send() [kind:%s, track.id:%s, stream.id:%s]',
+			track.kind,
+			track.id,
+			stream?.id
+		);
 
 		if (encodings && encodings.length > 1) {
 			encodings.forEach((encoding: RtpEncodingParameters, idx: number) => {
@@ -359,7 +365,7 @@ export class ReactNative106
 		const mediaSectionIdx = this._remoteSdp.getNextMediaSectionIdx();
 		const transceiver = this._pc.addTransceiver(track, {
 			direction: 'sendonly',
-			streams: [this._sendStream],
+			streams: [stream ?? this._sendStream],
 			sendEncodings: encodings,
 		});
 

src/handlers/Safari12.ts

@@ -60,7 +60,7 @@ export class Safari12
 	// Map of RTCTransceivers indexed by MID.
 	private readonly _mapMidTransceiver: Map<string, RTCRtpTransceiver> =
 		new Map();
-	// Local stream for sending.
+	// Default local stream for sending if no stream is given.
 	private readonly _sendStream = new MediaStream();
 	// Whether a DataChannel m=application section has been created.
 	private _hasDataChannelMediaSection = false;
@@ -343,6 +343,7 @@ export class Safari12
 
 	async send({
 		track,
+		stream,
 		encodings,
 		codecOptions,
 		headerExtensionOptions,
@@ -352,12 +353,17 @@ export class Safari12
 		this.assertNotClosed();
 		this.assertSendDirection();
 
-		logger.debug('send() [kind:%s, track.id:%s]', track.kind, track.id);
+		logger.debug(
+			'send() [kind:%s, track.id:%s, stream.id:%s]',
+			track.kind,
+			track.id,
+			stream?.id
+		);
 
 		const mediaSectionIdx = this._remoteSdp.getNextMediaSectionIdx();
 		const transceiver = this._pc.addTransceiver(track, {
 			direction: 'sendonly',
-			streams: [this._sendStream],
+			streams: [stream ?? this._sendStream],
 		});
 
 		if (onRtpSender) {

src/handlers/ortc/utils.ts

@@ -70,3 +70,24 @@ export function addHeaderExtensionSupport(
 
 	rtpCapabilities.headerExtensions.push(newHeaderExtension);
 }
+
+export function getMsidStreamIdAndTrackId(msid?: string): {
+	msidStreamId?: string;
+	msidTrackId?: string;
+} {
+	if (!msid || typeof msid !== 'string') {
+		return { msidStreamId: undefined, msidTrackId: undefined };
+	}
+
+	/**
+	 * `msidStreamId` must be an id or '-' (no stream).
+	 * `msidTrackId` is an optional id.
+	 */
+	const [msidStreamId, msidTrackId] = msid.trim().split(/\s+/);
+
+	if (!msidStreamId) {
+		return { msidStreamId: undefined, msidTrackId: undefined };
+	}
+
+	return { msidStreamId, msidTrackId };
+}

src/handlers/sdp/MediaSection.ts

@@ -479,6 +479,7 @@ export class OfferMediaSection extends MediaSection {
 		plainRtpParameters?: PlainRtpParameters;
 		mid: string;
 		kind: MediaKind | 'application';
+		// Those are optionals because they are only given if `kind` is a MediaKind.
 		offerRtpParameters?: RtpParameters;
 		streamId?: string;
 		trackId?: string;
@@ -518,7 +519,7 @@ export class OfferMediaSection extends MediaSection {
 				this._mediaObject.rtp = [];
 				this._mediaObject.rtcpFb = [];
 				this._mediaObject.fmtp = [];
-				this._mediaObject.msid = `${streamId ?? '-'} ${trackId}`;
+				this._mediaObject.msid = `${streamId} ${trackId}`;
 
 				for (const codec of offerRtpParameters!.codecs) {
 					const rtp: SdpTransform.MediaAttributes['rtp'][number] = {