fix: filter {video|audio} devices by eligible device id

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
electron · jkleinsc · Feb 29, 2024 · Feb 29, 2024 · Feb 29, 2024 · Feb 29, 2024
commit 47c195f61b9f76b548512acdf73c4e4cc4ce6891
diff --git a/shell/browser/media/media_capture_devices_dispatcher.cc b/shell/browser/media/media_capture_devices_dispatcher.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE-CHROMIUM file.
 
 #include "shell/browser/media/media_capture_devices_dispatcher.h"
-// #include "base/no_destructor.h"
-#include "base/logging.h"
+
+#include "components/webrtc/media_stream_devices_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/media_capture_devices.h"
 
@@ -51,16 +51,32 @@ const std::optional<blink::MediaStreamDevice>
 MediaCaptureDevicesDispatcher::GetPreferredAudioDeviceForBrowserContext(
     content::BrowserContext* browser_context,
     const std::vector<std::string>& eligible_audio_device_ids) const {
-  const auto& devices = GetAudioCaptureDevices();
-  return devices.empty() ? std::nullopt : std::make_optional(devices.front());
+  auto audio_devices = GetAudioCaptureDevices();
+  if (!eligible_audio_device_ids.empty()) {
+    audio_devices =
+        webrtc::FilterMediaDevices(audio_devices, eligible_audio_device_ids);
+  }
+
+  if (audio_devices.empty())
+    return std::nullopt;
+
+  return audio_devices.front();
 }
 
 const std::optional<blink::MediaStreamDevice>
 MediaCaptureDevicesDispatcher::GetPreferredVideoDeviceForBrowserContext(
     content::BrowserContext* browser_context,
     const std::vector<std::string>& eligible_video_device_ids) const {
-  const auto& devices = GetVideoCaptureDevices();
-  return devices.empty() ? std::nullopt : std::make_optional(devices.front());
+  auto video_devices = GetVideoCaptureDevices();
+  if (!eligible_video_device_ids.empty()) {
+    video_devices =
+        webrtc::FilterMediaDevices(video_devices, eligible_video_device_ids);
+  }
+
+  if (video_devices.empty())
+    return std::nullopt;
+
+  return video_devices.front();
 }
 
 }  // namespace electron