Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-25 19:25:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1468951 [wpt PR 11526] - Update external/wpt/webrtc/RTCRtpParameters* tests., a=testonly

Browse Source 
Automatic update from web-platform-testsUpdate external/wpt/webrtc/RTCRtpParameters* tests.

This is in preparation for get/setParameters[1] and
RTCRtpTransceiver[2].

Tests are updated to use promise_test and async/await to make them
easier to write and to execute sequentially.

Tests are updated to set up a call before getParameters() because many
parameters are defined as "that has been negotiated". If we want to test
what is returned before negotiation we should add that as separate
tests. For now, this is necessary for the tests to run on [1][2].

Some tests are removed because they no longer reflect the spec.

Because get/setParameters() and RTCRtpTransceiver has not landed yet,
the tests are still expected to fail.

[1] https://chromium-review.googlesource.com/c/chromium/src/+/1102436
[2] https://chromium-review.googlesource.com/c/chromium/src/+/1025771

Bug: 803494, 777617
Change-Id: I3f14a37925837576a602d91bb67e48181c56a946
Reviewed-on: https://chromium-review.googlesource.com/1102502
Reviewed-by: Harald Alvestrand <hta@chromium.org>
Commit-Queue: Henrik Boström <hbos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#571430}

--

wpt-commits: 36fb033a4051e63a0ab4bd073fdaadf808953564
wpt-pr: 11526
This commit is contained in:
Henrik Boström 2018-07-06 23:36:07 +00:00 committed by James Graham
parent 5da6b6173a
commit 1b1d45c685
5 changed files with 117 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
testing/web-platform/meta/MANIFEST.json
View File

