Changeset 249008 in webkit

Timestamp:

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

Author:

Kocsen Chung

Message:

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

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

Reviewed by Eric Carlson.

When the system notifies us that the active audio route has changed in such a way
that necessitates pausing, pause all media sessions, exempting those that are
associated with WebRTC, since "pausing" an active audio conference isn't really
possible.

• Modules/mediastream/MediaStream.h:
• platform/audio/PlatformMediaSession.cpp: (WebCore::PlatformMediaSession::shouldOverridePauseDuringRouteChange const):
• platform/audio/PlatformMediaSession.h: (WebCore::PlatformMediaSessionClient::shouldOverridePauseDuringRouteChange const):
• platform/audio/ios/MediaSessionManagerIOS.h:
• platform/audio/ios/MediaSessionManagerIOS.mm: (WebCore::MediaSessionManageriOS::activeRouteDidChange): (-[WebMediaSessionHelper initWithCallback:]): (-[WebMediaSessionHelper activeAudioRouteDidChange:]):

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

Location:

branches/safari-608-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/MediaStream.h (modified) (1 diff)
• platform/audio/PlatformMediaSession.cpp (modified) (1 diff)
• platform/audio/PlatformMediaSession.h (modified) (2 diffs)
• platform/audio/ios/MediaSessionManagerIOS.h (modified) (1 diff)
• platform/audio/ios/MediaSessionManagerIOS.mm (modified) (4 diffs)

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

@@ +1 @@
+2019-08-21  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r248962. rdar://problem/54579627
+
+    Adopt AVSystemController_ActiveAudioRouteDidChangeNotification
+    https://bugs.webkit.org/show_bug.cgi?id=200992
+    <rdar://problem/54408993>
+    
+    Reviewed by Eric Carlson.
+    
+    When the system notifies us that the active audio route has changed in such a way
+    that necessitates pausing, pause all media sessions, exempting those that are
+    associated with WebRTC, since "pausing" an active audio conference isn't really
+    possible.
+    
+    * Modules/mediastream/MediaStream.h:
+    * platform/audio/PlatformMediaSession.cpp:
+    (WebCore::PlatformMediaSession::shouldOverridePauseDuringRouteChange const):
+    * platform/audio/PlatformMediaSession.h:
+    (WebCore::PlatformMediaSessionClient::shouldOverridePauseDuringRouteChange const):
+    * platform/audio/ios/MediaSessionManagerIOS.h:
+    * platform/audio/ios/MediaSessionManagerIOS.mm:
+    (WebCore::MediaSessionManageriOS::activeRouteDidChange):
+    (-[WebMediaSessionHelper initWithCallback:]):
+    (-[WebMediaSessionHelper activeAudioRouteDidChange:]):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@248962 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.
+
+            When the system notifies us that the active audio route has changed in such a way
+            that necessitates pausing, pause all media sessions, exempting those that are
+            associated with WebRTC, since "pausing" an active audio conference isn't really
+            possible.
+
+            * Modules/mediastream/MediaStream.h:
+            * platform/audio/PlatformMediaSession.cpp:
+            (WebCore::PlatformMediaSession::shouldOverridePauseDuringRouteChange const):
+            * platform/audio/PlatformMediaSession.h:
+            (WebCore::PlatformMediaSessionClient::shouldOverridePauseDuringRouteChange const):
+            * platform/audio/ios/MediaSessionManagerIOS.h:
+            * platform/audio/ios/MediaSessionManagerIOS.mm:
+            (WebCore::MediaSessionManageriOS::activeRouteDidChange):
+            (-[WebMediaSessionHelper initWithCallback:]):
+            (-[WebMediaSessionHelper activeAudioRouteDidChange:]):
+
 2019-08-21  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-608-branch/Source/WebCore/Modules/mediastream/MediaStream.h

@@ -166 +166 @@
     Document* hostingDocument() const final { return document(); }
     bool processingUserGestureForMedia() const final;
