<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[186636] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/186636">186636</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-07-09 14:59:33 -0700 (Thu, 09 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasessionWebMediaSessionManagercpp">trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186635 => 186636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-09 21:57:32 UTC (rev 186635)
+++ trunk/Source/WebCore/ChangeLog 2015-07-09 21:59:33 UTC (rev 186636)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+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.
+
</ins><span class="cx"> 2015-07-09 Matthew Daiter <mdaiter@apple.com>
</span><span class="cx">
</span><span class="cx"> Implementing platform-specific section of enumerateDevices
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionWebMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp (186635 => 186636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2015-07-09 21:57:32 UTC (rev 186635)
+++ trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2015-07-09 21:59:33 UTC (rev 186636)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx"> uint64_t contextId { 0 };
</span><span class="cx"> WebCore::MediaProducer::MediaStateFlags flags { WebCore::MediaProducer::IsNotPlaying };
</span><span class="cx"> bool requestedPicker { false };
</span><ins>+ bool previouslyRequestedPicker { false };
</ins><span class="cx"> bool configurationRequired { true };
</span><span class="cx"> bool playedToEnd { false };
</span><span class="cx"> };
</span><span class="lines">@@ -148,8 +149,10 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> auto& clientRequestingPicker = m_clientState[index];
</span><del>- for (auto& state : m_clientState)
</del><ins>+ for (auto& state : m_clientState) {
</ins><span class="cx"> state->requestedPicker = state == clientRequestingPicker;
</span><ins>+ state->previouslyRequestedPicker = state == clientRequestingPicker;
+ }
</ins><span class="cx">
</span><span class="cx"> bool hasActiveRoute = flagsAreSet(m_clientState[index]->flags, MediaProducer::IsPlayingToExternalDevice);
</span><span class="cx"> LOG(Media, "WebMediaSessionManager::showPlaybackTargetPicker(%p + %llu) - hasActiveRoute = %i", &client, contextId, (int)hasActiveRoute);
</span><span class="lines">@@ -181,26 +184,20 @@
</span><span class="cx"> scheduleDelayedTask(WatchdogTimerConfigurationTask);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!m_playbackTarget || !m_playbackTarget->hasActiveRoute())
</del><ins>+ if (!m_playbackTarget || !m_playbackTarget->hasActiveRoute() || !flagsAreSet(newFlags, MediaProducer::ExternalDeviceAutoPlayCandidate))
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!flagsAreSet(newFlags, MediaProducer::ExternalDeviceAutoPlayCandidate) || !flagsAreSet(newFlags, MediaProducer::IsPlayingVideo))
- return;
-
</del><span class="cx"> // Do not interrupt another element already playing to a device.
</span><del>- bool anotherClientHasActiveTarget = false;
</del><span class="cx"> for (auto& state : m_clientState) {
</span><span class="cx"> if (state == changedClientState)
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- if (flagsAreSet(state->flags, MediaProducer::IsPlayingToExternalDevice)) {
- if (flagsAreSet(state->flags, MediaProducer::IsPlayingVideo))
- return;
- anotherClientHasActiveTarget = true;
- }
</del><ins>+ if (flagsAreSet(state->flags, MediaProducer::IsPlayingToExternalDevice) && flagsAreSet(state->flags, MediaProducer::IsPlayingVideo))
+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (anotherClientHasActiveTarget || !flagsAreSet(newFlags, MediaProducer::IsPlayingVideo))
</del><ins>+ // Do not take begin playing to the device unless playback has just started.
+ if (!flagsAreSet(newFlags, MediaProducer::IsPlayingVideo) || flagsAreSet(oldFlags, MediaProducer::IsPlayingVideo))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> for (auto& state : m_clientState) {
</span><span class="lines">@@ -249,25 +246,32 @@
</span><span class="cx"> void WebMediaSessionManager::configurePlaybackTargetClients()
</span><span class="cx"> {
</span><span class="cx"> size_t indexOfClientThatRequestedPicker = notFound;
</span><del>- size_t indexOfAutoPlayCandidate = notFound;
</del><ins>+ size_t indexOfLastClientToRequestPicker = notFound;
</ins><span class="cx"> size_t indexOfClientWillPlayToTarget = notFound;
</span><span class="cx"> bool haveActiveRoute = m_playbackTarget && m_playbackTarget->hasActiveRoute();
</span><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < m_clientState.size(); ++i) {
</span><span class="cx"> auto& state = m_clientState[i];
</span><span class="cx">
</span><ins>+ LOG(Media, "WebMediaSessionManager::configurePlaybackTargetClients %zu - client (%p + %llu) requestedPicker = %i, flags = %s", i, &state->client, state->contextId, state->requestedPicker, mediaProducerStateString(state->flags).utf8().data());
+
</ins><span class="cx"> if (m_targetChanged && state->requestedPicker)
</span><span class="cx"> indexOfClientThatRequestedPicker = i;
</span><span class="cx">
</span><span class="cx"> if (indexOfClientWillPlayToTarget == notFound && flagsAreSet(state->flags, MediaProducer::IsPlayingToExternalDevice))
</span><span class="cx"> indexOfClientWillPlayToTarget = i;
</span><ins>+
+ if (indexOfClientWillPlayToTarget == notFound && haveActiveRoute && state->previouslyRequestedPicker)
+ indexOfLastClientToRequestPicker = i;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (indexOfClientThatRequestedPicker != notFound)
</span><span class="cx"> indexOfClientWillPlayToTarget = indexOfClientThatRequestedPicker;
</span><del>- if (indexOfClientWillPlayToTarget == notFound && haveActiveRoute && indexOfAutoPlayCandidate != notFound)
- indexOfClientWillPlayToTarget = indexOfAutoPlayCandidate;
</del><ins>+ if (indexOfClientWillPlayToTarget == notFound && indexOfLastClientToRequestPicker != notFound)
+ indexOfClientWillPlayToTarget = indexOfLastClientToRequestPicker;
</ins><span class="cx">
</span><ins>+ LOG(Media, "WebMediaSessionManager::configurePlaybackTargetClients - indexOfClientWillPlayToTarget = %zu", indexOfClientWillPlayToTarget);
+
</ins><span class="cx"> for (size_t i = 0; i < m_clientState.size(); ++i) {
</span><span class="cx"> auto& state = m_clientState[i];
</span><span class="cx">
</span><span class="lines">@@ -284,6 +288,7 @@
</span><span class="cx">
</span><span class="cx"> if (haveActiveRoute && indexOfClientWillPlayToTarget != notFound) {
</span><span class="cx"> auto& state = m_clientState[indexOfClientWillPlayToTarget];
</span><ins>+
</ins><span class="cx"> if (!flagsAreSet(state->flags, MediaProducer::IsPlayingToExternalDevice))
</span><span class="cx"> state->client.setShouldPlayToPlaybackTarget(state->contextId, true);
</span><span class="cx"> }
</span><span class="lines">@@ -333,7 +338,7 @@
</span><span class="cx">
</span><span class="cx"> void WebMediaSessionManager::scheduleDelayedTask(ConfigurationTasks tasks)
</span><span class="cx"> {
</span><del>- LOG(Media, "WebMediaSessionManager::scheduleDelayedTask - tasks = %s", toString(tasks).utf8().data());
</del><ins>+ LOG(Media, "WebMediaSessionManager::scheduleDelayedTask - %s", toString(tasks).utf8().data());
</ins><span class="cx">
</span><span class="cx"> m_taskFlags |= tasks;
</span><span class="cx"> m_taskTimer.startOneShot(taskDelayInterval);
</span></span></pre>
</div>
</div>
</body>
</html>