<!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>[170241] 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/170241">170241</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2014-06-21 07:59:07 -0700 (Sat, 21 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Create and attach the AVPlayerLayer to the AVPlayer immediately if the media element is <video>.
https://bugs.webkit.org/show_bug.cgi?id=134131
Reviewed by Eric Carlson.
The AVPlayer uses the presence of an AVPlayerLayer to decide which alternate to display in the case of
HLS streams with audio-only alternates. To give the AVPlayer the most information with which to make its
decision, always create and attach an AVPlayerLayer before attaching an AVPlayerItem to the AVPlayerLayer.
In addition, retrieve the <video> element bounds and create an AVPlayerLayer with a matching size, so that
the AVPlayer can choose an alternate with the correct dimensions.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::MediaPlayerPrivateAVFoundationObjC):
(WebCore::MediaPlayerPrivateAVFoundationObjC::hasLayerRenderer):
(WebCore::MediaPlayerPrivateAVFoundationObjC::createVideoLayer):
(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerLayer):
(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayer):
(WebCore::MediaPlayerPrivateAVFoundationObjC::platformLayer):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170240 => 170241)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-21 14:55:48 UTC (rev 170240)
+++ trunk/Source/WebCore/ChangeLog 2014-06-21 14:59:07 UTC (rev 170241)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-06-21 Jer Noble <jer.noble@apple.com>
+
+ [Mac] Create and attach the AVPlayerLayer to the AVPlayer immediately if the media element is <video>.
+ https://bugs.webkit.org/show_bug.cgi?id=134131
+
+ Reviewed by Eric Carlson.
+
+ The AVPlayer uses the presence of an AVPlayerLayer to decide which alternate to display in the case of
+ HLS streams with audio-only alternates. To give the AVPlayer the most information with which to make its
+ decision, always create and attach an AVPlayerLayer before attaching an AVPlayerItem to the AVPlayerLayer.
+ In addition, retrieve the <video> element bounds and create an AVPlayerLayer with a matching size, so that
+ the AVPlayer can choose an alternate with the correct dimensions.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::MediaPlayerPrivateAVFoundationObjC):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::hasLayerRenderer):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createVideoLayer):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerLayer):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayer):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::platformLayer):
+
</ins><span class="cx"> 2014-06-21 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement ios -[WAKWindow convertBaseToScreen:]
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (170240 => 170241)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2014-06-21 14:55:48 UTC (rev 170240)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2014-06-21 14:59:07 UTC (rev 170241)
</span><span class="lines">@@ -170,6 +170,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void createAVPlayer();
</span><span class="cx"> virtual void createAVPlayerItem();
</span><ins>+ virtual void createAVPlayerLayer();
</ins><span class="cx"> virtual void createAVAssetForURL(const String& url);
</span><span class="cx"> virtual MediaPlayerPrivateAVFoundation::ItemStatus playerItemStatus() const;
</span><span class="cx"> virtual MediaPlayerPrivateAVFoundation::AssetStatus assetStatus() const;
</span><span class="lines">@@ -335,6 +336,7 @@
</span><span class="cx"> bool m_cachedHasEnabledAudio;
</span><span class="cx"> bool m_shouldBufferData;
</span><span class="cx"> bool m_cachedIsReadyForDisplay;
</span><ins>+ bool m_haveBeenAskedToCreateLayer;
</ins><span class="cx"> #if ENABLE(IOS_AIRPLAY)
</span><span class="cx"> mutable bool m_allowsWirelessVideoPlayback;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (170240 => 170241)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-06-21 14:55:48 UTC (rev 170240)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-06-21 14:59:07 UTC (rev 170241)
</span><span class="lines">@@ -388,6 +388,7 @@
</span><span class="cx"> , m_cachedHasEnabledAudio(false)
</span><span class="cx"> , m_shouldBufferData(true)
</span><span class="cx"> , m_cachedIsReadyForDisplay(false)
</span><ins>+ , m_haveBeenAskedToCreateLayer(false)
</ins><span class="cx"> #if ENABLE(IOS_AIRPLAY)
</span><span class="cx"> , m_allowsWirelessVideoPlayback(true)
</span><span class="cx"> #endif
</span><span class="lines">@@ -478,7 +479,7 @@
</span><span class="cx">
</span><span class="cx"> bool MediaPlayerPrivateAVFoundationObjC::hasLayerRenderer() const
</span><span class="cx"> {
</span><del>- return m_videoLayer;
</del><ins>+ return m_haveBeenAskedToCreateLayer;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool MediaPlayerPrivateAVFoundationObjC::hasContextRenderer() const
</span><span class="lines">@@ -536,7 +537,7 @@
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::createVideoLayer()
</span><span class="cx"> {
</span><del>- if (!m_avPlayer || m_videoLayer)
</del><ins>+ if (!m_avPlayer || m_haveBeenAskedToCreateLayer)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> auto weakThis = createWeakPtr();
</span><span class="lines">@@ -544,27 +545,40 @@
</span><span class="cx"> if (!weakThis)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!m_avPlayer || m_videoLayer)
</del><ins>+ if (!m_avPlayer || m_haveBeenAskedToCreateLayer)
</ins><span class="cx"> return;
</span><ins>+ m_haveBeenAskedToCreateLayer = true;
</ins><span class="cx">
</span><del>- m_videoLayer = adoptNS([[AVPlayerLayer alloc] init]);
- [m_videoLayer.get() setPlayer:m_avPlayer.get()];
- [m_videoLayer.get() setBackgroundColor:cachedCGColor(Color::black, ColorSpaceDeviceRGB)];
</del><ins>+ if (!m_videoLayer)
+ createAVPlayerLayer();
+
+ player()->mediaPlayerClient()->mediaPlayerRenderingModeChanged(player());
+ });
+}
+
+void MediaPlayerPrivateAVFoundationObjC::createAVPlayerLayer()
+{
+ if (!m_avPlayer)
+ return;
+
+ m_videoLayer = adoptNS([[AVPlayerLayer alloc] init]);
+ [m_videoLayer setPlayer:m_avPlayer.get()];
+ [m_videoLayer setBackgroundColor:cachedCGColor(Color::black, ColorSpaceDeviceRGB)];
</ins><span class="cx"> #ifndef NDEBUG
</span><del>- [m_videoLayer.get() setName:@"MediaPlayerPrivate AVPlayerLayer"];
</del><ins>+ [m_videoLayer setName:@"MediaPlayerPrivate AVPlayerLayer"];
</ins><span class="cx"> #endif
</span><del>- [m_videoLayer.get() addObserver:m_objcObserver.get() forKeyPath:@"readyForDisplay" options:NSKeyValueObservingOptionNew context:(void *)MediaPlayerAVFoundationObservationContextAVPlayerLayer];
- updateVideoLayerGravity();
- LOG(Media, "MediaPlayerPrivateAVFoundationObjC::createVideoLayer(%p) - returning %p", this, m_videoLayer.get());
</del><ins>+ [m_videoLayer addObserver:m_objcObserver.get() forKeyPath:@"readyForDisplay" options:NSKeyValueObservingOptionNew context:(void *)MediaPlayerAVFoundationObservationContextAVPlayerLayer];
+ updateVideoLayerGravity();
+ IntSize defaultSize = player()->mediaPlayerClient() ? player()->mediaPlayerClient()->mediaPlayerContentBoxRect().pixelSnappedSize() : IntSize();
+ [m_videoLayer setFrame:CGRectMake(0, 0, defaultSize.width(), defaultSize.height())];
+ LOG(Media, "MediaPlayerPrivateAVFoundationObjC::createVideoLayer(%p) - returning %p", this, m_videoLayer.get());
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- if (m_videoFullscreenLayer) {
- [m_videoLayer setFrame:CGRectMake(0, 0, m_videoFullscreenFrame.width(), m_videoFullscreenFrame.height())];
- [m_videoFullscreenLayer insertSublayer:m_videoLayer.get() atIndex:0];
- }
</del><ins>+ if (m_videoFullscreenLayer) {
+ [m_videoLayer setFrame:CGRectMake(0, 0, m_videoFullscreenFrame.width(), m_videoFullscreenFrame.height())];
+ [m_videoFullscreenLayer insertSublayer:m_videoLayer.get() atIndex:0];
+ }
</ins><span class="cx"> #endif
</span><del>- player()->mediaPlayerClient()->mediaPlayerRenderingModeChanged(player());
- });
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::destroyVideoLayer()
</span><span class="lines">@@ -747,6 +761,9 @@
</span><span class="cx"> [m_avPlayer.get() setAllowsExternalPlayback:m_allowsWirelessVideoPlayback];
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ if (player()->mediaPlayerClient() && player()->mediaPlayerClient()->mediaPlayerIsVideo())
+ createAVPlayerLayer();
+
</ins><span class="cx"> if (m_avPlayerItem)
</span><span class="cx"> [m_avPlayer.get() replaceCurrentItemWithPlayerItem:m_avPlayerItem.get()];
</span><span class="cx">
</span><span class="lines">@@ -874,7 +891,7 @@
</span><span class="cx">
</span><span class="cx"> PlatformLayer* MediaPlayerPrivateAVFoundationObjC::platformLayer() const
</span><span class="cx"> {
</span><del>- return m_videoLayer.get();
</del><ins>+ return m_haveBeenAskedToCreateLayer ? m_videoLayer.get() : nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre>
</div>
</div>
</body>
</html>