Title: [280730] branches/safari-612.1.27.0-branch/Source/WebKit
- Revision
- 280730
- Author
- alanc...@apple.com
- Date
- 2021-08-06 12:02:32 -0700 (Fri, 06 Aug 2021)
Log Message
Cherry-pick r280722. rdar://problem/81618758
REGRESSION: ASSERTION FAILED: !DeprecatedGlobalSettings::shouldManageAudioSessionCategory() || AudioSession::sharedSession().category() == AudioSession::CategoryType::PlayAndRecord
https://bugs.webkit.org/show_bug.cgi?id=228847
<rdar://problem/81587101>
Reviewed by Jer Noble.
No new tests, fixes a crashing test.
* UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp:
(WebKit::UserMediaCaptureManagerProxy::SourceProxy::audioUnitWillStart): Restore.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280722 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612.1.27.0-branch/Source/WebKit/ChangeLog (280729 => 280730)
--- branches/safari-612.1.27.0-branch/Source/WebKit/ChangeLog 2021-08-06 18:24:12 UTC (rev 280729)
+++ branches/safari-612.1.27.0-branch/Source/WebKit/ChangeLog 2021-08-06 19:02:32 UTC (rev 280730)
@@ -1,3 +1,34 @@
+2021-08-06 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r280722. rdar://problem/81618758
+
+ REGRESSION: ASSERTION FAILED: !DeprecatedGlobalSettings::shouldManageAudioSessionCategory() || AudioSession::sharedSession().category() == AudioSession::CategoryType::PlayAndRecord
+ https://bugs.webkit.org/show_bug.cgi?id=228847
+ <rdar://problem/81587101>
+
+ Reviewed by Jer Noble.
+
+ No new tests, fixes a crashing test.
+
+ * UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp:
+ (WebKit::UserMediaCaptureManagerProxy::SourceProxy::audioUnitWillStart): Restore.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280722 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-08-06 Eric Carlson <eric.carl...@apple.com>
+
+ REGRESSION: ASSERTION FAILED: !DeprecatedGlobalSettings::shouldManageAudioSessionCategory() || AudioSession::sharedSession().category() == AudioSession::CategoryType::PlayAndRecord
+ https://bugs.webkit.org/show_bug.cgi?id=228847
+ <rdar://problem/81587101>
+
+ Reviewed by Jer Noble.
+
+ No new tests, fixes a crashing test.
+
+ * UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp:
+ (WebKit::UserMediaCaptureManagerProxy::SourceProxy::audioUnitWillStart): Restore.
+
2021-08-06 Russell Epstein <repst...@apple.com>
Cherry-pick r280702. rdar://problem/81618758
Modified: branches/safari-612.1.27.0-branch/Source/WebKit/UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp (280729 => 280730)
--- branches/safari-612.1.27.0-branch/Source/WebKit/UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp 2021-08-06 18:24:12 UTC (rev 280729)
+++ branches/safari-612.1.27.0-branch/Source/WebKit/UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp 2021-08-06 19:02:32 UTC (rev 280730)
@@ -100,6 +100,11 @@
CAAudioStreamDescription& description() { return m_description; }
int64_t numberOfFrames() { return m_numberOfFrames; }
+ void audioUnitWillStart() final
+ {
+ AudioSession::sharedSession().setCategory(AudioSession::CategoryType::PlayAndRecord, RouteSharingPolicy::Default);
+ }
+
void start()
{
m_shouldReset = true;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
