Changeset 183613 in webkit

Timestamp:

Apr 29, 2015, 8:40:16 PM (10 years ago)

Author:

eric.carlson@apple.com

Message:

Not all videos should automatically play to playback target
​https://bugs.webkit.org/show_bug.cgi?id=144430
<rdar://problem/20718523>

Reviewed by Darin Adler.

• Modules/mediasession/WebMediaSessionManager.cpp:

(WebCore::WebMediaSessionManager::clientStateDidChange): Consider ExternalDeviceAutoPlayCandidate.
Minor cleanup.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::mediaState): Set ExternalDeviceAutoPlayCandidate when a <video>
has a file with an audio track that does not loop.

• page/MediaProducer.h: Add ExternalDeviceAutoPlayCandidate.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediasession/WebMediaSessionManager.cpp (modified) (2 diffs)
• html/HTMLMediaElement.cpp (modified) (3 diffs)
• page/MediaProducer.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-04-29  Eric Carlson  <eric.carlson@apple.com>
+
+        Not all videos should automatically play to playback target
+        https://bugs.webkit.org/show_bug.cgi?id=144430
+        <rdar://problem/20718523>
+
+        Reviewed by Darin Adler.
+
+        * Modules/mediasession/WebMediaSessionManager.cpp:
+        (WebCore::WebMediaSessionManager::clientStateDidChange): Consider ExternalDeviceAutoPlayCandidate.
+        Minor cleanup.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::mediaState): Set ExternalDeviceAutoPlayCandidate when a <video>
+        has a file with an audio track that does not loop.
+
+        * page/MediaProducer.h: Add ExternalDeviceAutoPlayCandidate.
+
 2015-04-29  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp

@@ -145 +145 @@
         configurePlaybackTargetMonitoring();
 
-    if (!flagsAreSet(newFlags, MediaProducer::IsPlayingVideo))
+    if (!flagsAreSet(newFlags, MediaProducer::IsPlayingVideo) || !flagsAreSet(newFlags, MediaProducer::ExternalDeviceAutoPlayCandidate))
+        return;
+
+    if (!m_playbackTarget || !m_playbackTarget->hasActiveRoute())
         return;
 
@@ -157 +160 @@
     }
 
-    if (m_playbackTarget && m_playbackTarget->hasActiveRoute()) {
-
-        for (auto& state : m_clientState) {
-            if (state->contextId == contextId && state->client == &client)
-                continue;
-            state->client->setShouldPlayToPlaybackTarget(state->contextId, false);
-        }
-
-        changedClientState->client->setShouldPlayToPlaybackTarget(changedClientState->contextId, true);
-    }
+    for (auto& state : m_clientState) {
+        if (state->contextId == contextId && state->client == &client)
+            continue;
+        state->client->setShouldPlayToPlaybackTarget(state->contextId, false);
+    }
+
+    changedClientState->client->setShouldPlayToPlaybackTarget(changedClientState->contextId, true);
 
     if (index && m_clientState.size() > 1)

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -6190 +6190 @@
 
     bool hasActiveVideo = isVideo() && hasVideo();
+    bool hasAudio = this->hasAudio();
 #if ENABLE(WIRELESS_PLAYBACK_TARGET)
     if (isPlayingToWirelessPlaybackTarget())
@@ -6198 +6199 @@
             state |= RequiresPlaybackTargetMonitoring;
     }
+
+    if (hasActiveVideo && hasAudio && !loop())
+        state |= ExternalDeviceAutoPlayCandidate;
+
 #endif
 
@@ -6203 +6208 @@
         return state;
 
-    if (hasAudio() && !muted())
+    if (hasAudio && !muted())
         state |= IsPlayingAudio;
 

trunk/Source/WebCore/page/MediaProducer.h

@@ -37 +37 @@
         IsPlayingToExternalDevice = 1 << 2,
         RequiresPlaybackTargetMonitoring = 1 << 3,
+        ExternalDeviceAutoPlayCandidate = 1 << 4,
     };
     typedef unsigned MediaStateFlags;