+    bool shouldOverridePauseDuringRouteChange() const { return true; }
 
     // ActiveDOMObject API.

branches/safari-608-branch/Source/WebCore/platform/audio/PlatformMediaSession.cpp

@@ -394 +394 @@
 }
 
+bool PlatformMediaSession::shouldOverridePauseDuringRouteChange() const
+{
+    return m_client.shouldOverridePauseDuringRouteChange();
+}
+
 #if !RELEASE_LOG_DISABLED
 WTFLogChannel& PlatformMediaSession::logChannel() const

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

@@ -193 +193 @@
 
     bool canPlayConcurrently(const PlatformMediaSession&) const;
+    bool shouldOverridePauseDuringRouteChange() const;
 
 protected:
@@ -262 +263 @@
     virtual void processIsSuspendedChanged() { }
 
+    virtual bool shouldOverridePauseDuringRouteChange() const { return false; }
+
 protected:
     virtual ~PlatformMediaSessionClient() = default;

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

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

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

@@ -61 +61 @@
 SOFT_LINK_CONSTANT_MAY_FAIL(Celestial, AVSystemController_CarPlayIsConnectedNotificationParameter, NSString *)
 SOFT_LINK_CONSTANT_MAY_FAIL(Celestial, AVSystemController_ServerConnectionDiedNotification, NSString *)
+SOFT_LINK_CONSTANT_MAY_FAIL(Celestial, AVSystemController_ActiveAudioRouteDidChangeNotification, NSString *)
+SOFT_LINK_CONSTANT_MAY_FAIL(Celestial, AVSystemController_ActiveAudioRouteDidChangeNotificationParameter_ShouldPause, NSString *)
 #endif
 
@@ -223 +225 @@
 
     setIsPlayingToAutomotiveHeadUnit([[[getAVSystemControllerClass() sharedAVSystemController] attributeForKey:getAVSystemController_CarPlayIsConnectedAttribute()] boolValue]);
+}
+
+void MediaSessionManageriOS::activeRouteDidChange(Optional<bool>&& shouldPause)
+{
+    if (!shouldPause || !shouldPause.value())
+        return;
+
+    forEachSession([](auto& session) {
+        if (!session.shouldOverridePauseDuringRouteChange())
+            session.pauseSession();
+    });
 }
 #endif
@@ -255 +268 @@
     if (canLoadAVSystemController_CarPlayIsConnectedDidChangeNotification())
         [center addObserver:self selector:@selector(carPlayIsConnectedDidChange:) name:getAVSystemController_CarPlayIsConnectedDidChangeNotification() object:nil];
+    if (canLoadAVSystemController_ActiveAudioRouteDidChangeNotification())
+        [center addObserver:self selector:@selector(activeAudioRouteDidChange:) name:getAVSystemController_ActiveAudioRouteDidChangeNotification() object:nil];
 #endif
 
@@ -485 +500 @@
     });
 }
+
+- (void)activeAudioRouteDidChange:(NSNotification *)notification
+{
+    if (!_callback)
+        return;
+
+    UNUSED_PARAM(notification);
+    Optional<bool> shouldPause;
+    if (notification && canLoadAVSystemController_ActiveAudioRouteDidChangeNotificationParameter_ShouldPause()) {
+        NSNumber* nsShouldPause = [notification.userInfo valueForKey:getAVSystemController_ActiveAudioRouteDidChangeNotificationParameter_ShouldPause()];
+        if (nsShouldPause)
+            shouldPause = nsShouldPause.boolValue;
+    }
+
+    callOnWebThreadOrDispatchAsyncOnMainThread([protectedSelf = retainPtr(self), shouldPause = WTFMove(shouldPause)]() mutable {
+        if (auto* callback = protectedSelf->_callback)
+            callback->activeRouteDidChange(WTFMove(shouldPause));
+    });
+
+}
 #endif // HAVE(CELESTIAL)
 @end