Changeset 294839 in webkit

Timestamp:

May 25, 2022, 4:49:37 PM (4 years ago)

Author:

Alan Coon

Message:

Cherry-pick r293728. rdar://problem/92362769

Fix buggy assert in CoreAudioSharedUnit::configureSpeakerProc
​https://bugs.webkit.org/show_bug.cgi?id=240001

Reviewed by Eric Carlson.

Manually tested.

• platform/mediastream/mac/CoreAudioCaptureSource.cpp: Initialize the sampleRate field before using it.

Canonical link: ​https://commits.webkit.org/250216@main
git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@293728 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-613-branch/Source/WebCore

Files:

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

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

@@ +1 @@
+2022-05-19  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r293728. rdar://problem/92362769
+
+    Fix buggy assert in CoreAudioSharedUnit::configureSpeakerProc
+    https://bugs.webkit.org/show_bug.cgi?id=240001
+    
+    Reviewed by Eric Carlson.
+    
+    Manually tested.
+    
+    * platform/mediastream/mac/CoreAudioCaptureSource.cpp:
+    Initialize the sampleRate field before using it.
+    
+    Canonical link: https://commits.webkit.org/250216@main
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@293728 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2022-05-03  Youenn Fablet  <youenn@apple.com>
+
+            Fix buggy assert in CoreAudioSharedUnit::configureSpeakerProc
+            https://bugs.webkit.org/show_bug.cgi?id=240001
+
+            Reviewed by Eric Carlson.
+
+            Manually tested.
+
+            * platform/mediastream/mac/CoreAudioCaptureSource.cpp:
+            Initialize the sampleRate field before using it.
+
 2022-05-19  Alan Coon  <alancoon@apple.com>
 

branches/safari-613-branch/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp

@@ -347 +347 @@
         Locker locker { m_speakerSamplesProducerLock };
         if (m_speakerSamplesProducer) {
+            speakerProcFormat = m_speakerSamplesProducer->format().streamDescription();
             ASSERT(speakerProcFormat.mSampleRate == sampleRate);
-            speakerProcFormat = m_speakerSamplesProducer->format().streamDescription();
         } else {
             err = PAL::AudioUnitGetProperty(m_ioUnit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, outputBus, &speakerProcFormat, &size);