Commit e653e90c authored by Henrik Boström's avatar Henrik Boström Committed by Commit Bot

Fix RTCPeerConnection-transceivers.https.html bug.

This PR accidentally made the "addTrack(0 streams)" test call addTrack()
with a stream, which broke the tests:
https://github.com/web-platform-tests/wpt/pull/12141

Test restored and all "addTrack/addTransceiver(X streams)" are made to
consistently use "new MediaStream()" the same way.

Bug: 869036
Change-Id: Ieaf0c73a1996aeb2e87e18f2f9065fa1e6fee1e7
Reviewed-on: https://chromium-review.googlesource.com/1155125Reviewed-by: default avatarHarald Alvestrand <hta@chromium.org>
Commit-Queue: Henrik Boström <hbos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579341}
parent 68b05be4
...@@ -321,7 +321,7 @@ promise_test(async t => { ...@@ -321,7 +321,7 @@ promise_test(async t => {
promise_test(async t => { promise_test(async t => {
const pc1 = createPeerConnectionWithCleanup(t); const pc1 = createPeerConnectionWithCleanup(t);
const pc2 = createPeerConnectionWithCleanup(t); const pc2 = createPeerConnectionWithCleanup(t);
const [track, stream] = await createTrackAndStreamWithCleanup(t); const [track] = await createTrackAndStreamWithCleanup(t);
pc1.addTransceiver(track, {streams:[]}); pc1.addTransceiver(track, {streams:[]});
const trackEvent = await exchangeOfferAndListenToOntrack(t, pc1, pc2); const trackEvent = await exchangeOfferAndListenToOntrack(t, pc1, pc2);
assert_equals(trackEvent.streams.length, 0, 'trackEvent.streams.length == 0'); assert_equals(trackEvent.streams.length, 0, 'trackEvent.streams.length == 0');
...@@ -330,7 +330,8 @@ promise_test(async t => { ...@@ -330,7 +330,8 @@ promise_test(async t => {
promise_test(async t => { promise_test(async t => {
const pc1 = createPeerConnectionWithCleanup(t); const pc1 = createPeerConnectionWithCleanup(t);
const pc2 = createPeerConnectionWithCleanup(t); const pc2 = createPeerConnectionWithCleanup(t);
const [track, stream] = await createTrackAndStreamWithCleanup(t); const [track] = await createTrackAndStreamWithCleanup(t);
const stream = new MediaStream();
pc1.addTransceiver(track, {streams:[stream]}); pc1.addTransceiver(track, {streams:[stream]});
const trackEvent = await exchangeOfferAndListenToOntrack(t, pc1, pc2); const trackEvent = await exchangeOfferAndListenToOntrack(t, pc1, pc2);
assert_equals(trackEvent.streams.length, 1, 'trackEvent.streams.length == 1'); assert_equals(trackEvent.streams.length, 1, 'trackEvent.streams.length == 1');
...@@ -341,7 +342,7 @@ promise_test(async t => { ...@@ -341,7 +342,7 @@ promise_test(async t => {
promise_test(async t => { promise_test(async t => {
const pc1 = createPeerConnectionWithCleanup(t); const pc1 = createPeerConnectionWithCleanup(t);
const pc2 = createPeerConnectionWithCleanup(t); const pc2 = createPeerConnectionWithCleanup(t);
const [track, stream] = await createTrackAndStreamWithCleanup(t); const [track] = await createTrackAndStreamWithCleanup(t);
const stream0 = new MediaStream(); const stream0 = new MediaStream();
const stream1 = new MediaStream(); const stream1 = new MediaStream();
pc1.addTransceiver(track, {streams:[stream0, stream1]}); pc1.addTransceiver(track, {streams:[stream0, stream1]});
...@@ -356,8 +357,8 @@ promise_test(async t => { ...@@ -356,8 +357,8 @@ promise_test(async t => {
promise_test(async t => { promise_test(async t => {
const pc1 = createPeerConnectionWithCleanup(t); const pc1 = createPeerConnectionWithCleanup(t);
const pc2 = createPeerConnectionWithCleanup(t); const pc2 = createPeerConnectionWithCleanup(t);
const [track, stream] = await createTrackAndStreamWithCleanup(t); const [track] = await createTrackAndStreamWithCleanup(t);
pc1.addTrack(track, stream); pc1.addTrack(track);
const trackEvent = await exchangeOfferAndListenToOntrack(t, pc1, pc2); const trackEvent = await exchangeOfferAndListenToOntrack(t, pc1, pc2);
assert_equals(trackEvent.streams.length, 0, 'trackEvent.streams.length == 0'); assert_equals(trackEvent.streams.length, 0, 'trackEvent.streams.length == 0');
}, 'addTrack(0 streams): ontrack fires with no stream'); }, 'addTrack(0 streams): ontrack fires with no stream');
...@@ -365,7 +366,8 @@ promise_test(async t => { ...@@ -365,7 +366,8 @@ promise_test(async t => {
promise_test(async t => { promise_test(async t => {
const pc1 = createPeerConnectionWithCleanup(t); const pc1 = createPeerConnectionWithCleanup(t);
const pc2 = createPeerConnectionWithCleanup(t); const pc2 = createPeerConnectionWithCleanup(t);
const [track, stream] = await createTrackAndStreamWithCleanup(t); const [track] = await createTrackAndStreamWithCleanup(t);
const stream = new MediaStream();
pc1.addTrack(track, stream); pc1.addTrack(track, stream);
const trackEvent = await exchangeOfferAndListenToOntrack(t, pc1, pc2); const trackEvent = await exchangeOfferAndListenToOntrack(t, pc1, pc2);
assert_equals(trackEvent.streams.length, 1, 'trackEvent.streams.length == 1'); assert_equals(trackEvent.streams.length, 1, 'trackEvent.streams.length == 1');
...@@ -376,7 +378,7 @@ promise_test(async t => { ...@@ -376,7 +378,7 @@ promise_test(async t => {
promise_test(async t => { promise_test(async t => {
const pc1 = createPeerConnectionWithCleanup(t); const pc1 = createPeerConnectionWithCleanup(t);
const pc2 = createPeerConnectionWithCleanup(t); const pc2 = createPeerConnectionWithCleanup(t);
const [track, stream] = await createTrackAndStreamWithCleanup(t); const [track] = await createTrackAndStreamWithCleanup(t);
const stream0 = new MediaStream(); const stream0 = new MediaStream();
const stream1 = new MediaStream(); const stream1 = new MediaStream();
pc1.addTrack(track, stream0, stream1); pc1.addTrack(track, stream0, stream1);
......
...@@ -27,7 +27,7 @@ FAIL addTransceiver(track, init): initialize sendEncodings[0].active to false as ...@@ -27,7 +27,7 @@ FAIL addTransceiver(track, init): initialize sendEncodings[0].active to false as
PASS addTransceiver(0 streams): ontrack fires with no stream PASS addTransceiver(0 streams): ontrack fires with no stream
PASS addTransceiver(1 stream): ontrack fires with corresponding stream PASS addTransceiver(1 stream): ontrack fires with corresponding stream
PASS addTransceiver(2 streams): ontrack fires with corresponding two streams PASS addTransceiver(2 streams): ontrack fires with corresponding two streams
FAIL addTrack(0 streams): ontrack fires with no stream assert_equals: trackEvent.streams.length == 0 expected 0 but got 1 PASS addTrack(0 streams): ontrack fires with no stream
PASS addTrack(1 stream): ontrack fires with corresponding stream PASS addTrack(1 stream): ontrack fires with corresponding stream
PASS addTrack(2 streams): ontrack fires with corresponding two streams PASS addTrack(2 streams): ontrack fires with corresponding two streams
PASS addTransceiver('audio'): creates a transceiver with direction sendrecv PASS addTransceiver('audio'): creates a transceiver with direction sendrecv
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment