Changeset 280698 in webkit

Timestamp:

Aug 5, 2021, 10:05:58 AM (5 years ago)

Author:

eric.carlson@apple.com

Message:

[GPUP] RemoteAudioSessionProxyManager should use the shared audio session
​https://bugs.webkit.org/show_bug.cgi?id=228795
<rdar://problem/81530450>

Reviewed by Jer Noble.

RemoteAudioSessionProxyManager creates and uses a private AudioSession, which means
that any code that moves from the WebProcess to the GPUProcess and uses
AudioSession::sharedSession will be using a separate platform audio session wrapper
object. RemoteAudioSessionProxyManager doesn't need a private AudioSession, so
change it to use AudioSession::sharedSession.

• GPUProcess/media/RemoteAudioSessionProxyManager.cpp:

(WebKit::RemoteAudioSessionProxyManager::RemoteAudioSessionProxyManager): Don't
create a new AudioSession.
(WebKit::RemoteAudioSessionProxyManager::~RemoteAudioSessionProxyManager): Use
AudioSession::sharedSession().
(WebKit::RemoteAudioSessionProxyManager::updateCategory): Ditto.
(WebKit::RemoteAudioSessionProxyManager::setPreferredBufferSizeForProcess): Ditto.
(WebKit::RemoteAudioSessionProxyManager::tryToSetActiveForProcess): Ditto.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• GPUProcess/media/RemoteAudioSessionProxyManager.cpp (modified) (5 diffs)
• GPUProcess/media/RemoteAudioSessionProxyManager.h (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-08-05  Eric Carlson  <eric.carlson@apple.com>
+
+        [GPUP] RemoteAudioSessionProxyManager should use the shared audio session
+        https://bugs.webkit.org/show_bug.cgi?id=228795
+        <rdar://problem/81530450>
+
+        Reviewed by Jer Noble.
+
+        RemoteAudioSessionProxyManager creates and uses a private AudioSession, which means
+        that any code that moves from the WebProcess to the GPUProcess and uses
+        `AudioSession::sharedSession` will be using a separate platform audio session wrapper
+        object. RemoteAudioSessionProxyManager doesn't need a private AudioSession, so 
+        change it to use `AudioSession::sharedSession`.
+
+        * GPUProcess/media/RemoteAudioSessionProxyManager.cpp:
+        (WebKit::RemoteAudioSessionProxyManager::RemoteAudioSessionProxyManager): Don't
+        create a new AudioSession.
+        (WebKit::RemoteAudioSessionProxyManager::~RemoteAudioSessionProxyManager): Use
+        AudioSession::sharedSession().
+        (WebKit::RemoteAudioSessionProxyManager::updateCategory): Ditto.
+        (WebKit::RemoteAudioSessionProxyManager::setPreferredBufferSizeForProcess): Ditto.
+        (WebKit::RemoteAudioSessionProxyManager::tryToSetActiveForProcess): Ditto.
+
 2021-08-05  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/GPUProcess/media/RemoteAudioSessionProxyManager.cpp

@@ -45 +45 @@
 
 RemoteAudioSessionProxyManager::RemoteAudioSessionProxyManager()
-    : m_session(AudioSession::create())
-{
-    m_session->addInterruptionObserver(*this);
-    m_session->addConfigurationChangeObserver(*this);
+{
+    AudioSession::sharedSession().addInterruptionObserver(*this);
+    AudioSession::sharedSession().addConfigurationChangeObserver(*this);
 }
 
 RemoteAudioSessionProxyManager::~RemoteAudioSessionProxyManager()
 {
-    m_session->removeInterruptionObserver(*this);
-    m_session->removeConfigurationChangeObserver(*this);
+    AudioSession::sharedSession().removeInterruptionObserver(*this);
+    AudioSession::sharedSession().removeConfigurationChangeObserver(*this);
 }
 
@@ -106 +105 @@
         ASSERT_NOT_REACHED();
 
-    m_session->setCategory(category, policy);
+    AudioSession::sharedSession().setCategory(category, policy);
 }
 
@@ -116 +115 @@
     }
 
-    m_session->setPreferredBufferSize(preferredBufferSize);
+    AudioSession::sharedSession().setPreferredBufferSize(preferredBufferSize);
 }
 
@@ -139 +138 @@
         // proxy. Deactivate the session, and return whether that deactivation
         // was sucessful;
-        return m_session->tryToSetActive(false);
+        return AudioSession::sharedSession().tryToSetActive(false);
     }
 
@@ -145 +144 @@
         // This proxy and only this proxy wants to become active. Activate
         // the session, and return whether that activation was successful.
-        return m_session->tryToSetActive(active);
+        return AudioSession::sharedSession().tryToSetActive(active);
     }
 

trunk/Source/WebKit/GPUProcess/media/RemoteAudioSessionProxyManager.h

@@ -53 +53 @@
     bool tryToSetActiveForProcess(RemoteAudioSessionProxy&, bool);
 
-    WebCore::AudioSession& session() { return m_session; }
-    const WebCore::AudioSession& session() const { return m_session; }
+    WebCore::AudioSession& session() { return WebCore::AudioSession::sharedSession(); }
+    const WebCore::AudioSession& session() const { return WebCore::AudioSession::sharedSession(); }
 
 private:
@@ -65 +65 @@
     void configurationDidChange(const WebCore::AudioSession&);
 
-    UniqueRef<WebCore::AudioSession> m_session;
     WeakHashSet<RemoteAudioSessionProxy> m_proxies;
 };