Bug 1528042 - Don't expose number of devices of a kind unless informa…

…tion can be exposed for that kind per w3c/mediacapture-main#900. r=karlt Differential Revision: https://phabricator.services.mozilla.com/D176925
erichdongubler-mozilla · May 26, 2023 · 27a1525 · 27a1525
1 parent a0d2333
commit 27a1525
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/dom/media/MediaDevices.cpp b/dom/media/MediaDevices.cpp
@@ -270,15 +270,15 @@ RefPtr<MediaDeviceSetRefCnt> MediaDevices::FilterExposedDevices(
         if (mCanExposeMicrophoneInfo) {
           exposedMicrophoneGroupIds.Insert(device->mRawGroupID);
         }
-        if (!DeviceInformationCanBeExposed() && !legacy) {
+        if (!mCanExposeMicrophoneInfo && !legacy) {
           dropMics = true;
         }
         break;
       case MediaDeviceKind::Videoinput:
         if (dropCams) {
           continue;
         }
-        if (!DeviceInformationCanBeExposed() && !legacy) {
+        if (!mCanExposeCameraInfo && !legacy) {
           dropCams = true;
         }
         break;

diff --git a/testing/web-platform/tests/mediacapture-streams/MediaDevices-enumerateDevices.https.html b/testing/web-platform/tests/mediacapture-streams/MediaDevices-enumerateDevices.https.html
@@ -71,9 +71,12 @@ <h1 class="instructions">Description</h1>
   const stream = await navigator.mediaDevices.getUserMedia({ audio: true });
   stream.getTracks()[0].stop();
   const devices = await navigator.mediaDevices.enumerateDevices();
-  assert_equals(devices.filter(({kind}) => kind != "audiooutput").length,
-                devices1.filter(({kind}) => kind != "audiooutput").length,
-                "same number of input devices");
+  assert_equals(devices.filter(({kind}) => kind == "videoinput").length,
+                devices1.filter(({kind}) => kind == "videoinput").length,
+                "same number of (previously exposed) videoinput devices");
+  assert_greater_than_equal(devices.filter(d => d.kind == "audioinput").length,
+                            devices1.filter(d => d.kind == "audioinput").length,
+                            "same number or more audioinput devices");
   const order = ["audioinput", "videoinput", "audiooutput"];
   for (const {kind, deviceId} of devices) {
     assert_in_array(kind, order, "expected kind");