From 379c165e7c1d84d67fa1c53eb3c8c642566427f9 Mon Sep 17 00:00:00 2001 From: Jan-Ivar Bruaroey Date: Wed, 21 Nov 2018 12:35:14 -0500 Subject: [PATCH] Fix bad merge 'Merge branch 'master' into gecko/1498793'. --- webrtc/RTCRtpTransceiver.https.html | 20 +++++++++++++++++++ ...ver-with-OfferToReceive-options.https.html | 4 ++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/webrtc/RTCRtpTransceiver.https.html b/webrtc/RTCRtpTransceiver.https.html index 1614a11c1a1d6f..aba2796489603b 100644 --- a/webrtc/RTCRtpTransceiver.https.html +++ b/webrtc/RTCRtpTransceiver.https.html @@ -387,6 +387,26 @@ hasProps(pc.getTransceivers(), []); }; + const checkMsidNoTrackId = async t => { + const pc1 = new RTCPeerConnection(); + const pc2 = new RTCPeerConnection(); + t.add_cleanup(() => pc1.close()); + t.add_cleanup(() => pc2.close()); + const stream = await navigator.mediaDevices.getUserMedia({audio: true}); + t.add_cleanup(() => stopTracks(stream)); + const track = stream.getAudioTracks()[0]; + pc1.addTrack(track, stream); + const offer = await pc1.createOffer(); + await pc1.setLocalDescription(offer); + // Remove track-id from msid + offer.sdp = offer.sdp.replace(/(a=msid:[^ \t]+).*\r\n/g, "$1\r\n"); + assert_true(offer.sdp.includes(`a=msid:${stream.id}\r\n`)); + await pc2.setRemoteDescription(offer); + const answer = await pc2.createAnswer(); + await pc1.setRemoteDescription(answer); + await pc2.setLocalDescription(answer); + }; + const checkNoMidOffer = async t => { const pc1 = new RTCPeerConnection(); const pc2 = new RTCPeerConnection(); diff --git a/webrtc/legacy/RTCRtpTransceiver-with-OfferToReceive-options.https.html b/webrtc/legacy/RTCRtpTransceiver-with-OfferToReceive-options.https.html index 8c2975214c4dce..9addb009873432 100644 --- a/webrtc/legacy/RTCRtpTransceiver-with-OfferToReceive-options.https.html +++ b/webrtc/legacy/RTCRtpTransceiver-with-OfferToReceive-options.https.html @@ -69,9 +69,9 @@ ]); const offer = await pc.createOffer(); - assert_true(offer.sdp.includes("a=msid:" + audioStream.id + " " + audio.id), + assert_true(offer.sdp.includes("a=msid:" + audioStream.id), "offer contains the expected audio msid"); - assert_true(offer.sdp.includes("a=msid:" + videoStream.id + " " + video.id), + assert_true(offer.sdp.includes("a=msid:" + videoStream.id), "offer contains the expected video msid"); };