Changeset 249009 in webkit

Timestamp:

Aug 22, 2019, 8:45:31 AM (7 years ago)

Author:

Kocsen Chung

Message:

Cherry-pick r248978. rdar://problem/54579627

Adopt AVSystemController_ActiveAudioRouteDidChangeNotification
​https://bugs.webkit.org/show_bug.cgi?id=200992
<rdar://problem/54408993>

Reviewed by Eric Carlson.

Follow-up to r248962: When the active audio route changes, and the
system instructs us to pause, only pause the currently audible sessions.

• platform/audio/ios/MediaSessionManagerIOS.h:
• platform/audio/ios/MediaSessionManagerIOS.mm: (WebCore::MediaSessionManageriOS::activeAudioRouteDidChange): (-[WebMediaSessionHelper activeAudioRouteDidChange:]): (WebCore::MediaSessionManageriOS::activeRouteDidChange): Deleted.

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@248978 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-608-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/audio/ios/MediaSessionManagerIOS.h (modified) (1 diff)
• platform/audio/ios/MediaSessionManagerIOS.mm (modified) (3 diffs)

branches/safari-608-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-21  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r248978. rdar://problem/54579627
+
+    Adopt AVSystemController_ActiveAudioRouteDidChangeNotification
+    https://bugs.webkit.org/show_bug.cgi?id=200992
+    <rdar://problem/54408993>
+    
+    Reviewed by Eric Carlson.
+    
+    Follow-up to r248962: When the active audio route changes, and the
+    system instructs us to pause, only pause the currently audible sessions.
+    
+    * platform/audio/ios/MediaSessionManagerIOS.h:
+    * platform/audio/ios/MediaSessionManagerIOS.mm:
+    (WebCore::MediaSessionManageriOS::activeAudioRouteDidChange):
+    (-[WebMediaSessionHelper activeAudioRouteDidChange:]):
+    (WebCore::MediaSessionManageriOS::activeRouteDidChange): Deleted.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@248978 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-08-21  Jer Noble  <jer.noble@apple.com>
+
+            Adopt AVSystemController_ActiveAudioRouteDidChangeNotification
+            https://bugs.webkit.org/show_bug.cgi?id=200992
+            <rdar://problem/54408993>
+
+            Reviewed by Eric Carlson.
+
+            Follow-up to r248962: When the active audio route changes, and the
+            system instructs us to pause, only pause the currently audible sessions.
+
+            * platform/audio/ios/MediaSessionManagerIOS.h:
+            * platform/audio/ios/MediaSessionManagerIOS.mm:
+            (WebCore::MediaSessionManageriOS::activeAudioRouteDidChange):
+            (-[WebMediaSessionHelper activeAudioRouteDidChange:]):
+            (WebCore::MediaSessionManageriOS::activeRouteDidChange): Deleted.
+
 2019-08-21  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-608-branch/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h

@@ -51 +51 @@
     void carPlayServerDied();
     void updateCarPlayIsConnected(Optional<bool>&&);
-    void activeRouteDidChange(Optional<bool>&&);
+    void activeAudioRouteDidChange(Optional<bool>&&);
 #endif
 

branches/safari-608-branch/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm

@@ -227 +227 @@
 }
 
-void MediaSessionManageriOS::activeRouteDidChange(Optional<bool>&& shouldPause)
+void MediaSessionManageriOS::activeAudioRouteDidChange(Optional<bool>&& shouldPause)
 {
     if (!shouldPause || !shouldPause.value())
@@ -233 +233 @@
 
     forEachSession([](auto& session) {
-        if (!session.shouldOverridePauseDuringRouteChange())
+        if (session.canProduceAudio() && !session.shouldOverridePauseDuringRouteChange())
             session.pauseSession();
     });
@@ -516 +516 @@
     callOnWebThreadOrDispatchAsyncOnMainThread([protectedSelf = retainPtr(self), shouldPause = WTFMove(shouldPause)]() mutable {
         if (auto* callback = protectedSelf->_callback)
-            callback->activeRouteDidChange(WTFMove(shouldPause));
+            callback->activeAudioRouteDidChange(WTFMove(shouldPause));
     });