Title: [280722] trunk/Source/WebKit
Revision
280722
Author
eric.carl...@apple.com
Date
2021-08-06 08:04:13 -0700 (Fri, 06 Aug 2021)

Log Message

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.

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (280721 => 280722)


--- trunk/Source/WebKit/ChangeLog	2021-08-06 13:42:59 UTC (rev 280721)
+++ trunk/Source/WebKit/ChangeLog	2021-08-06 15:04:13 UTC (rev 280722)
@@ -1,3 +1,16 @@
+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-05  Kate Cheney  <katherine_che...@apple.com>
 
         LoadWebArchive.FailNavigation1 test is a false positive

Modified: trunk/Source/WebKit/UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp (280721 => 280722)


--- trunk/Source/WebKit/UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp	2021-08-06 13:42:59 UTC (rev 280721)
+++ trunk/Source/WebKit/UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp	2021-08-06 15:04:13 UTC (rev 280722)
@@ -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

Reply via email to