Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

webrtc-wpt: use addTrack(track, stream) to increase firefox compat #14170

Merged
merged 1 commit into from Nov 27, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion webrtc/RTCDTMFSender-insertDTMF.https.html
Expand Up @@ -122,7 +122,7 @@
const stream = await navigator.mediaDevices.getUserMedia({audio: true});
t.add_cleanup(() => stream.getTracks().forEach(track => track.stop()));
const [track] = stream.getTracks();
callee.addTrack(track);
callee.addTrack(track, stream);
const answer = await callee.createAnswer();
await callee.setLocalDescription(answer);
await caller.setRemoteDescription(answer);
Expand Down
4 changes: 2 additions & 2 deletions webrtc/RTCPeerConnection-removeTrack.https.html
Expand Up @@ -175,7 +175,7 @@
const offer = await caller.createOffer();
await caller.setLocalDescription(offer);
await callee.setRemoteDescription(offer);
callee.addTrack(track);
callee.addTrack(track, stream);
const answer = await callee.createAnswer();
await callee.setLocalDescription(answer);
await caller.setRemoteDescription(answer);
Expand Down Expand Up @@ -244,7 +244,7 @@
const offer = await caller.createOffer();
await caller.setLocalDescription(offer);
await callee.setRemoteDescription(offer);
callee.addTrack(track);
callee.addTrack(track, stream);
const answer = await callee.createAnswer();
await callee.setLocalDescription(answer);
await caller.setRemoteDescription(answer);
Expand Down
Expand Up @@ -228,7 +228,7 @@
const localStream =
await getNoiseStream({audio: true});
t.add_cleanup(() => localStream.getTracks().forEach(track => track.stop()));
caller.addTrack(localStream.getTracks()[0]);
caller.addTrack(localStream.getTracks()[0], localStream);
const ontrackPromise = addEventListenerPromise(t, callee, 'track', e => {
assert_array_equals(callee.getReceivers(), [e.receiver],
'getReceivers() == [e.receiver].');
Expand All @@ -245,7 +245,7 @@
const localStream =
await getNoiseStream({audio: true});
t.add_cleanup(() => localStream.getTracks().forEach(track => track.stop()));
const sender = caller.addTrack(localStream.getTracks()[0]);
const sender = caller.addTrack(localStream.getTracks()[0], localStream);
const ontrackPromise = addEventListenerPromise(t, callee, 'track');
await exchangeOfferAnswer(caller, callee);
await ontrackPromise;
Expand Down
20 changes: 10 additions & 10 deletions webrtc/RTCPeerConnection-track-stats.https.html
Expand Up @@ -26,7 +26,7 @@
return getUserMediaTracksAndStreams(1)
.then(t.step_func(([tracks, streams]) => {
track = tracks[0];
pc.addTrack(track);
pc.addTrack(track, streams[0]);
return pc.getStats();
}))
.then(t.step_func(report => {
Expand Down Expand Up @@ -73,7 +73,7 @@
return getUserMediaTracksAndStreams(1)
.then(t.step_func(([tracks, streams]) => {
track = tracks[0];
pc.addTrack(track);
pc.addTrack(track, streams[0]);
return pc.createOffer();
}))
.then(t.step_func(offer => {
Expand Down Expand Up @@ -204,7 +204,7 @@
return getUserMediaTracksAndStreams(1)
.then(t.step_func(([tracks, streams]) => {
sendingTrack = tracks[0];
caller.addTrack(sendingTrack);
caller.addTrack(sendingTrack, streams[0]);
return doSignalingHandshake(caller, callee);
}))
.then(t.step_func(() => {
Expand Down Expand Up @@ -237,7 +237,7 @@
};
return getUserMediaTracksAndStreams(1)
.then(t.step_func(([tracks, streams]) => {
caller.addTrack(tracks[0]);
caller.addTrack(tracks[0], streams[0]);
return doSignalingHandshake(caller, callee);
}))
.then(t.step_func(() => {
Expand Down Expand Up @@ -271,7 +271,7 @@
.then(t.step_func(([tracks, streams]) => {
sendingTrack1 = tracks[0];
sendingTrack2 = tracks[1];
sender = caller.addTrack(sendingTrack1);
sender = caller.addTrack(sendingTrack1, streams[0]);
return sender.replaceTrack(sendingTrack2);
}))
.then(t.step_func(() => {
Expand Down Expand Up @@ -300,7 +300,7 @@
.then(t.step_func(([tracks, streams]) => {
sendingTrack1 = tracks[0];
sendingTrack2 = tracks[1];
sender = caller.addTrack(sendingTrack1);
sender = caller.addTrack(sendingTrack1, streams[0]);
return exchangeOffer(caller, callee);
}))
.then(t.step_func(() => {
Expand Down Expand Up @@ -337,7 +337,7 @@
.then(t.step_func(([tracks, streams]) => {
sendingTrack1 = tracks[0];
sendingTrack2 = tracks[1];
sender = caller.addTrack(sendingTrack1);
sender = caller.addTrack(sendingTrack1, streams[0]);
return doSignalingHandshake(caller, callee);
}))
.then(t.step_func(() => {
Expand Down Expand Up @@ -373,7 +373,7 @@
.then(t.step_func(([tracks, streams]) => {
sendingTrack1 = tracks[0];
sendingTrack2 = tracks[1];
sender = caller.addTrack(sendingTrack1);
sender = caller.addTrack(sendingTrack1, streams[0]);
return doSignalingHandshake(caller, callee);
}))
.then(t.step_func(() => {
Expand Down Expand Up @@ -569,8 +569,8 @@
const pc = new RTCPeerConnection();
t.add_cleanup(() => pc.close());
let [tracks, streams] = await getUserMediaTracksAndStreams(2);
let sender1 = pc.addTrack(tracks[0]);
let sender2 = pc.addTrack(tracks[1]);
let sender1 = pc.addTrack(tracks[0], streams[0]);
let sender2 = pc.addTrack(tracks[1], streams[1]);
await sender2.replaceTrack(sender1.track);
await promise_rejects(t, 'InvalidAccessError', pc.getStats(sender1.track));
}, 'RTCPeerConnection.getStats(track) throws InvalidAccessError when there ' +
Expand Down
2 changes: 1 addition & 1 deletion webrtc/RTCRtpReceiver-getStats.https.html
Expand Up @@ -53,7 +53,7 @@
const stream = await getNoiseStream({audio:true});
t.add_cleanup(() => stream.getTracks().forEach(track => track.stop()));
const [track] = stream.getTracks();
callee.addTrack(track);
callee.addTrack(track, stream);

const { receiver } = caller.addTransceiver('audio');

Expand Down