Changeset 267686 in webkit

Timestamp:

Sep 27, 2020, 1:00:50 PM (6 years ago)

Author:

Alan Coon

Message:

Cherry-pick r267530. rdar://problem/69594070

Regression(r265280) Web Audio sources malfunction when disconnected from the audio graph
​https://bugs.webkit.org/show_bug.cgi?id=216703
<rdar://problem/69158436>

Reviewed by Eric Carlson.

In case of an audio source that stops producing data, but does not end or mute the track,
we would continuously try to read the data until getting to the end of the data.
When reaching the end of the data, we would return silence and go back in time a little bit
to restart playing with some margin. This allows to read just one chunk of audio until we are back to the end of data.

We fix this by storing the end of the data counter when reaching it.
When trying to pull some more data, we will go back in time a little bit only if some more data was added in the meantime.
Otherwise, we just output silence.

Covered by manual test.

• platform/audio/mac/AudioSampleDataSource.h:
• platform/audio/mac/AudioSampleDataSource.mm: (WebCore::AudioSampleDataSource::pullSamplesInternal):

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

Location:

branches/safari-610-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/audio/mac/AudioSampleDataSource.h (modified) (1 diff)
• platform/audio/mac/AudioSampleDataSource.mm (modified) (3 diffs)

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

@@ +1 @@
+2020-09-27  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r267530. rdar://problem/69594070
+
+    Regression(r265280) Web Audio sources malfunction when disconnected from the audio graph
+    https://bugs.webkit.org/show_bug.cgi?id=216703
+    <rdar://problem/69158436>
+    
+    Reviewed by Eric Carlson.
+    
+    In case of an audio source that stops producing data, but does not end or mute the track,
+    we would continuously try to read the data until getting to the end of the data.
+    When reaching the end of the data, we would return silence and go back in time a little bit
+    to restart playing with some margin. This allows to read just one chunk of audio until we are back to the end of data.
+    
+    We fix this by storing the end of the data counter when reaching it.
+    When trying to pull some more data, we will go back in time a little bit only if some more data was added in the meantime.
+    Otherwise, we just output silence.
+    
+    Covered by manual test.
+    
+    * platform/audio/mac/AudioSampleDataSource.h:
+    * platform/audio/mac/AudioSampleDataSource.mm:
+    (WebCore::AudioSampleDataSource::pullSamplesInternal):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@267530 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-09-24  Youenn Fablet  <youenn@apple.com>
+
+            Regression(r265280) Web Audio sources malfunction when disconnected from the audio graph
+            https://bugs.webkit.org/show_bug.cgi?id=216703
+            <rdar://problem/69158436>
+
+            Reviewed by Eric Carlson.
+
+            In case of an audio source that stops producing data, but does not end or mute the track,
+            we would continuously try to read the data until getting to the end of the data.
+            When reaching the end of the data, we would return silence and go back in time a little bit
+            to restart playing with some margin. This allows to read just one chunk of audio until we are back to the end of data.
+
+            We fix this by storing the end of the data counter when reaching it.
+            When trying to pull some more data, we will go back in time a little bit only if some more data was added in the meantime.
+            Otherwise, we just output silence.
+
+            Covered by manual test.
+
+            * platform/audio/mac/AudioSampleDataSource.h:
+            * platform/audio/mac/AudioSampleDataSource.mm:
+            (WebCore::AudioSampleDataSource::pullSamplesInternal):
+
 2020-09-27  Alan Coon  <alancoon@apple.com>
 

branches/safari-610-branch/Source/WebCore/platform/audio/mac/AudioSampleDataSource.h

@@ -115 +115 @@
     bool m_muted { false };
     bool m_shouldComputeOutputSampleOffset { true };
+    uint64_t m_endFrameWhenNotEnoughData { 0 };
 
 #if !RELEASE_LOG_DISABLED

branches/safari-610-branch/Source/WebCore/platform/audio/mac/AudioSampleDataSource.mm

@@ -233 +233 @@
     if (m_shouldComputeOutputSampleOffset) {
         uint64_t buffered = endFrame - startFrame;
-        if (buffered < sampleCount * 2) {
+        if (buffered < sampleCount * 2 || (m_endFrameWhenNotEnoughData && m_endFrameWhenNotEnoughData == endFrame)) {
             AudioSampleBufferList::zeroABL(buffer, byteCount);
             sampleCount = 0;
@@ -240 +240 @@
 
         m_shouldComputeOutputSampleOffset = false;
+        m_endFrameWhenNotEnoughData = 0;
 
         m_outputSampleOffset = (endFrame - sampleCount) - timeStamp;
@@ -258 +259 @@
             // We are out of the window, let's restart the offset computation.
             m_shouldComputeOutputSampleOffset = true;
+
+            if (timeStamp >= endFrame)
+                m_endFrameWhenNotEnoughData = endFrame;
         } else {
             // We are too close from endFrame, let's back up a little bit.