mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-28 12:45:27 +00:00
Bug 1219711 - Remove fakeness from webrtc tests. r=jib
--HG-- extra : commitid : ACLnd4zWe6Y extra : rebase_source : ebd721157d80959d6946966508e98bd9eb382ca9
This commit is contained in:
parent
3affebad3f
commit
bba51fc7ab
@ -20,7 +20,6 @@ function identityPcTest(remoteOptions) {
|
|||||||
}], [remoteOptions || {
|
}], [remoteOptions || {
|
||||||
audio: true,
|
audio: true,
|
||||||
video: true,
|
video: true,
|
||||||
fake: true,
|
|
||||||
peerIdentity: id1
|
peerIdentity: id1
|
||||||
}]);
|
}]);
|
||||||
test.pcLocal.setIdentityProvider('test1.example.com', 'idp.js');
|
test.pcLocal.setIdentityProvider('test1.example.com', 'idp.js');
|
||||||
|
@ -20,8 +20,7 @@ function theTest() {
|
|||||||
// side is isolated anyway.
|
// side is isolated anyway.
|
||||||
identityPcTest({
|
identityPcTest({
|
||||||
audio: true,
|
audio: true,
|
||||||
video: true,
|
video: true
|
||||||
fake: true
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
runNetworkTest(theTest);
|
runNetworkTest(theTest);
|
||||||
|
@ -46,27 +46,24 @@ runTest(() =>
|
|||||||
.then(() => mustSucceed("unknown plain deviceId on video",
|
.then(() => mustSucceed("unknown plain deviceId on video",
|
||||||
() => navigator.mediaDevices.getUserMedia({
|
() => navigator.mediaDevices.getUserMedia({
|
||||||
video: { deviceId: "unknown9qHr8B0JIbcHlbl9xR+jMbZZ8WyoPfpCXPfc=" },
|
video: { deviceId: "unknown9qHr8B0JIbcHlbl9xR+jMbZZ8WyoPfpCXPfc=" },
|
||||||
fake: true,
|
|
||||||
})))
|
})))
|
||||||
.then(() => mustSucceed("unknown plain deviceId on audio",
|
.then(() => mustSucceed("unknown plain deviceId on audio",
|
||||||
() => navigator.mediaDevices.getUserMedia({
|
() => navigator.mediaDevices.getUserMedia({
|
||||||
audio: { deviceId: "unknown9qHr8B0JIbcHlbl9xR+jMbZZ8WyoPfpCXPfc=" },
|
audio: { deviceId: "unknown9qHr8B0JIbcHlbl9xR+jMbZZ8WyoPfpCXPfc=" },
|
||||||
fake: true,
|
|
||||||
})))
|
})))
|
||||||
.then(() => mustFailWith("unknown exact deviceId on video",
|
.then(() => mustFailWith("unknown exact deviceId on video",
|
||||||
"OverconstrainedError", "deviceId",
|
"OverconstrainedError", "deviceId",
|
||||||
() => navigator.mediaDevices.getUserMedia({
|
() => navigator.mediaDevices.getUserMedia({
|
||||||
video: { deviceId: { exact: "unknown9qHr8B0JIbcHlbl9xR+jMbZZ8WyoPfpCXPfc=" } },
|
video: { deviceId: { exact: "unknown9qHr8B0JIbcHlbl9xR+jMbZZ8WyoPfpCXPfc=" } },
|
||||||
fake: true,
|
|
||||||
})))
|
})))
|
||||||
.then(() => mustFailWith("unknown exact deviceId on audio",
|
.then(() => mustFailWith("unknown exact deviceId on audio",
|
||||||
"OverconstrainedError", "deviceId",
|
"OverconstrainedError", "deviceId",
|
||||||
() => navigator.mediaDevices.getUserMedia({
|
() => navigator.mediaDevices.getUserMedia({
|
||||||
audio: { deviceId: { exact: "unknown9qHr8B0JIbcHlbl9xR+jMbZZ8WyoPfpCXPfc=" } },
|
audio: { deviceId: { exact: "unknown9qHr8B0JIbcHlbl9xR+jMbZZ8WyoPfpCXPfc=" } },
|
||||||
fake: true,
|
|
||||||
})))
|
})))
|
||||||
// Check the special case of no devices found (these prefs override fake).
|
// Check the special case of no devices found.
|
||||||
.then(() => pushPrefs(["media.audio_loopback_dev", "none"],
|
.then(() => pushPrefs(["media.navigator.streams.fake", false],
|
||||||
|
["media.audio_loopback_dev", "none"],
|
||||||
["media.video_loopback_dev", "none"]))
|
["media.video_loopback_dev", "none"]))
|
||||||
.then(() => navigator.mediaDevices.enumerateDevices())
|
.then(() => navigator.mediaDevices.enumerateDevices())
|
||||||
.then(devices => ok(devices.length === 0, "No devices found")));
|
.then(devices => ok(devices.length === 0, "No devices found")));
|
||||||
|
@ -25,8 +25,11 @@
|
|||||||
var testVideo = createMediaElement('video', 'testVideo');
|
var testVideo = createMediaElement('video', 'testVideo');
|
||||||
|
|
||||||
return Promise.resolve()
|
return Promise.resolve()
|
||||||
.then(() => getUserMedia({ video: { mediaSource: "browser",
|
.then(() => getUserMedia({
|
||||||
scrollWithPage: true } }))
|
video: { mediaSource: "browser",
|
||||||
|
scrollWithPage: true },
|
||||||
|
fake: false
|
||||||
|
}))
|
||||||
.then(stream => {
|
.then(stream => {
|
||||||
var playback = new LocalMediaStreamPlayback(testVideo, stream);
|
var playback = new LocalMediaStreamPlayback(testVideo, stream);
|
||||||
return playback.playMediaWithDeprecatedStreamStop(false);
|
return playback.playMediaWithDeprecatedStreamStop(false);
|
||||||
@ -38,7 +41,8 @@
|
|||||||
viewportOffsetY: 0,
|
viewportOffsetY: 0,
|
||||||
viewportWidth: 100,
|
viewportWidth: 100,
|
||||||
viewportHeight: 100
|
viewportHeight: 100
|
||||||
}
|
},
|
||||||
|
fake: false
|
||||||
}))
|
}))
|
||||||
.then(stream => {
|
.then(stream => {
|
||||||
var playback = new LocalMediaStreamPlayback(testVideo, stream);
|
var playback = new LocalMediaStreamPlayback(testVideo, stream);
|
||||||
|
@ -16,16 +16,13 @@ createHTML({ title: "Test getUserMedia constraints", bug: "882145" });
|
|||||||
var tests = [
|
var tests = [
|
||||||
// Each test here tests a different constraint or codepath.
|
// Each test here tests a different constraint or codepath.
|
||||||
{ message: "unknown required constraint on video ignored",
|
{ message: "unknown required constraint on video ignored",
|
||||||
constraints: { video: { somethingUnknown: { exact: 0 } },
|
constraints: { video: { somethingUnknown: { exact: 0 } } },
|
||||||
fake: true },
|
|
||||||
error: null },
|
error: null },
|
||||||
{ message: "unknown required constraint on audio ignored",
|
{ message: "unknown required constraint on audio ignored",
|
||||||
constraints: { audio: { somethingUnknown: { exact: 0 } },
|
constraints: { audio: { somethingUnknown: { exact: 0 } } },
|
||||||
fake: true },
|
|
||||||
error: null },
|
error: null },
|
||||||
{ message: "audio overconstrained by facingMode ignored",
|
{ message: "audio overconstrained by facingMode ignored",
|
||||||
constraints: { audio: { facingMode: { exact: 'left' } },
|
constraints: { audio: { facingMode: { exact: 'left' } } },
|
||||||
fake: true },
|
|
||||||
error: null },
|
error: null },
|
||||||
{ message: "full screensharing requires permission",
|
{ message: "full screensharing requires permission",
|
||||||
constraints: { video: { mediaSource: 'screen' } },
|
constraints: { video: { mediaSource: 'screen' } },
|
||||||
@ -51,8 +48,7 @@ var tests = [
|
|||||||
constraints: { },
|
constraints: { },
|
||||||
error: "NotSupportedError" },
|
error: "NotSupportedError" },
|
||||||
{ message: "Success-path: optional video facingMode + audio ignoring facingMode",
|
{ message: "Success-path: optional video facingMode + audio ignoring facingMode",
|
||||||
constraints: { fake: true,
|
constraints: { audio: { mediaSource: 'microphone',
|
||||||
audio: { mediaSource: 'microphone',
|
|
||||||
facingMode: 'left',
|
facingMode: 'left',
|
||||||
foo: 0,
|
foo: 0,
|
||||||
advanced: [{ facingMode: 'environment' },
|
advanced: [{ facingMode: 'environment' },
|
||||||
@ -66,7 +62,7 @@ var tests = [
|
|||||||
{ bar: 0 }] } },
|
{ bar: 0 }] } },
|
||||||
error: null },
|
error: null },
|
||||||
{ message: "legacy facingMode ignored",
|
{ message: "legacy facingMode ignored",
|
||||||
constraints: { video: { mandatory: { facingMode: 'left' } }, fake: true },
|
constraints: { video: { mandatory: { facingMode: 'left' } } },
|
||||||
error: null },
|
error: null },
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ createHTML({
|
|||||||
});
|
});
|
||||||
function theTest() {
|
function theTest() {
|
||||||
function testPeerIdentityConstraint(withConstraint) {
|
function testPeerIdentityConstraint(withConstraint) {
|
||||||
var config = { audio: true, video: true, fake: true };
|
var config = { audio: true, video: true };
|
||||||
if (withConstraint) {
|
if (withConstraint) {
|
||||||
config.peerIdentity = 'user@example.com';
|
config.peerIdentity = 'user@example.com';
|
||||||
}
|
}
|
||||||
|
@ -65,7 +65,7 @@ runNetworkTest(function() {
|
|||||||
is(v2.currentTime, 0, "v2.currentTime is zero at outset");
|
is(v2.currentTime, 0, "v2.currentTime is zero at outset");
|
||||||
|
|
||||||
// not testing legacy gUM here
|
// not testing legacy gUM here
|
||||||
navigator.mediaDevices.getUserMedia({ fake: true, video: true, audio: true })
|
navigator.mediaDevices.getUserMedia({ video: true, audio: true })
|
||||||
.then(stream => pc1.addStream(v1.mozSrcObject = stream))
|
.then(stream => pc1.addStream(v1.mozSrcObject = stream))
|
||||||
.then(() => pcall(pc1, pc1.createOffer))
|
.then(() => pcall(pc1, pc1.createOffer))
|
||||||
.then(offer => pcall(pc1, pc1.setLocalDescription, offer))
|
.then(offer => pcall(pc1, pc1.setLocalDescription, offer))
|
||||||
|
@ -36,7 +36,7 @@
|
|||||||
|
|
||||||
is(v2.currentTime, 0, "v2.currentTime is zero at outset");
|
is(v2.currentTime, 0, "v2.currentTime is zero at outset");
|
||||||
|
|
||||||
navigator.mediaDevices.getUserMedia({ fake: true, video: true, audio: true })
|
navigator.mediaDevices.getUserMedia({ video: true, audio: true })
|
||||||
.then(stream => pc1.addStream(v1.srcObject = stream))
|
.then(stream => pc1.addStream(v1.srcObject = stream))
|
||||||
.then(() => pc1.createOffer({})) // check that createOffer accepts arg.
|
.then(() => pc1.createOffer({})) // check that createOffer accepts arg.
|
||||||
.then(offer => pc1.setLocalDescription(offer))
|
.then(offer => pc1.setLocalDescription(offer))
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
|
|
||||||
var newTrack;
|
var newTrack;
|
||||||
var audiotrack;
|
var audiotrack;
|
||||||
return navigator.mediaDevices.getUserMedia({video:true, audio:true, fake:true})
|
return navigator.mediaDevices.getUserMedia({video:true, audio:true})
|
||||||
.then(newStream => {
|
.then(newStream => {
|
||||||
window.grip = newStream;
|
window.grip = newStream;
|
||||||
newTrack = newStream.getVideoTracks()[0];
|
newTrack = newStream.getVideoTracks()[0];
|
||||||
@ -112,7 +112,8 @@
|
|||||||
|
|
||||||
var sourceNode = test.audioCtx.createOscillator();
|
var sourceNode = test.audioCtx.createOscillator();
|
||||||
sourceNode.type = 'sine';
|
sourceNode.type = 'sine';
|
||||||
// We need a frequency not too close to the fake audio track (1kHz).
|
// We need a frequency not too close to the fake audio track
|
||||||
|
// (440Hz for loopback devices, 1kHz for fake tracks).
|
||||||
sourceNode.frequency.value = 2000;
|
sourceNode.frequency.value = 2000;
|
||||||
sourceNode.start();
|
sourceNode.start();
|
||||||
|
|
||||||
@ -157,7 +158,7 @@
|
|||||||
is(e.name, "InvalidParameterError",
|
is(e.name, "InvalidParameterError",
|
||||||
"addTrack existing track should fail");
|
"addTrack existing track should fail");
|
||||||
}
|
}
|
||||||
return navigator.mediaDevices.getUserMedia({video:true, fake: true})
|
return navigator.mediaDevices.getUserMedia({video:true})
|
||||||
.then(differentStream => {
|
.then(differentStream => {
|
||||||
var track = differentStream.getVideoTracks()[0];
|
var track = differentStream.getVideoTracks()[0];
|
||||||
try {
|
try {
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
var oldstream = test.pcLocal._pc.getLocalStreams()[0];
|
var oldstream = test.pcLocal._pc.getLocalStreams()[0];
|
||||||
var oldtrack = oldstream.getVideoTracks()[0];
|
var oldtrack = oldstream.getVideoTracks()[0];
|
||||||
var sender = test.pcLocal._pc.getSenders()[0];
|
var sender = test.pcLocal._pc.getSenders()[0];
|
||||||
return navigator.mediaDevices.getUserMedia({video:true, fake:true})
|
return navigator.mediaDevices.getUserMedia({video:true})
|
||||||
.then(newstream => {
|
.then(newstream => {
|
||||||
var newtrack = newstream.getVideoTracks()[0];
|
var newtrack = newstream.getVideoTracks()[0];
|
||||||
return test.pcLocal.senderReplaceTrack(0, newtrack, newstream.id);
|
return test.pcLocal.senderReplaceTrack(0, newtrack, newstream.id);
|
||||||
|
@ -48,7 +48,7 @@ runNetworkTest(function () {
|
|||||||
pc2 = new RTCPeerConnection();
|
pc2 = new RTCPeerConnection();
|
||||||
|
|
||||||
// Test success callbacks (happy path)
|
// Test success callbacks (happy path)
|
||||||
navigator.mozGetUserMedia({video:true, fake: true}, function(video1) {
|
navigator.mozGetUserMedia({video:true}, function(video1) {
|
||||||
pc1.addStream(video1);
|
pc1.addStream(video1);
|
||||||
pc1.createOffer(function(offer) {
|
pc1.createOffer(function(offer) {
|
||||||
pc1.setLocalDescription(offer, function() {
|
pc1.setLocalDescription(offer, function() {
|
||||||
|
Loading…
Reference in New Issue
Block a user