Changeset 251992 in webkit

Timestamp:

Nov 4, 2019 8:42:31 AM (4 years ago)

Author:

eric.carlson@apple.com

Message:

enumerateDevices() doesn't return correct list of devices after device was changed by user in a system preferences
​https://bugs.webkit.org/show_bug.cgi?id=203407
<rdar://problem/56648063>

Reviewed by Youenn Fablet.

Tested manually as this doesn't reproduce with mock capture devices.

• platform/mediastream/mac/CoreAudioCaptureDeviceManager.cpp:

(WebCore::CoreAudioCaptureDeviceManager::coreAudioCaptureDevices): Refresh the list of capture
devices when the default input device changes.
(WebCore::CoreAudioCaptureDeviceManager::refreshAudioCaptureDevices): Assert if not called
on the main thread.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mediastream/mac/CoreAudioCaptureDeviceManager.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-04  Eric Carlson  <eric.carlson@apple.com>
+
+        enumerateDevices() doesn't return correct list of devices after device was changed by user in a system preferences
+        https://bugs.webkit.org/show_bug.cgi?id=203407
+        <rdar://problem/56648063>
+
+        Reviewed by Youenn Fablet.
+
+        Tested manually as this doesn't reproduce with mock capture devices.
+
+        * platform/mediastream/mac/CoreAudioCaptureDeviceManager.cpp:
+        (WebCore::CoreAudioCaptureDeviceManager::coreAudioCaptureDevices): Refresh the list of capture
+        devices when the default input device changes.
+        (WebCore::CoreAudioCaptureDeviceManager::refreshAudioCaptureDevices): Assert if not called
+        on the main thread.
+
 2019-11-04  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureDeviceManager.cpp

@@ -37 +37 @@
 #include <pal/spi/cf/CoreAudioSPI.h>
 #include <wtf/Assertions.h>
+#include <wtf/MainThread.h>
 #include <wtf/NeverDestroyed.h>
 
@@ -123 +124 @@
 
         auto listener = ^(UInt32 count, const AudioObjectPropertyAddress properties[]) {
-            for (UInt32 i = 0; i < count; ++i) {
-                const AudioObjectPropertyAddress& property = properties[i];
-
-                if (property.mSelector != kAudioHardwarePropertyDevices)
-                    continue;
-
+            bool notify = false;
+            for (UInt32 i = 0; i < count; ++i)
+                notify |= (properties[i].mSelector == kAudioHardwarePropertyDevices || properties[i].mSelector == kAudioHardwarePropertyDefaultInputDevice);
+
+            if (notify)
                 CoreAudioCaptureDeviceManager::singleton().refreshAudioCaptureDevices(NotifyIfDevicesHaveChanged::Notify);
-                return;
-            }
         };
 
@@ -159 +157 @@
 void CoreAudioCaptureDeviceManager::refreshAudioCaptureDevices(NotifyIfDevicesHaveChanged notify)
 {
+    ASSERT(isMainThread());
+
     AudioObjectPropertyAddress address = { kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
     UInt32 dataSize = 0;