Title: [216029] trunk/Source/WebCore
Revision
216029
Author
[email protected]
Date
2017-05-01 14:38:38 -0700 (Mon, 01 May 2017)

Log Message

Use AVAudioSession to enumerate audio capture devices on iOS
https://bugs.webkit.org/show_bug.cgi?id=170861
<rdar://problem/31653658>

Reviewed by Eric Carlson.

Hook up the new AVAudioSessionCaptureDeviceManager class to CoreAudioCaptureSource and to the (increasingly ill-named)
RealtimeMediaSourceCenterMac.

* platform/mediastream/mac/CoreAudioCaptureSource.cpp:
(WebCore::CoreAudioCaptureSource::create):
* platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp:
(WebCore::RealtimeMediaSourceCenterMac::setUseAVFoundationAudioCapture):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (216028 => 216029)


--- trunk/Source/WebCore/ChangeLog	2017-05-01 21:19:09 UTC (rev 216028)
+++ trunk/Source/WebCore/ChangeLog	2017-05-01 21:38:38 UTC (rev 216029)
@@ -1,3 +1,19 @@
+2017-05-01  Jer Noble  <[email protected]>
+
+        Use AVAudioSession to enumerate audio capture devices on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=170861
+        <rdar://problem/31653658>
+
+        Reviewed by Eric Carlson.
+
+        Hook up the new AVAudioSessionCaptureDeviceManager class to CoreAudioCaptureSource and to the (increasingly ill-named)
+        RealtimeMediaSourceCenterMac.
+
+        * platform/mediastream/mac/CoreAudioCaptureSource.cpp:
+        (WebCore::CoreAudioCaptureSource::create):
+        * platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp:
+        (WebCore::RealtimeMediaSourceCenterMac::setUseAVFoundationAudioCapture):
+
 2017-05-01  Joanmarie Diggs  <[email protected]>
 
         [ATK] Expose values of aria-rowcount, aria-colcount, aria-rowindex, aria-colindex, aria-rowspan, and aria-colspan as object attributes

Modified: trunk/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp (216028 => 216029)


--- trunk/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp	2017-05-01 21:19:09 UTC (rev 216028)
+++ trunk/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp	2017-05-01 21:38:38 UTC (rev 216029)
@@ -28,6 +28,8 @@
 
 #if ENABLE(MEDIA_STREAM)
 
+#include "AVAudioSessionCaptureDevice.h"
+#include "AVAudioSessionCaptureDeviceManager.h"
 #include "AudioSampleBufferList.h"
 #include "AudioSampleDataSource.h"
 #include "AudioSession.h"
@@ -67,6 +69,12 @@
 
     label = device->label();
     persistentID = device->deviceID();
+#elif PLATFORM(IOS)
+    auto device = AVAudioSessionCaptureDeviceManager::singleton().audioSessionDeviceWithUID(deviceID);
+    if (!device)
+        return nullptr;
+
+    label = device->label();
 #endif
     auto source = adoptRef(*new CoreAudioCaptureSource(deviceID, label, persistentID));
 

Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp (216028 => 216029)


--- trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp	2017-05-01 21:19:09 UTC (rev 216028)
+++ trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp	2017-05-01 21:38:38 UTC (rev 216029)
@@ -34,6 +34,7 @@
 #include "RealtimeMediaSourceCenterMac.h"
 
 #include "AVAudioCaptureSource.h"
+#include "AVAudioSessionCaptureDeviceManager.h"
 #include "AVCaptureDeviceManager.h"
 #include "AVVideoCaptureSource.h"
 #include "CoreAudioCaptureDeviceManager.h"
@@ -59,8 +60,7 @@
 #if PLATFORM(MAC)
         RealtimeMediaSourceCenter::singleton().setAudioCaptureDeviceManager(CoreAudioCaptureDeviceManager::singleton());
 #else
-        // FIXME 170861: Use AVAudioSession to enumerate audio capture devices on iOS
-        RealtimeMediaSourceCenter::singleton().setAudioCaptureDeviceManager(AVCaptureDeviceManager::singleton());
+        RealtimeMediaSourceCenter::singleton().setAudioCaptureDeviceManager(AVAudioSessionCaptureDeviceManager::singleton());
 #endif
     }
 }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to