Changeset 280936 in webkit

Timestamp:

Aug 11, 2021, 3:54:12 PM (5 years ago)

Author:

Peng Liu

Message:

[BigSur] TestWebKitAPI.AudioRoutingArbitration.Updating fails after r280726
​https://bugs.webkit.org/show_bug.cgi?id=228966

Reviewed by Eric Carlson.

Add an IPC message RemoteAudioSessionProxy::SetIsPlayingToBluetoothOverride
for testing purpose, so that the test AudioRoutingArbitration.Updating will
work as expected when "Media in GPU Process" is enabled.

No new tests. Fix an API test failure.

• GPUProcess/media/RemoteAudioSessionProxy.cpp:

(WebKit::RemoteAudioSessionProxy::setCategory):
(WebKit::RemoteAudioSessionProxy::setIsPlayingToBluetoothOverride):

• GPUProcess/media/RemoteAudioSessionProxy.h:
• GPUProcess/media/RemoteAudioSessionProxy.messages.in:
• WebProcess/GPU/media/RemoteAudioSession.cpp:

(WebKit::RemoteAudioSession::setCategory):
(WebKit::RemoteAudioSession::setIsPlayingToBluetoothOverride):

• WebProcess/GPU/media/RemoteAudioSession.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• GPUProcess/media/RemoteAudioSessionProxy.cpp (modified) (2 diffs)
• GPUProcess/media/RemoteAudioSessionProxy.h (modified) (2 diffs)
• GPUProcess/media/RemoteAudioSessionProxy.messages.in (modified) (1 diff)
• WebProcess/GPU/media/RemoteAudioSession.cpp (modified) (2 diffs)
• WebProcess/GPU/media/RemoteAudioSession.h (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-08-11  Peng Liu  <peng.liu6@apple.com>
+
+        [BigSur] TestWebKitAPI.AudioRoutingArbitration.Updating fails after r280726
+        https://bugs.webkit.org/show_bug.cgi?id=228966
+
+        Reviewed by Eric Carlson.
+
+        Add an IPC message `RemoteAudioSessionProxy::SetIsPlayingToBluetoothOverride`
+        for testing purpose, so that the test `AudioRoutingArbitration.Updating` will
+        work as expected when "Media in GPU Process" is enabled.
+
+        No new tests. Fix an API test failure.
+
+        * GPUProcess/media/RemoteAudioSessionProxy.cpp:
+        (WebKit::RemoteAudioSessionProxy::setCategory):
+        (WebKit::RemoteAudioSessionProxy::setIsPlayingToBluetoothOverride):
+        * GPUProcess/media/RemoteAudioSessionProxy.h:
+        * GPUProcess/media/RemoteAudioSessionProxy.messages.in:
+        * WebProcess/GPU/media/RemoteAudioSession.cpp:
+        (WebKit::RemoteAudioSession::setCategory):
+        (WebKit::RemoteAudioSession::setIsPlayingToBluetoothOverride):
+        * WebProcess/GPU/media/RemoteAudioSession.h:
+
 2021-08-11  David Kilzer  <ddkilzer@apple.com>
 

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

@@ -74 +74 @@
 void RemoteAudioSessionProxy::setCategory(AudioSession::CategoryType category, RouteSharingPolicy policy)
 {
-    if (m_category == category && m_routeSharingPolicy == policy)
+    if (m_category == category && m_routeSharingPolicy == policy && !m_isPlayingToBluetoothOverrideChanged)
         return;
 
     m_category = category;
     m_routeSharingPolicy = policy;
+    m_isPlayingToBluetoothOverrideChanged = false;
     audioSessionManager().updateCategory();
 }
@@ -92 +93 @@
     m_active = audioSessionManager().tryToSetActiveForProcess(*this, active);
     completion(m_active);
+}
+
+void RemoteAudioSessionProxy::setIsPlayingToBluetoothOverride(std::optional<bool>&& value)
+{
+    m_isPlayingToBluetoothOverrideChanged = true;
+    audioSessionManager().session().setIsPlayingToBluetoothOverride(WTFMove(value));
 }
 

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

@@ -75 +75 @@
     using SetActiveCompletion = CompletionHandler<void(bool)>;
     void tryToSetActive(bool, SetActiveCompletion&&);
+    void setIsPlayingToBluetoothOverride(std::optional<bool>&& value);
 
     RemoteAudioSessionProxyManager& audioSessionManager();
@@ -84 +85 @@
     size_t m_preferredBufferSize { 0 };
     bool m_active { false };
+    bool m_isPlayingToBluetoothOverrideChanged { false };
 };
 

trunk/Source/WebKit/GPUProcess/media/RemoteAudioSessionProxy.messages.in

@@ -30 +30 @@
     SetPreferredBufferSize(uint64_t preferredBufferSize)
     TryToSetActive(bool active) -> (bool suceeded) Synchronous
+    SetIsPlayingToBluetoothOverride(std::optional<bool> value)
 }
 

trunk/Source/WebKit/WebProcess/GPU/media/RemoteAudioSession.cpp

@@ -95 +95 @@
 {
 #if PLATFORM(COCOA)
-    if (type == m_category && policy == m_routeSharingPolicy)
+    if (type == m_category && policy == m_routeSharingPolicy && !m_isPlayingToBluetoothOverrideChanged)
         return;
 
     m_category = type;
     m_routeSharingPolicy = policy;
+    m_isPlayingToBluetoothOverrideChanged = false;
 
     ensureConnection().send(Messages::RemoteAudioSessionProxy::SetCategory(type, policy), { });
@@ -133 +134 @@
 }
 
+#if ENABLE(ROUTING_ARBITRATION)
+void RemoteAudioSession::setIsPlayingToBluetoothOverride(std::optional<bool> value)
+{
+    m_isPlayingToBluetoothOverrideChanged = true;
+    ensureConnection().send(Messages::RemoteAudioSessionProxy::SetIsPlayingToBluetoothOverride(value), { });
+}
+#endif
+
 AudioSession::CategoryType RemoteAudioSession::category() const
 {

trunk/Source/WebKit/WebProcess/GPU/media/RemoteAudioSession.h

@@ -72 +72 @@
     void removeConfigurationChangeObserver(ConfigurationChangeObserver&);
 
+#if ENABLE(ROUTING_ARBITRATION)
+    void setIsPlayingToBluetoothOverride(std::optional<bool>) final;
+#endif
+
     const RemoteAudioSessionConfiguration& configuration() const;
     RemoteAudioSessionConfiguration& configuration();
@@ -92 +96 @@
     CategoryType m_category { CategoryType::None };
     WebCore::RouteSharingPolicy m_routeSharingPolicy { WebCore::RouteSharingPolicy::Default };
+    bool m_isPlayingToBluetoothOverrideChanged { false };
     std::optional<RemoteAudioSessionConfiguration> m_configuration;
     WeakPtr<GPUProcessConnection> m_gpuProcessConnection;