Skip to content

Commit

Permalink
Support groupId constrainable properties in MediaDevices.getUserMedia()
Browse files Browse the repository at this point in the history
This CL also adds support in MediaStreamTrack.applyConstraints().

Drive-by: Minor lint fixes.

Bug: 833333
Change-Id: I8636def42d9ed64c6f58777d44343e569e541bfb
  • Loading branch information
Guido Urdaneta authored and chromium-wpt-export-bot committed May 3, 2018
1 parent 7a7d2e1 commit 7df2cbf
Show file tree
Hide file tree
Showing 2 changed files with 85 additions and 0 deletions.
28 changes: 28 additions & 0 deletions mediacapture-streams/MediaDevices-getUserMedia.https.html
Expand Up @@ -36,6 +36,34 @@ <h1 class="instructions">Description</h1>
// list.deviceId
// list.groupId
}, "mediaDevices.getUserMedia() is present on navigator");

promise_test(t => {
return navigator.mediaDevices.enumerateDevices()
.then(t.step_func(async devices => {
for (var i in devices) {
await navigator.mediaDevices.getUserMedia(
{video: {groupId: {exact: devices[i].groupId}}})
.then(
t.step_func(stream => {
var found_device = devices.find(element => {
return element.deviceId ==
stream.getTracks()[0].getSettings().deviceId;
});
assert_true(undefined !== found_device);
assert_equals(found_device.kind, "videoinput");
assert_equals(found_device.groupId, devices[i].groupId);
}),
t.step_func(error => {
assert_equals(error.name, "OverconstrainedError");
assert_equals(error.constraint, "groupId");
var found_device = devices.find(element => {
return element.kind == "videoinput" &&
element.groupId == devices[i].groupId});
assert_true(undefined === found_device);
}));
}
}));
}, 'groupId is correctly supported by getUserMedia() for video devices');
</script>
</body>
</html>
57 changes: 57 additions & 0 deletions mediacapture-streams/MediaStreamTrack-applyConstraints.https.html
@@ -0,0 +1,57 @@
<!doctype html>
<title>MediaStreamTrack applyConstraints</title>
<p class="instructions">When prompted, accept to share your video stream.</p>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script>
'use strict'

// https://w3c.github.io/mediacapture-main/#dom-mediastreamtrack-applyconstraints

promise_test(t => {
return navigator.mediaDevices.getUserMedia({ video: true })
.then(t.step_func(stream => {
return stream.getVideoTracks()[0].applyConstraints(
{ groupId: { exact: "INVALID" } }).then(
t.unreached_func('Accepted invalid groupID'),
t.step_func(e => {
assert_equals(e.name, 'OverconstrainedError');
assert_equals(e.constraint, 'groupId');
}));
}));
}, 'applyConstraints rejects invalid groupID');

promise_test(t => {
return navigator.mediaDevices.getUserMedia({ video: true })
.then(t.step_func(stream => {
var track = stream.getVideoTracks()[0];
var groupId = track.getSettings().groupId;
return track.applyConstraints({ groupId: "INVALID" }).then(
t.step_func(() => {
assert_equals(track.getSettings().groupId, groupId);
}));
}));
}, 'applyConstraints accepts invalid ideal groupID, does not change setting');

promise_test(t => {
return navigator.mediaDevices.getUserMedia({ video: true })
.then(t.step_func(stream => {
var track = stream.getVideoTracks()[0];
var groupId = track.getSettings().groupId;
return navigator.mediaDevices.enumerateDevices().then(devices => {
var anotherDevice = devices.find(device => {
return device.kind == "videoinput" && device.groupId != groupId;
});
if (anotherDevice !== undefined) {
return track.applyConstraints(
{ groupId: { exact: anotherDevice.groupId } }).then(
t.unreached_func(),
t.step_func(e => {
assert_equals(e.name, 'OverconstrainedError');
assert_equals(e.constraint, 'groupId');
}));
}
});
}));
}, 'applyConstraints rejects attempt to switch device using groupId');
</script>

0 comments on commit 7df2cbf

Please sign in to comment.