Title: [294839] branches/safari-613-branch/Source/WebCore
- Revision
- 294839
- Author
- [email protected]
- Date
- 2022-05-25 16:49:37 -0700 (Wed, 25 May 2022)
Log 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
Modified Paths
Diff
Modified: branches/safari-613-branch/Source/WebCore/ChangeLog (294838 => 294839)
--- branches/safari-613-branch/Source/WebCore/ChangeLog 2022-05-25 23:49:33 UTC (rev 294838)
+++ branches/safari-613-branch/Source/WebCore/ChangeLog 2022-05-25 23:49:37 UTC (rev 294839)
@@ -1,5 +1,34 @@
2022-05-19 Alan Coon <[email protected]>
+ 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 <[email protected]>
+
+ 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 <[email protected]>
+
Cherry-pick r293664. rdar://problem/92362769
VPIO requires the same sample rate for microphone and speaker formats
Modified: branches/safari-613-branch/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp (294838 => 294839)
--- branches/safari-613-branch/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp 2022-05-25 23:49:33 UTC (rev 294838)
+++ branches/safari-613-branch/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp 2022-05-25 23:49:37 UTC (rev 294839)
@@ -346,8 +346,8 @@
{
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);
if (err) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
