RemotePlanBSdp: signal a new stream id into remote offers for each ne…

…w Consumer (required for react-native-webrtc due the libwebrtc ObjC limitation that Google never wished to fix even having a working patch)
versatica · Jan 6, 2018 · d77f4a4 · d77f4a4
1 parent 37a99da
commit d77f4a4
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 50 deletions.
diff --git a/lib/handlers/Chrome55.js b/lib/handlers/Chrome55.js
@@ -417,10 +417,11 @@ class RecvHandler extends Handler
 		const cname = consumer.rtpParameters.rtcp.cname;
 		const consumerInfo =
 		{
-			kind    : consumer.kind,
-			trackId : `consumer-${consumer.kind}-${consumer.id}`,
-			ssrc    : encoding.ssrc,
-			cname   : cname
+			kind     : consumer.kind,
+			streamId : `recv-stream-${consumer.id}`,
+			trackId  : `consumer-${consumer.kind}-${consumer.id}`,
+			ssrc     : encoding.ssrc,
+			cname    : cname
 		};
 
 		if (encoding.rtx && encoding.rtx.ssrc)
@@ -466,7 +467,8 @@ class RecvHandler extends Handler
 			})
 			.then(() =>
 			{
-				const stream = this._pc.getRemoteStreams()[0];
+				const stream = this._pc.getRemoteStreams()
+					.find((s) => s.id === consumerInfo.streamId);
 				const track = stream.getTrackById(consumerInfo.trackId);
 
 				if (!track)

diff --git a/lib/handlers/Firefox50.js b/lib/handlers/Firefox50.js
@@ -414,12 +414,13 @@ class RecvHandler extends Handler
 		const cname = consumer.rtpParameters.rtcp.cname;
 		const consumerInfo =
 		{
-			mid     : `consumer-${consumer.kind}-${consumer.id}`,
-			kind    : consumer.kind,
-			closed  : consumer.closed,
-			trackId : `consumer-${consumer.kind}-${consumer.id}`,
-			ssrc    : encoding.ssrc,
-			cname   : cname
+			mid      : `consumer-${consumer.kind}-${consumer.id}`,
+			kind     : consumer.kind,
+			closed   : consumer.closed,
+			streamId : `recv-stream-${consumer.id}`,
+			trackId  : `consumer-${consumer.kind}-${consumer.id}`,
+			ssrc     : encoding.ssrc,
+			cname    : cname
 		};
 
 		if (encoding.rtx && encoding.rtx.ssrc)

diff --git a/lib/handlers/ReactNative.js b/lib/handlers/ReactNative.js
@@ -425,10 +425,11 @@ class RecvHandler extends Handler
 		const cname = consumer.rtpParameters.rtcp.cname;
 		const consumerInfo =
 		{
-			kind    : consumer.kind,
-			trackId : `consumer-${consumer.kind}-${consumer.id}`,
-			ssrc    : encoding.ssrc,
-			cname   : cname
+			kind     : consumer.kind,
+			streamId : `recv-stream-${consumer.id}`,
+			trackId  : `consumer-${consumer.kind}-${consumer.id}`,
+			ssrc     : encoding.ssrc,
+			cname    : cname
 		};
 
 		if (encoding.rtx && encoding.rtx.ssrc)
@@ -453,9 +454,6 @@ class RecvHandler extends Handler
 					'addConsumer() | calling pc.setRemoteDescription() [offer:%o]',
 					offer);
 
-				// TODO: testing
-				logger.debug(offer.sdp);
-
 				const offerDesc = new RTCSessionDescription(offer);
 
 				return this._pc.setRemoteDescription(offerDesc);
@@ -479,23 +477,8 @@ class RecvHandler extends Handler
 			})
 			.then(() =>
 			{
-				// TODO: testing
-				for (const s of this._pc.getRemoteStreams())
-				{
-					logger.debug('stream found:');
-					logger.debug('  - stream.id: %s', s.id);
-					logger.debug('  - stream num tracks: %s', s.getTracks().length);
-
-					for (const t of s.getTracks())
-					{
-						logger.debug('  track found:');
-						logger.debug('    - track.id: %s', t.id);
-						logger.debug('    - track.label: %s', t.label);
-						logger.debug('    - track.kind: %s', t.kind);
-					}
-				}
-
-				const stream = this._pc.getRemoteStreams()[0];
+				const stream = this._pc.getRemoteStreams()
+					.find((s) => s.id === consumerInfo.streamId);
 				const track = stream.getTrackById(consumerInfo.trackId);
 
 				if (!track)

diff --git a/lib/handlers/Safari11.js b/lib/handlers/Safari11.js
@@ -361,10 +361,11 @@ class RecvHandler extends Handler
 		const cname = consumer.rtpParameters.rtcp.cname;
 		const consumerInfo =
 		{
-			kind    : consumer.kind,
-			trackId : `consumer-${consumer.kind}-${consumer.id}`,
-			ssrc    : encoding.ssrc,
-			cname   : cname
+			kind     : consumer.kind,
+			streamId : `recv-stream-${consumer.id}`,
+			trackId  : `consumer-${consumer.kind}-${consumer.id}`,
+			ssrc     : encoding.ssrc,
+			cname    : cname
 		};
 
 		if (encoding.rtx && encoding.rtx.ssrc)

diff --git a/lib/handlers/sdp/RemotePlanBSdp.js b/lib/handlers/sdp/RemotePlanBSdp.js
@@ -280,9 +280,6 @@ class RecvRemoteSdp extends RemoteSdp
 	constructor(rtpParametersByKind)
 	{
 		super(rtpParametersByKind);
-
-		// Id of the unique MediaStream for all the remote tracks.
-		this._streamId = `recv-stream-${utils.randomNumber()}`;
 	}
 
 	/**
@@ -472,14 +469,14 @@ class RecvRemoteSdp extends RemoteSdp
 					{
 						id        : info.ssrc,
 						attribute : 'msid',
-						value     : `${this._streamId} ${info.trackId}`
+						value     : `${info.streamId} ${info.trackId}`
 					});
 
 				remoteMediaObj.ssrcs.push(
 					{
 						id        : info.ssrc,
 						attribute : 'mslabel',
-						value     : this._streamId
+						value     : info.streamId
 					});
 
 				remoteMediaObj.ssrcs.push(
@@ -502,14 +499,14 @@ class RecvRemoteSdp extends RemoteSdp
 						{
 							id        : info.rtxSsrc,
 							attribute : 'msid',
-							value     : `${this._streamId} ${info.trackId}`
+							value     : `${info.streamId} ${info.trackId}`
 						});
 
 					remoteMediaObj.ssrcs.push(
 						{
 							id        : info.rtxSsrc,
 							attribute : 'mslabel',
-							value     : this._streamId
+							value     : info.streamId
 						});
 
 					remoteMediaObj.ssrcs.push(

diff --git a/lib/handlers/sdp/RemoteUnifiedPlanSdp.js b/lib/handlers/sdp/RemoteUnifiedPlanSdp.js
@@ -311,9 +311,6 @@ class RecvRemoteSdp extends RemoteSdp
 	constructor(rtpParametersByKind)
 	{
 		super(rtpParametersByKind);
-
-		// Id of the unique MediaStream for all the remote tracks.
-		this._streamId = `recv-stream-${utils.randomNumber()}`;
 	}
 
 	/**
@@ -401,7 +398,7 @@ class RecvRemoteSdp extends RemoteSdp
 				remoteMediaObj.protocol = 'RTP/SAVPF';
 				remoteMediaObj.connection = { ip: '127.0.0.1', version: 4 };
 				remoteMediaObj.mid = info.mid;
-				remoteMediaObj.msid = `${this._streamId} ${info.trackId}`;
+				remoteMediaObj.msid = `${info.streamId} ${info.trackId}`;
 			}
 			else
 			{