Changeset 249154 in webkit

Timestamp:

Aug 27, 2019, 11:16:17 AM (7 years ago)

Author:

youenn@apple.com

Message:

Disabled devices should not be taken into account when searching for a capture device
​https://bugs.webkit.org/show_bug.cgi?id=201183
<rdar://problem/54353440>

Reviewed by Jer Noble.

Manually tested.

• platform/mediastream/mac/CoreAudioCaptureDeviceManager.cpp:

(WebCore::CoreAudioCaptureDeviceManager::coreAudioDeviceWithUID):
We currently keep a list of devices, some of which might be disabled.
We should not take into account disabled devices, only enabled devices
when doing this search.

• platform/mediastream/mac/CoreAudioCaptureSource.cpp:

(WebCore::CoreAudioSharedUnit::setupAudioUnit):
Improve logging.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-27  Youenn Fablet  <youenn@apple.com>
+
+        Disabled devices should not be taken into account when searching for a capture device
+        https://bugs.webkit.org/show_bug.cgi?id=201183
+        <rdar://problem/54353440>
+
+        Reviewed by Jer Noble.
+
+        Manually tested.
+
+        * platform/mediastream/mac/CoreAudioCaptureDeviceManager.cpp:
+        (WebCore::CoreAudioCaptureDeviceManager::coreAudioDeviceWithUID):
+        We currently keep a list of devices, some of which might be disabled.
+        We should not take into account disabled devices, only enabled devices
+        when doing this search.
+        * platform/mediastream/mac/CoreAudioCaptureSource.cpp:
+        (WebCore::CoreAudioSharedUnit::setupAudioUnit):
+        Improve logging.
+
 2019-08-26  Jer Noble  <jer.noble@apple.com>
 

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

@@ -151 +151 @@
 {
     for (auto& device : coreAudioCaptureDevices()) {
-        if (device.persistentId() == deviceID)
+        if (device.persistentId() == deviceID && device.enabled())
             return device;
     }

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

@@ -340 +340 @@
     err = AudioUnitSetProperty(m_ioUnit, kAudioOutputUnitProperty_CurrentDevice, kAudioUnitScope_Global, inputBus, &m_captureDeviceID, sizeof(m_captureDeviceID));
     if (err) {
-        RELEASE_LOG_ERROR(WebRTC, "CoreAudioSharedUnit::setupAudioUnit(%p) unable to set vpio unit capture device ID, error %d (%.4s)", this, (int)err, (char*)&err);
+        RELEASE_LOG_ERROR(WebRTC, "CoreAudioSharedUnit::setupAudioUnit(%p) unable to set vpio unit capture device ID %d, error %d (%.4s)", this, (int)m_captureDeviceID, (int)err, (char*)&err);
         return err;
     }