Changeset 249238 in webkit

Timestamp:

Aug 28, 2019, 10:57:06 PM (7 years ago)

Author:

Kocsen Chung

Message:

Cherry-pick r249154. rdar://problem/54775050

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.

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@249154 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-608-branch/Source/WebCore

Files:

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

branches/safari-608-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-28  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r249154. rdar://problem/54775050
+
+    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.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@249154 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    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-27  Alan Coon  <alancoon@apple.com>
 

branches/safari-608-branch/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureDeviceManager.cpp

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

branches/safari-608-branch/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;
     }