@ -626793,7 +626793,7 @@
"support"
],
"webrtc/RTCRtpParameters-codecs.html": [
"56f7ca6bd03087b3858c6decde1387cd4017fd3b",
"6b7827be92ec883fe87bc2c422a7fa6bb557190b",
"testharness"
],
"webrtc/RTCRtpParameters-degradationPreference.html": [
@ -626801,7 +626801,7 @@
"testharness"
],
"webrtc/RTCRtpParameters-encodings.html": [
"76d4a6dccec508ea25d8c0bc3037a25a7db3f3ac",
"27fa525156e34885a12971e722ba0efc729b8f39",
"testharness"
],
"webrtc/RTCRtpParameters-headerExtensions.html": [
@ -626809,7 +626809,7 @@
"testharness"
],
"webrtc/RTCRtpParameters-helper.js": [
"fcf16b5ae297d141b48003115905aa5bf28eab32",
"10aa220467977eaceb70e2143acbf46b6876f0d6",
"support"
],
"webrtc/RTCRtpParameters-rtcp.html": [
@ -626817,7 +626817,7 @@
"testharness"
],
"webrtc/RTCRtpParameters-transactionId.html": [
"acb3d37db30fb2d436cc130c4a47601aa38625c8",
"a48817af4be42460a1f44f39e63f292662228db8",
"testharness"
],
"webrtc/RTCRtpReceiver-getCapabilities.html": [

56
testing/web-platform/tests/webrtc/RTCRtpParameters-codecs.html
View File

@ -12,6 +12,7 @@
// https://w3c.github.io/webrtc-pc/archives/20170605/webrtc.html
// The following helper functions are called from RTCRtpParameters-helper.js:
// doOfferAnswerExchange
// validateSenderRtpParameters
/*
@ -80,10 +81,13 @@
with a newly created InvalidModificationError. Note that this also applies
to transactionId.
*/
promise_test(t => {
promise_test(async t => {
const pc = new RTCPeerConnection();
t.add_cleanup(() => pc.close());
const { sender } = pc.addTransceiver('audio');
await doOfferAnswerExchange(t, pc);
const param = sender.getParameters();
validateSenderRtpParameters(param);
@ -99,10 +103,11 @@
sender.setParameters(param));
}, 'setParameters() with codec.payloadType modified should reject with InvalidModificationError');
promise_test(t => {
promise_test(async t => {
const pc = new RTCPeerConnection();
t.add_cleanup(() => pc.close());
const { sender } = pc.addTransceiver('audio');
await doOfferAnswerExchange(t, pc);
const param = sender.getParameters();
validateSenderRtpParameters(param);
@ -118,10 +123,11 @@
sender.setParameters(param));
}, 'setParameters() with codec.mimeType modified should reject with InvalidModificationError');
promise_test(t => {
promise_test(async t => {
const pc = new RTCPeerConnection();
t.add_cleanup(() => pc.close());
const { sender } = pc.addTransceiver('audio');
await doOfferAnswerExchange(t, pc);
const param = sender.getParameters();
validateSenderRtpParameters(param);
@ -137,10 +143,11 @@
sender.setParameters(param));
}, 'setParameters() with codec.clockRate modified should reject with InvalidModificationError');
promise_test(t => {
promise_test(async t => {
const pc = new RTCPeerConnection();
t.add_cleanup(() => pc.close());
const { sender } = pc.addTransceiver('audio');
await doOfferAnswerExchange(t, pc);
const param = sender.getParameters();
validateSenderRtpParameters(param);
@ -156,11 +163,11 @@
sender.setParameters(param));
}, 'setParameters() with codec.channels modified should reject with InvalidModificationError');
promise_test(t => {
promise_test(async t => {
const pc = new RTCPeerConnection();
t.add_cleanup(() => pc.close());
const { sender } = pc.addTransceiver('audio');
await doOfferAnswerExchange(t, pc);
const param = sender.getParameters();
validateSenderRtpParameters(param);
@ -176,11 +183,11 @@
sender.setParameters(param));
}, 'setParameters() with codec.sdpFmtpLine modified should reject with InvalidModificationError');
promise_test(t => {
promise_test(async t => {
const pc = new RTCPeerConnection();
t.add_cleanup(() => pc.close());
const { sender } = pc.addTransceiver('audio');
await doOfferAnswerExchange(t, pc);
const param = sender.getParameters();
validateSenderRtpParameters(param);
@ -197,37 +204,4 @@
sender.setParameters(param));
}, 'setParameters() with new codecs inserted should reject with InvalidModificationError');
promise_test(t => {
const pc = new RTCPeerConnection();
t.add_cleanup(() => pc.close());
const { sender } = pc.addTransceiver('audio');
const param = sender.getParameters();
validateSenderRtpParameters(param);
const { codecs } = param;
// skip and pass test if there is less than 2 codecs
if(codecs.length >= 2) {
const tmp = codecs[0];
codecs[0] = codecs[1];
codecs[1] = tmp;
}
return sender.setParameters(param);
}, 'setParameters with reordered codecs should succeed');
promise_test(t => {
const pc = new RTCPeerConnection();
t.add_cleanup(() => pc.close());
const { sender } = pc.addTransceiver('audio');
const param = sender.getParameters();
validateSenderRtpParameters(param);
const { codecs } = param;
param.codecs = codecs.slice(1);
return sender.setParameters(param);
}, 'setParameters with dropped codec should succeed');
</script>

148
testing/web-platform/tests/webrtc/RTCRtpParameters-encodings.html
View File

@ -12,6 +12,7 @@
// https://w3c.github.io/webrtc-pc/archives/20170605/webrtc.html
// The following helper functions are called from RTCRtpParameters-helper.js:
// doOfferAnswerExchange
// validateSenderRtpParameters
/*
@ -114,9 +115,12 @@
Otherwise, set it to a list containing a single RTCRtpEncodingParameters
with active set to true.
*/
test(() => {
promise_test(async t => {
const pc = new RTCPeerConnection();
t.add_cleanup(() => pc.close());
const transceiver = pc.addTransceiver('audio');
await doOfferAnswerExchange(t, pc);
const param = transceiver.sender.getParameters();
validateSenderRtpParameters(param);
const { encodings } = param;
@ -125,9 +129,11 @@
assert_equals(encoding.active, true);
}, 'addTransceiver() with undefined sendEncodings should have default encoding parameter with active set to true');
test(() => {
promise_test(async t => {
const pc = new RTCPeerConnection();
t.add_cleanup(() => pc.close());
const transceiver = pc.addTransceiver('audio', { sendEncodings: [] });
await doOfferAnswerExchange(t, pc);
const param = transceiver.sender.getParameters();
validateSenderRtpParameters(param);
@ -151,8 +157,9 @@
5.2. getParameters
- encodings is set to the value of the [[send encodings]] internal slot.
*/
test(() => {
promise_test(async t => {
const pc = new RTCPeerConnection();
t.add_cleanup(() => pc.close());
const { sender } = pc.addTransceiver('audio', {
sendEncodings: [{
dtx: 'enabled',
@ -164,6 +171,7 @@
rid: 'foo'
}]
});
await doOfferAnswerExchange(t, pc);
const param = sender.getParameters();
validateSenderRtpParameters(param);
@ -190,10 +198,12 @@
with a newly created InvalidModificationError. Note that this also applies
to transactionId.
*/
promise_test(t => {
promise_test(async t => {
const pc = new RTCPeerConnection();
t.add_cleanup(() => pc.close());
const { sender } = pc.addTransceiver('audio');
await doOfferAnswerExchange(t, pc);
const param = sender.getParameters();
validateSenderRtpParameters(param);
@ -208,10 +218,12 @@
sender.setParameters(param));
}, `sender.setParameters() with mismatch number of encodings should reject with InvalidModificationError`);
promise_test(t => {
promise_test(async t => {
const pc = new RTCPeerConnection();
t.add_cleanup(() => pc.close());
const { sender } = pc.addTransceiver('audio');
await doOfferAnswerExchange(t, pc);
const param = sender.getParameters();
validateSenderRtpParameters(param);
@ -221,32 +233,11 @@
sender.setParameters(param));
}, `sender.setParameters() with encodings unset should reject with InvalidModificationError`);
promise_test(t => {
const pc = new RTCPeerConnection();
t.add_cleanup(() => pc.close());
const { sender } = pc.addTransceiver('audio');
const param = sender.getParameters();
validateSenderRtpParameters(param);
const encoding = getFirstEncoding(param);
const { ssrc } = encoding;
// ssrc may not be set since it is optional
if(ssrc === undefined) {
encoding.ssrc = 2;
} else {
// If it is set, increase the number by 1 to make it different from original
encoding.ssrc = ssrc + 1;
}
return promise_rejects(t, 'InvalidModificationError',
sender.setParameters(param));
}, `setParameters() with modified encoding.ssrc field should reject with InvalidModificationError`);
promise_test(t => {
promise_test(async t => {
const pc = new RTCPeerConnection();
t.add_cleanup(() => pc.close());
const { sender } = pc.addTransceiver('audio');
await doOfferAnswerExchange(t, pc);
const param = sender.getParameters();
validateSenderRtpParameters(param);
@ -265,34 +256,13 @@
sender.setParameters(param));
}, `setParameters() with modified encoding.rtx field should reject with InvalidModificationError`);
promise_test(t => {
const pc = new RTCPeerConnection();
t.add_cleanup(() => pc.close());
const { sender } = pc.addTransceiver('audio');
const param = sender.getParameters();
validateSenderRtpParameters(param);
const encoding = getFirstEncoding(param);
const { fec } = encoding;
if(fec === undefined) {
encoding.fec = { ssrc: 2 };
} else if(fec.ssrc === undefined) {
fec.ssrc = 2;
} else {
fec.ssrc += 1;
}
return promise_rejects(t, 'InvalidModificationError',
sender.setParameters(param));
}, `setParameters() with modified encoding.fec field should reject with InvalidModificationError`);
promise_test(t => {
promise_test(async t => {
const pc = new RTCPeerConnection();
t.add_cleanup(() => pc.close());
const { sender } = pc.addTransceiver('audio', {
sendEncodings: [{ rid: 'foo' }],
});
await doOfferAnswerExchange(t, pc);
const param = sender.getParameters();
validateSenderRtpParameters(param);
@ -311,10 +281,11 @@
value less than 1.0, abort these steps and return a promise rejected with
a newly created RangeError.
*/
promise_test(t => {
promise_test(async t => {
const pc = new RTCPeerConnection();
t.add_cleanup(() => pc.close());
const { sender } = pc.addTransceiver('audio');
await doOfferAnswerExchange(t, pc);
const param = sender.getParameters();
validateSenderRtpParameters(param);
@ -325,10 +296,11 @@
sender.setParameters(param));
}, `setParameters() with encoding.scaleResolutionDownBy field set to less than 1.0 should reject with RangeError`);
promise_test(t => {
promise_test(async t => {
const pc = new RTCPeerConnection();
t.add_cleanup(() => pc.close());
const { sender } = pc.addTransceiver('audio');
await doOfferAnswerExchange(t, pc);
const param = sender.getParameters();
validateSenderRtpParameters(param);
@ -346,52 +318,76 @@
}, `setParameters() with encoding.scaleResolutionDownBy field set to greater than 1.0 should succeed`);
// Helper function to test that modifying an encoding field should succeed
function test_modified_encoding(field, value1, value2, desc) {
promise_test(t => {
function test_modified_encoding(kind, field, value1, value2, desc) {
promise_test(async t => {
const pc = new RTCPeerConnection();
t.add_cleanup(() => pc.close());
const { sender } = pc.addTransceiver('audio', {
const { sender } = pc.addTransceiver(kind, {
sendEncodings: [{
[field]: value1
}]
});
await doOfferAnswerExchange(t, pc);
const param = sender.getParameters();
validateSenderRtpParameters(param);
const encoding = getFirstEncoding(param);
const param1 = sender.getParameters();
validateSenderRtpParameters(param1);
const encoding1 = getFirstEncoding(param1);
assert_equals(encoding[field], value1);
encoding[field] = value2;
assert_equals(encoding1[field], value1);
encoding1[field] = value2;
return sender.setParameters(param)
.then(() => {
const param = sender.getParameters();
validateSenderRtpParameters(param);
const encoding = getFirstEncoding(param);
assert_equals(encoding[field], value2);
});
}, desc);
await sender.setParameters(param1);
const param2 = sender.getParameters();
validateSenderRtpParameters(param2);
const encoding2 = getFirstEncoding(param2);
assert_equals(encoding2[field], value2);
}, desc + ' with RTCRtpTransceiverInit');
promise_test(async t => {
const pc = new RTCPeerConnection();
t.add_cleanup(() => pc.close());
const { sender } = pc.addTransceiver(kind);
await doOfferAnswerExchange(t, pc);
const initParam = sender.getParameters();
validateSenderRtpParameters(initParam);
initParam.encodings[0][field] = value1;
await sender.setParameters(initParam);
const param1 = sender.getParameters();
validateSenderRtpParameters(param1);
const encoding1 = getFirstEncoding(param1);
assert_equals(encoding1[field], value1);
encoding1[field] = value2;
await sender.setParameters(param1);
const param2 = sender.getParameters();
validateSenderRtpParameters(param2);
const encoding2 = getFirstEncoding(param2);
assert_equals(encoding2[field], value2);
}, desc + ' without RTCRtpTransceiverInit');
}
test_modified_encoding('dtx', 'enabled', 'disabled',
test_modified_encoding('audio', 'dtx', 'enabled', 'disabled',
'setParameters() with modified encoding.dtx should succeed');
test_modified_encoding('dtx', 'enabled', undefined,
test_modified_encoding('audio', 'dtx', 'enabled', undefined,
'setParameters() with unset encoding.dtx should succeed');
test_modified_encoding('active', true, false,
test_modified_encoding('audio', 'active', false, true,
'setParameters() with modified encoding.active should succeed');
test_modified_encoding('priority', 'very-low', 'high',
test_modified_encoding('audio', 'priority', 'very-low', 'high',
'setParameters() with modified encoding.priority should succeed');
test_modified_encoding('ptime', 2, 4,
test_modified_encoding('audio', 'ptime', 2, 4,
'setParameters() with modified encoding.ptime should succeed');
test_modified_encoding('maxBitrate', 2, 4,
test_modified_encoding('audio', 'maxBitrate', 10000, 20000,
'setParameters() with modified encoding.maxBitrate should succeed');
test_modified_encoding('maxBitrate', 24, 16,
test_modified_encoding('video', 'maxFramerate', 24, 16,
'setParameters() with modified encoding.maxFramerate should succeed');
</script>

13
testing/web-platform/tests/webrtc/RTCRtpParameters-helper.js
View File

@ -8,6 +8,19 @@
// This file depends on dictionary-helper.js which should
// be loaded from the main HTML file.
// An offer/answer exchange is necessary for getParameters() to have any
// negotiated parameters to return.
async function doOfferAnswerExchange(t, caller) {
const callee = new RTCPeerConnection();
t.add_cleanup(() => callee.close());
const offer = await caller.createOffer();
await caller.setLocalDescription(offer);
await callee.setRemoteDescription(offer);
const answer = await callee.createAnswer();
await callee.setLocalDescription(answer);
await caller.setRemoteDescription(answer);
}
/*
Validates the RTCRtpParameters returned from RTCRtpSender.prototype.getParameters

20
testing/web-platform/tests/webrtc/RTCRtpParameters-transactionId.html
View File

@ -12,6 +12,7 @@
// https://w3c.github.io/webrtc-pc/archives/20170605/webrtc.html
// The following helper functions are called from RTCRtpParameters-helper.js:
// doOfferAnswerExchange
// validateSenderRtpParameters
/*
@ -60,9 +61,10 @@
- transactionId is set to a new unique identifier, used to match this
getParameters call to a setParameters call that may occur later.
*/
test(() => {
promise_test(async t => {
const pc = new RTCPeerConnection();
const { sender } = pc.addTransceiver('audio');
await doOfferAnswerExchange(t, pc);
const param1 = sender.getParameters();
const param2 = sender.getParameters();
@ -83,10 +85,11 @@
with a newly created InvalidModificationError. Note that this also applies
to transactionId.
*/
promise_test(t => {
promise_test(async t => {
const pc = new RTCPeerConnection();
t.add_cleanup(() => pc.close());
const { sender } = pc.addTransceiver('audio');
await doOfferAnswerExchange(t, pc);
const param = sender.getParameters();
validateSenderRtpParameters(param);
@ -98,10 +101,11 @@
sender.setParameters(param));
}, `sender.setParameters() with transaction ID different from last getParameters() should reject with InvalidModificationError`);
promise_test(t => {
promise_test(async t => {
const pc = new RTCPeerConnection();
t.add_cleanup(() => pc.close());
const { sender } = pc.addTransceiver('audio');
await doOfferAnswerExchange(t, pc);
const param = sender.getParameters();
validateSenderRtpParameters(param);
@ -112,24 +116,26 @@
sender.setParameters(param));
}, `sender.setParameters() with transaction ID unset should reject with InvalidModificationError`);
promise_test(t => {
promise_test(async t => {
const pc = new RTCPeerConnection();
t.add_cleanup(() => pc.close());
const { sender } = pc.addTransceiver('audio');
await doOfferAnswerExchange(t, pc);
const param = sender.getParameters();
validateSenderRtpParameters(param);
return sender.setParameters(param)
.then(() =>
promise_rejects(t, 'InvalidModificationError',
promise_rejects(t, 'InvalidStateError',
sender.setParameters(param)));
}, `setParameters() twice with the same parameters should reject with InvalidModificationError`);
}, `setParameters() twice with the same parameters should reject with InvalidStateError`);
promise_test(t => {
promise_test(async t => {
const pc = new RTCPeerConnection();
t.add_cleanup(() => pc.close());
const { sender } = pc.addTransceiver('audio');
await doOfferAnswerExchange(t, pc);
const param1 = sender.getParameters();
const param2 = sender.getParameters();