Changeset 251356 in webkit

Timestamp:

Oct 20, 2019 5:44:32 PM (5 years ago)

Author:

bshafiei@apple.com

Message:

Cherry-pick r251188. rdar://problem/56340816

WebAudioSourceProviderAVFObjC::provideInput should set its WebAudioBufferList parameters correctly
​https://bugs.webkit.org/show_bug.cgi?id=202930
<rdar://problem/56006776>

Reviewed by Eric Carlson.

Source/WebCore:

There is a time where the bus channel number and audio source channel numbers may be different.
In case the bus channel number is less than the audio source channel number, initialization of
the WebAudioBufferList might not be fully done.
In that case, output silence and return early.
Reduce the number of frames to process based on the number of frames the output audio bus plans to process.

Partially covered by new API test (this a race so we cannot reproduce the crash easily).

• Modules/webaudio/MediaStreamAudioSourceNode.cpp: (WebCore::MediaStreamAudioSourceNode::process): Make sure to process the number of frames the output bus expect.
• platform/mediastream/mac/WebAudioSourceProviderAVFObjC.mm: (WebCore::WebAudioSourceProviderAVFObjC::provideInput):

Tools:

Add a test that has an audio track that goes from 1 to 2 channels while being piped to a WebAudio pipeline.

• TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
• TestWebKitAPI/Tests/WebKit/GetUserMedia.mm: (-[GUMMessageHandler userContentController:didReceiveScriptMessage:]): (TestWebKitAPI::TEST):
• TestWebKitAPI/Tests/WebKit/getUserMedia-webaudio.html: Added.

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

Location:

branches/safari-608-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/webaudio/MediaStreamAudioSourceNode.cpp (modified) (1 diff)
• platform/mediastream/mac/WebAudioSourceProviderAVFObjC.mm (modified) (2 diffs)

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

@@ +1 @@
+2019-10-20  Babak Shafiei  <bshafiei@apple.com>
+
+        Cherry-pick r251188. rdar://problem/56340816
+
+    WebAudioSourceProviderAVFObjC::provideInput should set its WebAudioBufferList parameters correctly
+    https://bugs.webkit.org/show_bug.cgi?id=202930
+    <rdar://problem/56006776>
+    
+    Reviewed by Eric Carlson.
+    
+    Source/WebCore:
+    
+    There is a time where the bus channel number and audio source channel numbers may be different.
+    In case the bus channel number is less than the audio source channel number, initialization of
+    the WebAudioBufferList might not be fully done.
+    In that case, output silence and return early.
+    Reduce the number of frames to process based on the number of frames the output audio bus plans to process.
+    
+    Partially covered by new API test (this a race so we cannot reproduce the crash easily).
+    
+    * Modules/webaudio/MediaStreamAudioSourceNode.cpp:
+    (WebCore::MediaStreamAudioSourceNode::process):
+    Make sure to process the number of frames the output bus expect.
+    * platform/mediastream/mac/WebAudioSourceProviderAVFObjC.mm:
+    (WebCore::WebAudioSourceProviderAVFObjC::provideInput):
+    
+    Tools:
+    
+    Add a test that has an audio track that goes from 1 to 2 channels while being piped to a WebAudio pipeline.
+    
+    * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+    * TestWebKitAPI/Tests/WebKit/GetUserMedia.mm:
+    (-[GUMMessageHandler userContentController:didReceiveScriptMessage:]):
+    (TestWebKitAPI::TEST):
+    * TestWebKitAPI/Tests/WebKit/getUserMedia-webaudio.html: Added.
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@251188 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-10-16  Youenn Fablet  <youenn@apple.com>
+
+            WebAudioSourceProviderAVFObjC::provideInput should set its WebAudioBufferList parameters correctly
+            https://bugs.webkit.org/show_bug.cgi?id=202930
+            <rdar://problem/56006776>
+
+            Reviewed by Eric Carlson.
+
+            There is a time where the bus channel number and audio source channel numbers may be different.
+            In case the bus channel number is less than the audio source channel number, initialization of
+            the WebAudioBufferList might not be fully done.
+            In that case, output silence and return early.
+            Reduce the number of frames to process based on the number of frames the output audio bus plans to process.
+
+            Partially covered by new API test (this a race so we cannot reproduce the crash easily).
+
+            * Modules/webaudio/MediaStreamAudioSourceNode.cpp:
+            (WebCore::MediaStreamAudioSourceNode::process):
+            Make sure to process the number of frames the output bus expect.
+            * platform/mediastream/mac/WebAudioSourceProviderAVFObjC.mm:
+            (WebCore::WebAudioSourceProviderAVFObjC::provideInput):
+
 2019-10-20  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-608-branch/Source/WebCore/Modules/webaudio/MediaStreamAudioSourceNode.cpp

@@ -132 +132 @@
     }
 
+    if (numberOfFrames > outputBus->length())
+        numberOfFrames = outputBus->length();
+
     if (m_multiChannelResampler.get()) {
         ASSERT(m_sourceSampleRate != sampleRate());

branches/safari-608-branch/Source/WebCore/platform/mediastream/mac/WebAudioSourceProviderAVFObjC.mm

@@ -80 +80 @@
 
     WebAudioBufferList list { m_outputDescription.value() };
+    if (bus->numberOfChannels() < list.bufferCount()) {
+        bus->zero();
+        return;
+    }
+
     for (unsigned i = 0; i < bus->numberOfChannels(); ++i) {
-        AudioChannel& channel = *bus->channel(i);
+        auto& channel = *bus->channel(i);
         if (i >= list.bufferCount()) {
             channel.zero();
@@ -92 +97 @@
     }
 
+    ASSERT(framesToProcess <= bus->length());
     m_dataSource->pullSamples(*list.list(), framesToProcess, m_readCount, 0, AudioSampleDataSource::Copy);
     m_readCount += framesToProcess;