Changeset 186032 in webkit

Timestamp:

Jun 27, 2015, 2:11:18 PM (10 years ago)

Author:

eric.carlson@apple.com

Message:

[Mac] Only flag a video element as eligible for auto-play to AppleTV one time
​https://bugs.webkit.org/show_bug.cgi?id=146386

Reviewed by Brent Fulgham.

• Modules/mediasession/WebMediaSessionManager.cpp:

(WebCore::WebMediaSessionManager::removeAllPlaybackTargetPickerClients): Drive-by fix - early

return when there are no clients.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::pendingActionTimerFired): Set m_failedToPlayToWirelessTarget if the

media engine is still unable to play to the wireless target.

(WebCore::HTMLMediaElement::prepareForLoad): Clear m_failedToPlayToWirelessTarget.
(WebCore::HTMLMediaElement::mediaState): Don't set the ExternalDeviceAutoPlayCandidate flag

if m_failedToPlayToWirelessTarget is true.

• html/HTMLMediaElement.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-27  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] Only flag a video element as eligible for auto-play to AppleTV one time
+        https://bugs.webkit.org/show_bug.cgi?id=146386
+
+        Reviewed by Brent Fulgham.
+
+        * Modules/mediasession/WebMediaSessionManager.cpp:
+        (WebCore::WebMediaSessionManager::removeAllPlaybackTargetPickerClients): Drive-by fix - early 
+          return when there are no clients.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::pendingActionTimerFired): Set m_failedToPlayToWirelessTarget if the
+          media engine is still unable to play to the wireless target.
+        (WebCore::HTMLMediaElement::prepareForLoad): Clear m_failedToPlayToWirelessTarget.
+        (WebCore::HTMLMediaElement::mediaState): Don't set the ExternalDeviceAutoPlayCandidate flag
+          if m_failedToPlayToWirelessTarget is true.
+        * html/HTMLMediaElement.h:
+
 2015-06-27  Xabier Rodriguez Calvar  <calvaris@igalia.com> and Youenn Fablet  <youenn.fablet@crf.canon.fr>
 

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

@@ -127 +127 @@
 void WebMediaSessionManager::removeAllPlaybackTargetPickerClients(WebMediaSessionManagerClient& client)
 {
+    if (m_clientState.isEmpty())
+        return;
+
     LOG(Media, "WebMediaSessionManager::removeAllPlaybackTargetPickerClients(%p)", &client);
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -810 +810 @@
     if (m_pendingActionFlags & CheckPlaybackTargetCompatablity && m_player && m_player->isCurrentPlaybackTargetWireless() && !m_player->canPlayToWirelessPlaybackTarget()) {
         LOG(Media, "HTMLMediaElement::pendingActionTimerFired(%p) - calling setShouldPlayToPlaybackTarget(false)", this);
+        m_failedToPlayToWirelessTarget = true;
         m_player->setShouldPlayToPlaybackTarget(false);
     }
@@ -920 +921 @@
     m_displayMode = Unknown;
     m_currentSrc = URL();
+
+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+    m_failedToPlayToWirelessTarget = false;
+#endif
 
     // 1 - Abort any already-running instance of the resource selection algorithm for this element.
@@ -6340 +6345 @@
 
     bool requireUserGesture = m_mediaSession->hasBehaviorRestriction(MediaElementSession::RequireUserGestureToAutoplayToExternalDevice);
-    if (hasActiveVideo && (!requireUserGesture || (hasAudio && !m_initiallyMuted && !loop())))
+    if (hasActiveVideo && (!requireUserGesture || (hasAudio && !m_initiallyMuted && !loop())) && !m_failedToPlayToWirelessTarget)
         state |= ExternalDeviceAutoPlayCandidate;
 #endif

trunk/Source/WebCore/html/HTMLMediaElement.h

@@ -934 +934 @@
     MediaProducer::MediaStateFlags m_mediaState { MediaProducer::IsNotPlaying };
     bool m_hasPlaybackTargetAvailabilityListeners { false };
+    bool m_failedToPlayToWirelessTarget { false };
 #endif
 };