Skip to content

GitLab

T
tangled
Commit 6cca306f authored by Philipp Hancke's avatar Philipp Hancke Committed by Commit Bot
Browse files
Options

webrtc wpt: add cleanup to insertable streams worker 

following the pattern from
  https://source.chromium.org/chromium/chromium/src/+/master:third_party/blink/web_tests/http/tests/streams/transferable/worker.html

Also moves the audio/worker test to the worker file

BUG=chromium:1058021

Change-Id: I0a49166208aa5cd68a2660abed1ec5e0c52b9b3d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2499521Reviewed-by: default avatarGuido Urdaneta <guidou@chromium.org>
Commit-Queue: Philipp Hancke <philipp.hancke@googlemail.com>
Cr-Commit-Position: refs/heads/master@{#820897}
parent 66d563b8
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 50 deletions
third_party/blink/web_tests/external/wpt/webrtc-insertable-streams/RTCPeerConnection-insertable-streams-audio.https.html
View file @ 6cca306f
......@@ -162,56 +162,6 @@ promise_test(async t => {
return ontrackPromise;
}, 'RTCRtpReceiver.createEncodedStream() throws if not requested in PC configuration');
promise_test(async t => {
const caller = new RTCPeerConnection({encodedInsertableStreams:true});
t.add_cleanup(() => caller.close());
const callee = new RTCPeerConnection();
t.add_cleanup(() => callee.close());
const stream = await navigator.mediaDevices.getUserMedia({audio:true});
const track = stream.getTracks()[0];
t.add_cleanup(() => track.stop());
const sender = caller.addTrack(track)
const senderStreams = sender.createEncodedStreams();
const senderWorker = new Worker('RTCPeerConnection-sender-worker-single-frame.js')
senderWorker.postMessage(
{readableStream: senderStreams.readable},
[senderStreams.readable]);
let expectedFrameData = null;
let verifiedFrameData = false;
let numVerifiedFrames = 0;
const onmessagePromise = new Promise(resolve => {
senderWorker.onmessage = t.step_func(message => {
if (!(message.data instanceof RTCEncodedAudioFrame)) {
// This is the first message sent from the Worker to the test.
// It contains an object (not an RTCEncodedAudioFrame) with the same
// fields as the RTCEncodedAudioFrame to be sent in follow-up messages.
// These serve as expected values to validate that the
// RTCEncodedAudioFrame is sent correctly back to the test in the next
// message.
expectedFrameData = message.data;
} else {
// This is the frame sent by the Worker after reading it from the
// readable stream. The Worker sends it twice after sending the
// verification message.
assert_equals(message.data.type, expectedFrameData.type);
assert_equals(message.data.timestamp, expectedFrameData.timestamp);
assert_true(areArrayBuffersEqual(message.data.data, expectedFrameData.data));
if (++numVerifiedFrames == 2)
resolve();
}
});
});
exchangeIceCandidates(caller, callee);
await exchangeOfferAnswer(caller, callee);
return onmessagePromise;
}, 'RTCRtpSender readable stream transferred to a Worker and the Worker sends an RTCEncodedAudioFrame back');
promise_test(async t => {
const caller = new RTCPeerConnection({encodedInsertableStreams:true});
t.add_cleanup(() => caller.close());
......
third_party/blink/web_tests/external/wpt/webrtc-insertable-streams/RTCPeerConnection-insertable-streams-worker.https.html
View file @ 6cca306f
......@@ -9,6 +9,57 @@
</head>
<body>
<script>
promise_test(async t => {
const caller = new RTCPeerConnection({encodedInsertableStreams:true});
t.add_cleanup(() => caller.close());
const callee = new RTCPeerConnection();
t.add_cleanup(() => callee.close());
const stream = await navigator.mediaDevices.getUserMedia({audio:true});
const track = stream.getTracks()[0];
t.add_cleanup(() => track.stop());
const sender = caller.addTrack(track)
const senderStreams = sender.createEncodedStreams();
const senderWorker = new Worker('RTCPeerConnection-sender-worker-single-frame.js')
t.add_cleanup(() => senderWorker.terminate());
senderWorker.postMessage(
{readableStream: senderStreams.readable},
[senderStreams.readable]);
let expectedFrameData = null;
let verifiedFrameData = false;
let numVerifiedFrames = 0;
const onmessagePromise = new Promise(resolve => {
senderWorker.onmessage = t.step_func(message => {
if (!(message.data instanceof RTCEncodedAudioFrame)) {
// This is the first message sent from the Worker to the test.
// It contains an object (not an RTCEncodedAudioFrame) with the same
// fields as the RTCEncodedAudioFrame to be sent in follow-up messages.
// These serve as expected values to validate that the
// RTCEncodedAudioFrame is sent correctly back to the test in the next
// message.
expectedFrameData = message.data;
} else {
// This is the frame sent by the Worker after reading it from the
// readable stream. The Worker sends it twice after sending the
// verification message.
assert_equals(message.data.type, expectedFrameData.type);
assert_equals(message.data.timestamp, expectedFrameData.timestamp);
assert_true(areArrayBuffersEqual(message.data.data, expectedFrameData.data));
if (++numVerifiedFrames == 2)
resolve();
}
});
});
exchangeIceCandidates(caller, callee);
await exchangeOfferAnswer(caller, callee);
return onmessagePromise;
}, 'RTCRtpSender readable stream transferred to a Worker and the Worker sends an RTCEncodedAudioFrame back');
promise_test(async t => {
const caller = new RTCPeerConnection({encodedInsertableStreams:true});
t.add_cleanup(() => caller.close());
......@@ -23,6 +74,7 @@ promise_test(async t => {
const senderStreams = videoSender.createEncodedStreams();
const senderWorker = new Worker('RTCPeerConnection-sender-worker-single-frame.js')
t.add_cleanup(() => senderWorker.terminate());
senderWorker.postMessage(
{readableStream: senderStreams.readable},
[senderStreams.readable]);
......
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