Changeset 252960 in webkit

Timestamp:

Nov 30, 2019 11:07:31 AM (4 years ago)

Author:

youenn@apple.com

Message:

Update RealtimeOutgoingAudioSourceCocoa::m_writeCount when sampleRate changes
​https://bugs.webkit.org/show_bug.cgi?id=204606

Reviewed by Eric Carlson.

Source/WebCore:

Update m_writeCount to make sure our high/low buffer computation is done right.

Test: webrtc/audio-samplerate-change.html

• platform/mediastream/mac/RealtimeOutgoingAudioSourceCocoa.cpp:

(WebCore::RealtimeOutgoingAudioSourceCocoa::audioSamplesAvailable):

LayoutTests:

• webrtc/audio-samplerate-change-expected.txt: Added.
• webrtc/audio-samplerate-change.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webrtc/audio-samplerate-change-expected.txt (added)
• LayoutTests/webrtc/audio-samplerate-change.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSourceCocoa.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-11-30  youenn fablet  <youenn@apple.com>
+
+        Update RealtimeOutgoingAudioSourceCocoa::m_writeCount when sampleRate changes
+        https://bugs.webkit.org/show_bug.cgi?id=204606
+
+        Reviewed by Eric Carlson.
+
+        * webrtc/audio-samplerate-change-expected.txt: Added.
+        * webrtc/audio-samplerate-change.html: Added.
+
 2019-11-30  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-30  youenn fablet  <youenn@apple.com>
+
+        Update RealtimeOutgoingAudioSourceCocoa::m_writeCount when sampleRate changes
+        https://bugs.webkit.org/show_bug.cgi?id=204606
+
+        Reviewed by Eric Carlson.
+
+        Update m_writeCount to make sure our high/low buffer computation is done right.
+
+        Test: webrtc/audio-samplerate-change.html
+
+        * platform/mediastream/mac/RealtimeOutgoingAudioSourceCocoa.cpp:
+        (WebCore::RealtimeOutgoingAudioSourceCocoa::audioSamplesAvailable):
+
 2019-11-30  Antti Koivisto  <antti@apple.com>
 

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

@@ -92 +92 @@
 {
     if (m_inputStreamDescription != streamDescription) {
+        if (m_writeCount && m_inputStreamDescription.sampleRate()) {
+            // Update m_writeCount to be valid according the new sampleRate.
+            m_writeCount = (m_writeCount * streamDescription.sampleRate()) / m_inputStreamDescription.sampleRate();
+        }
+
         m_inputStreamDescription = toCAAudioStreamDescription(streamDescription);
         auto status  = m_sampleConverter->setInputFormat(m_inputStreamDescription);
@@ -111 +116 @@
     }
 
-    // If we change the audio track or its sample rate changes, the timestamp based on m_writeCount may be wrong.
-    // FIXME: We should update m_writeCount to be valid according the new sampleRate.
     m_sampleConverter->pushSamples(MediaTime(m_writeCount, static_cast<uint32_t>(m_inputStreamDescription.sampleRate())), audioData, sampleCount);
     m_writeCount += sampleCount;