Changeset 186519 in webkit

Timestamp:

Jul 8, 2015 11:54:34 AM (9 years ago)

Author:

eric.carlson@apple.com

Message:

[Mac] Two clicks required to enable AirPlay at youtube.com
​https://bugs.webkit.org/show_bug.cgi?id=146733
<rdar://problem/21556356>

Reviewed by Brent Fulgham.

• Modules/mediasession/WebMediaSessionManager.cpp:

(WebCore::WebMediaSessionManager::clientStateDidChange): Only log when state has changed.

Don't steal the route if another client is actively playing to the device.

(WebCore::WebMediaSessionManager::setPlaybackTarget): Set m_targetChanged.
(WebCore::WebMediaSessionManager::configurePlaybackTargetClients): Don't consider the

requestedPicker flag until after a target change.

• Modules/mediasession/WebMediaSessionManager.h:

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::webkitShowPlaybackTargetPicker): Add logging.
(WebCore::HTMLMediaElement::setShouldPlayToPlaybackTarget): Ditto.

• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:

(WebCore::MediaPlayerPrivateAVFoundationObjC::setShouldPlayToPlaybackTarget): Always log.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediasession/WebMediaSessionManager.cpp (modified) (6 diffs)
• Modules/mediasession/WebMediaSessionManager.h (modified) (2 diffs)
• html/HTMLMediaElement.cpp (modified) (2 diffs)
• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-07-08  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] Two clicks required to enable AirPlay at youtube.com
+        https://bugs.webkit.org/show_bug.cgi?id=146733
+        <rdar://problem/21556356>
+
+        Reviewed by Brent Fulgham.
+
+        * Modules/mediasession/WebMediaSessionManager.cpp:
+        (WebCore::WebMediaSessionManager::clientStateDidChange): Only log when state has changed.
+          Don't steal the route if another client is actively playing to the device.
+        (WebCore::WebMediaSessionManager::setPlaybackTarget): Set m_targetChanged.
+        (WebCore::WebMediaSessionManager::configurePlaybackTargetClients): Don't consider the
+          requestedPicker flag until after a target change.
+        * Modules/mediasession/WebMediaSessionManager.h:
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::webkitShowPlaybackTargetPicker): Add logging.
+        (WebCore::HTMLMediaElement::setShouldPlayToPlaybackTarget): Ditto.
+
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::setShouldPlayToPlaybackTarget): Always log.
+
 2015-07-08  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -166 +166 @@
     auto& changedClientState = m_clientState[index];
     MediaProducer::MediaStateFlags oldFlags = changedClientState->flags;
+    if (newFlags == oldFlags)
+        return;
+
     LOG(Media, "WebMediaSessionManager::clientStateDidChange(%p + %llu) - new flags = %s, old flags = %s", &client, contextId, mediaProducerStateString(newFlags).utf8().data(), mediaProducerStateString(oldFlags).utf8().data());
-    if (newFlags == oldFlags)
-        return;
 
     changedClientState->flags = newFlags;
@@ -200 +201 @@
     }
 
-    // Do not take the target if another client has it and the client reporting a state change is not playing.
-    if (anotherClientHasActiveTarget && !flagsAreSet(newFlags, MediaProducer::IsPlayingVideo))
+    if (anotherClientHasActiveTarget || !flagsAreSet(newFlags, MediaProducer::IsPlayingVideo))
         return;
 
@@ -219 +219 @@
 {
     m_playbackTarget = WTF::move(target);
+    m_targetChanged = true;
     scheduleDelayedTask(TargetClientsConfigurationTask);
 }
@@ -256 +257 @@
         auto& state = m_clientState[i];
 
-        if (state->requestedPicker)
+        if (m_targetChanged && state->requestedPicker)
             indexOfClientThatRequestedPicker = i;
 
@@ -278 +279 @@
 
         state->configurationRequired = false;
-        state->requestedPicker = false;
+        if (m_targetChanged)
+            state->requestedPicker = false;
     }
 
@@ -287 +289 @@
     }
 
+    m_targetChanged = false;
     configureWatchdogTimer();
 }

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

@@ -65 +65 @@
 
     size_t find(WebMediaSessionManagerClient*, uint64_t);
+
     void configurePlaybackTargetClients();
     void configureNewClients();
@@ -93 +94 @@
     double m_currentWatchdogInterval { 0 };
     bool m_externalOutputDeviceAvailable { false };
+    bool m_targetChanged { false };
 };
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -4981 +4981 @@
 void HTMLMediaElement::webkitShowPlaybackTargetPicker()
 {
+    LOG(Media, "HTMLMediaElement::webkitShowPlaybackTargetPicker(%p)", this);
     m_mediaSession->showPlaybackTargetPicker(*this);
 }
@@ -5087 +5088 @@
 void HTMLMediaElement::setShouldPlayToPlaybackTarget(bool shouldPlay)
 {
+    LOG(Media, "HTMLMediaElement::setShouldPlayToPlaybackTarget(%p) - shouldPlay = %s", this, boolString(shouldPlay));
+
     if (m_player)
         m_player->setShouldPlayToPlaybackTarget(shouldPlay);

trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

@@ -2823 +2823 @@
     m_shouldPlayToPlaybackTarget = shouldPlay;
 
+    AVOutputContext *newContext = shouldPlay ? m_outputContext.get() : nil;
+    LOG(Media, "MediaPlayerPrivateAVFoundationObjC::setShouldPlayToPlaybackTarget(%p) - target = %p, shouldPlay = %s", this, newContext, boolString(shouldPlay));
+
     if (!m_avPlayer)
         return;
 
-    AVOutputContext *newContext = shouldPlay ? m_outputContext.get() : nil;
     RetainPtr<AVOutputContext> currentContext = m_avPlayer.get().outputContext;
-
-    LOG(Media, "MediaPlayerPrivateAVFoundationObjC::setShouldPlayToPlaybackTarget(%p) - target = %p, shouldPlay = %s", this, newContext, boolString(shouldPlay));
-
     if ((!newContext && !currentContext.get()) || [currentContext.get() isEqual:newContext])
         return;