Changeset 171299 in webkit

Timestamp:

Jul 21, 2014 8:03:11 AM (10 years ago)

Author:

eric.carlson@apple.com

Message:

[iOS] a Paused media session is not active
​https://bugs.webkit.org/show_bug.cgi?id=135108

Reviewed by Darin Adler.

Activating the shared AudioSession will pause audio playing in another application,
so only report a Playing media sessions as active.

• platform/audio/MediaSessionManager.cpp:
• platform/audio/MediaSessionManager.h:

(WebCore::MediaSessionManager::activeAudioSessionRequired): Renamed from hasActive to make
clear what it does. Only return true for a session that is Playing.

• platform/audio/mac/MediaSessionManagerMac.cpp:

(MediaSessionManager::updateSessionState): hasActive renamed to activeAudioSessionRequired.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/audio/MediaSessionManager.cpp (modified) (1 diff)
• platform/audio/MediaSessionManager.h (modified) (1 diff)
• platform/audio/mac/MediaSessionManagerMac.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-07-21  Eric Carlson  <eric.carlson@apple.com>
+
+        [iOS] a Paused media session is not active
+        https://bugs.webkit.org/show_bug.cgi?id=135108
+
+        Reviewed by Darin Adler.
+
+        Activating the shared AudioSession will pause audio playing in another application,
+        so only report a Playing media sessions as active.
+
+        * platform/audio/MediaSessionManager.cpp:
+        * platform/audio/MediaSessionManager.h:
+        (WebCore::MediaSessionManager::activeAudioSessionRequired): Renamed from hasActive to make
+        clear what it does. Only return true for a session that is Playing.
+
+        * platform/audio/mac/MediaSessionManagerMac.cpp:
+        (MediaSessionManager::updateSessionState): hasActive renamed to activeAudioSessionRequired.
+
 2014-07-21  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp

@@ -69 +69 @@
 }
 
-bool MediaSessionManager::hasActive() const
+bool MediaSessionManager::activeAudioSessionRequired() const
 {
     for (auto* session : m_sessions) {
-        if (session->mediaType() != MediaSession::None && (session->state() == MediaSession::State::Playing || session->state() == MediaSession::State::Paused))
+        if (session->mediaType() != MediaSession::None && session->state() == MediaSession::State::Playing)
             return true;
     }

trunk/Source/WebCore/platform/audio/MediaSessionManager.h

@@ -60 +60 @@
 
     bool has(MediaSession::MediaType) const;
-    bool hasActive() const;
     int count(MediaSession::MediaType) const;
+    bool activeAudioSessionRequired() const;
 
     void beginInterruption(MediaSession::InterruptionType);

trunk/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp

@@ -63 +63 @@
 
 #if PLATFORM(IOS)
-    if (hasActive())
+    if (activeAudioSessionRequired())
         AudioSession::sharedSession().setActive(true);