Changeset 249715 in webkit

Timestamp:

Sep 10, 2019 8:27:41 AM (5 years ago)

Author:

youenn@apple.com

Message:

Audio sometimes fail to capture in WebRTC
​https://bugs.webkit.org/show_bug.cgi?id=180748
<rdar://problem/36032346>

Reviewed by Eric Carlson.

In some cases, Safari is not receiving unsuspend notifications.
In that case, the capture unit might stay in suspend state forever.
To work around that, we force to unsuspend whenever there is a new capture happening.
This will make it so that reloading the page will unsuspend the page.

Manually tested by triggering Siri, starting to use the microphone and quickly going back to a capturing page.

• platform/mediastream/mac/CoreAudioCaptureSource.cpp:

(WebCore::CoreAudioSharedUnit::provideSpeakerData):
When suspension happens, the buffer size might change.
Since this is only an issue if there are some references data, we now do not fail the capture when there
is no reference data.
(WebCore::CoreAudioSharedUnit::resume):
(WebCore::CoreAudioSharedUnit::prepareForNewCapture):
Make sure to start with a clean slate by setting suspend state to false for the shared unit.
And failing all previous sources in case we are going back from suspension.
(WebCore::CoreAudioSharedUnit::startInternal):
(WebCore::CoreAudioCaptureSourceFactory::audioCaptureDeviceManager):
(WebCore::CoreAudioCaptureSource::CoreAudioCaptureSource):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-09-10  Youenn Fablet  <youenn@apple.com>
+
+        Audio sometimes fail to capture in WebRTC
+        https://bugs.webkit.org/show_bug.cgi?id=180748
+        <rdar://problem/36032346>
+
+        Reviewed by Eric Carlson.
+
+        In some cases, Safari is not receiving unsuspend notifications.
+        In that case, the capture unit might stay in suspend state forever.
+        To work around that, we force to unsuspend whenever there is a new capture happening.
+        This will make it so that reloading the page will unsuspend the page.
+
+        Manually tested by triggering Siri, starting to use the microphone and quickly going back to a capturing page.
+
+        * platform/mediastream/mac/CoreAudioCaptureSource.cpp:
+        (WebCore::CoreAudioSharedUnit::provideSpeakerData):
+        When suspension happens, the buffer size might change.
+        Since this is only an issue if there are some references data, we now do not fail the capture when there
+        is no reference data.
+        (WebCore::CoreAudioSharedUnit::resume):
+        (WebCore::CoreAudioSharedUnit::prepareForNewCapture):
+        Make sure to start with a clean slate by setting suspend state to false for the shared unit.
+        And failing all previous sources in case we are going back from suspension.
+        (WebCore::CoreAudioSharedUnit::startInternal):
+        (WebCore::CoreAudioCaptureSourceFactory::audioCaptureDeviceManager):
+        (WebCore::CoreAudioCaptureSource::CoreAudioCaptureSource):
+
 2019-09-10  Adrian Perez de Castro  <aperez@igalia.com>
 

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

@@ -108 +108 @@
     void devicesChanged(const Vector<CaptureDevice>&);
 
+    void prepareForNewCapture();
+
 private:
     OSStatus configureSpeakerProc();
@@ -451 +453 @@
 
     if (m_speakerSampleBuffer->sampleCapacity() < inNumberFrames) {
+        if (m_activeSources.isEmpty())
+            return 0;
         RELEASE_LOG_ERROR(WebRTC, "CoreAudioSharedUnit::provideSpeakerData: speaker sample buffer size (%d) too small for amount of sample data requested (%d)!", m_speakerSampleBuffer->sampleCapacity(), (int)inNumberFrames);
+        // FIXME: This fails the capture, we should thus either reconfigure the audio unit or notify all clients that capture is failing.
         return kAudio_ParamError;
     }
@@ -630 +635 @@
 }
 
+void CoreAudioSharedUnit::prepareForNewCapture()
+{
+    if (!m_suspended)
+        return;
+    m_suspended = false;
+
+    if (!m_producingCount)
+        return;
+
+    RELEASE_LOG_ERROR(WebRTC, "CoreAudioSharedUnit::prepareForNewCapture, notifying suspended sources of capture failure");
+    captureFailed();
+}
+
 OSStatus CoreAudioSharedUnit::startInternal()
 {
@@ -648 +666 @@
     if (err) {
         RELEASE_LOG_ERROR(WebRTC, "CoreAudioSharedUnit::start(%p) AudioOutputUnitStart failed with error %d (%.4s)", this, (int)err, (char*)&err);
+        cleanupAudioUnit();
+        ASSERT(!m_ioUnit);
         return err;
     }
@@ -854 +874 @@
     , m_captureDeviceID(captureDeviceID)
 {
+#if PLATFORM(IOS_FAMILY)
+    // We ensure that we unsuspend ourselves on the constructor as a capture source
+    // is created when getUserMedia grants access which only happens when the process is foregrounded.
+    CoreAudioSharedUnit::singleton().prepareForNewCapture();
+#endif
 }
 
@@ -872 +897 @@
 
     unit.addClient(*this);
-
-#if PLATFORM(IOS_FAMILY)
-    // We ensure that we unsuspend ourselves on the constructor as a capture source
-    // is created when getUserMedia grants access which only happens when the process is foregrounded.
-    if (unit.isSuspended())
-        unit.reconfigureAudioUnit();
-#endif
 }