Changeset 186636 in webkit

Timestamp:

Jul 9, 2015 2:59:33 PM (9 years ago)

Author:

eric.carlson@apple.com

Message:

[Mac] AirPlay to password protected AppleTV fails
​https://bugs.webkit.org/show_bug.cgi?id=146812

Reviewed by NOBODY (OOPS!).

• Modules/mediasession/WebMediaSessionManager.cpp:

(WebCore::WebMediaSessionManager::showPlaybackTargetPicker): Initialize previouslyRequestedPicker.
(WebCore::WebMediaSessionManager::clientStateDidChange): Cleanup the logic and add a comment

to make it slightly easier to follow. Don't begin playing to a device unless playback
has just started (don't switch in mid-play).

(WebCore::WebMediaSessionManager::configurePlaybackTargetClients): Use the last client to

request the device picker as a fallback in case no other client is a canditate. Add more
logging to make it possible to debug the selection logic.

(WebCore::WebMediaSessionManager::scheduleDelayedTask): Fiddle with the logging.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediasession/WebMediaSessionManager.cpp (modified) (8 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-07-09  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] AirPlay to password protected AppleTV fails
+        https://bugs.webkit.org/show_bug.cgi?id=146812
+
+        Reviewed by Dean Jackson.
+
+        * Modules/mediasession/WebMediaSessionManager.cpp:
+        (WebCore::WebMediaSessionManager::showPlaybackTargetPicker): Initialize previouslyRequestedPicker.
+        (WebCore::WebMediaSessionManager::clientStateDidChange): Cleanup the logic and add a comment
+          to make it slightly easier to follow. Don't begin playing to a device unless playback
+          has just started (don't switch in mid-play).
+        (WebCore::WebMediaSessionManager::configurePlaybackTargetClients): Use the last client to
+          request the device picker as a fallback in case no other client is a canditate. Add more
+          logging to make it possible to debug the selection logic.
+        (WebCore::WebMediaSessionManager::scheduleDelayedTask): Fiddle with the logging.
+
 2015-07-09  Matthew Daiter  <mdaiter@apple.com>
 

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

@@ -55 +55 @@
     WebCore::MediaProducer::MediaStateFlags flags { WebCore::MediaProducer::IsNotPlaying };
     bool requestedPicker { false };
+    bool previouslyRequestedPicker { false };
     bool configurationRequired { true };
     bool playedToEnd { false };
@@ -149 +150 @@
 
     auto& clientRequestingPicker = m_clientState[index];
-    for (auto& state : m_clientState)
+    for (auto& state : m_clientState) {
         state->requestedPicker = state == clientRequestingPicker;
+        state->previouslyRequestedPicker = state == clientRequestingPicker;
+    }
 
     bool hasActiveRoute = flagsAreSet(m_clientState[index]->flags, MediaProducer::IsPlayingToExternalDevice);
@@ -182 +185 @@
     }
 
-    if (!m_playbackTarget || !m_playbackTarget->hasActiveRoute())
-        return;
-
-    if (!flagsAreSet(newFlags, MediaProducer::ExternalDeviceAutoPlayCandidate) || !flagsAreSet(newFlags, MediaProducer::IsPlayingVideo))
+    if (!m_playbackTarget || !m_playbackTarget->hasActiveRoute() || !flagsAreSet(newFlags, MediaProducer::ExternalDeviceAutoPlayCandidate))
         return;
 
     // Do not interrupt another element already playing to a device.
-    bool anotherClientHasActiveTarget = false;
     for (auto& state : m_clientState) {
         if (state == changedClientState)
             continue;
 
-        if (flagsAreSet(state->flags, MediaProducer::IsPlayingToExternalDevice)) {
-            if (flagsAreSet(state->flags, MediaProducer::IsPlayingVideo))
-                return;
-            anotherClientHasActiveTarget = true;
-        }
-    }
-
-    if (anotherClientHasActiveTarget || !flagsAreSet(newFlags, MediaProducer::IsPlayingVideo))
+        if (flagsAreSet(state->flags, MediaProducer::IsPlayingToExternalDevice) && flagsAreSet(state->flags, MediaProducer::IsPlayingVideo))
+            return;
+    }
+
+    // Do not take begin playing to the device unless playback has just started.
+    if (!flagsAreSet(newFlags, MediaProducer::IsPlayingVideo) || flagsAreSet(oldFlags, MediaProducer::IsPlayingVideo))
         return;
 
@@ -250 +247 @@
 {
     size_t indexOfClientThatRequestedPicker = notFound;
-    size_t indexOfAutoPlayCandidate = notFound;
+    size_t indexOfLastClientToRequestPicker = notFound;
     size_t indexOfClientWillPlayToTarget = notFound;
     bool haveActiveRoute = m_playbackTarget && m_playbackTarget->hasActiveRoute();
@@ -257 +254 @@
         auto& state = m_clientState[i];
 
+        LOG(Media, "WebMediaSessionManager::configurePlaybackTargetClients %zu - client (%p + %llu) requestedPicker = %i, flags = %s", i, &state->client, state->contextId, state->requestedPicker, mediaProducerStateString(state->flags).utf8().data());
+
         if (m_targetChanged && state->requestedPicker)
             indexOfClientThatRequestedPicker = i;
@@ -262 +261 @@
         if (indexOfClientWillPlayToTarget == notFound && flagsAreSet(state->flags, MediaProducer::IsPlayingToExternalDevice))
             indexOfClientWillPlayToTarget = i;
+
+        if (indexOfClientWillPlayToTarget == notFound && haveActiveRoute && state->previouslyRequestedPicker)
+            indexOfLastClientToRequestPicker = i;
     }
 
     if (indexOfClientThatRequestedPicker != notFound)
         indexOfClientWillPlayToTarget = indexOfClientThatRequestedPicker;
-    if (indexOfClientWillPlayToTarget == notFound && haveActiveRoute && indexOfAutoPlayCandidate != notFound)
-        indexOfClientWillPlayToTarget = indexOfAutoPlayCandidate;
+    if (indexOfClientWillPlayToTarget == notFound && indexOfLastClientToRequestPicker != notFound)
+        indexOfClientWillPlayToTarget = indexOfLastClientToRequestPicker;
+
+    LOG(Media, "WebMediaSessionManager::configurePlaybackTargetClients - indexOfClientWillPlayToTarget = %zu", indexOfClientWillPlayToTarget);
 
     for (size_t i = 0; i < m_clientState.size(); ++i) {
@@ -285 +289 @@
     if (haveActiveRoute && indexOfClientWillPlayToTarget != notFound) {
         auto& state = m_clientState[indexOfClientWillPlayToTarget];
+
         if (!flagsAreSet(state->flags, MediaProducer::IsPlayingToExternalDevice))
             state->client.setShouldPlayToPlaybackTarget(state->contextId, true);
@@ -334 +339 @@
 void WebMediaSessionManager::scheduleDelayedTask(ConfigurationTasks tasks)
 {
-    LOG(Media, "WebMediaSessionManager::scheduleDelayedTask - tasks = %s", toString(tasks).utf8().data());
+    LOG(Media, "WebMediaSessionManager::scheduleDelayedTask - %s", toString(tasks).utf8().data());
 
     m_taskFlags |= tasks;