<!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>[214953] 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/214953">214953</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2017-04-05 11:34:24 -0700 (Wed, 05 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MediaStream] Video doesn't render in fullscreen on iOS
https://bugs.webkit.org/show_bug.cgi?id=170404
Reviewed by Youenn Fablet.
No new tests, filed https://bugs.webkit.org/show_bug.cgi?id=170512.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::MediaPlayerPrivateMediaStreamAVFObjC): Include
video fullscreen manager on iOS too.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::videoTransformationMatrix): Add paramater
to force transform recalculation.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::enqueueVideoSample): Restructure code since
the display layer resize happens elsewhere.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::ensureLayers): Include video fullscreen
manager on iOS too.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::destroyLayers): Ditto.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::platformLayer): Ditto.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::setVideoFullscreenLayer): Ditto.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::backgroundLayerBoundsChanged): Change the
display layer size and position immediately instead of waiting for the next sample buffer
so the display is correct when fullscreen mode changes when paused.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214952 => 214953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-04-05 18:26:25 UTC (rev 214952)
+++ trunk/Source/WebCore/ChangeLog 2017-04-05 18:34:24 UTC (rev 214953)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2017-04-05 Eric Carlson <eric.carlson@apple.com>
+
+ [MediaStream] Video doesn't render in fullscreen on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=170404
+
+ Reviewed by Youenn Fablet.
+
+ No new tests, filed https://bugs.webkit.org/show_bug.cgi?id=170512.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::MediaPlayerPrivateMediaStreamAVFObjC): Include
+ video fullscreen manager on iOS too.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::videoTransformationMatrix): Add paramater
+ to force transform recalculation.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::enqueueVideoSample): Restructure code since
+ the display layer resize happens elsewhere.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::ensureLayers): Include video fullscreen
+ manager on iOS too.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::destroyLayers): Ditto.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::platformLayer): Ditto.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::setVideoFullscreenLayer): Ditto.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::backgroundLayerBoundsChanged): Change the
+ display layer size and position immediately instead of waiting for the next sample buffer
+ so the display is correct when fullscreen mode changes when paused.
+
</ins><span class="cx"> 2017-04-05 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> Deprecate and remove URL.createObjectURL(mediastream)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h (214952 => 214953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h 2017-04-05 18:26:25 UTC (rev 214952)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h 2017-04-05 18:34:24 UTC (rev 214953)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> class PixelBufferConformerCV;
</span><span class="cx"> class VideoTrackPrivateMediaStream;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
</del><ins>+#if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
</ins><span class="cx"> class VideoFullscreenLayerManager;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -172,6 +172,7 @@
</span><span class="cx"> void updateTracks();
</span><span class="cx"> void updateRenderingMode();
</span><span class="cx"> void checkSelectedVideoTrack();
</span><ins>+ void updateDisplayLayer();
</ins><span class="cx">
</span><span class="cx"> void scheduleDeferredTask(Function<void ()>&&);
</span><span class="cx">
</span><span class="lines">@@ -206,7 +207,7 @@
</span><span class="cx"> void sampleBufferUpdated(MediaStreamTrackPrivate&, MediaSample&) override;
</span><span class="cx"> void readyStateChanged(MediaStreamTrackPrivate&) override;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
</del><ins>+#if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
</ins><span class="cx"> void setVideoFullscreenLayer(PlatformLayer*, std::function<void()> completionHandler) override;
</span><span class="cx"> void setVideoFullscreenFrame(FloatRect) override;
</span><span class="cx"> #endif
</span><span class="lines">@@ -215,7 +216,7 @@
</span><span class="cx">
</span><span class="cx"> AudioSourceProvider* audioSourceProvider() final;
</span><span class="cx">
</span><del>- CGAffineTransform videoTransformationMatrix(MediaSample&);
</del><ins>+ CGAffineTransform videoTransformationMatrix(MediaSample&, bool forceUpdate = false);
</ins><span class="cx">
</span><span class="cx"> MediaPlayer* m_player { nullptr };
</span><span class="cx"> WeakPtrFactory<MediaPlayerPrivateMediaStreamAVFObjC> m_weakPtrFactory;
</span><span class="lines">@@ -261,9 +262,8 @@
</span><span class="cx"> bool m_pendingSelectedTrackCheck { false };
</span><span class="cx"> bool m_shouldDisplayFirstVideoFrame { false };
</span><span class="cx"> bool m_transformIsValid { false };
</span><del>- bool m_videoSizeChanged;
</del><span class="cx">
</span><del>-#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
</del><ins>+#if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
</ins><span class="cx"> std::unique_ptr<VideoFullscreenLayerManager> m_videoFullscreenLayerManager;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm (214952 => 214953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2017-04-05 18:26:25 UTC (rev 214952)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2017-04-05 18:34:24 UTC (rev 214953)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> #import <wtf/MainThread.h>
</span><span class="cx"> #import <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
</del><ins>+#if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
</ins><span class="cx"> #import "VideoFullscreenLayerManager.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> , m_weakPtrFactory(this)
</span><span class="cx"> , m_statusChangeListener(adoptNS([[WebAVSampleBufferStatusChangeListener alloc] initWithParent:this]))
</span><span class="cx"> , m_clock(Clock::create())
</span><del>-#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
</del><ins>+#if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
</ins><span class="cx"> , m_videoFullscreenLayerManager(VideoFullscreenLayerManager::create())
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="lines">@@ -302,9 +302,9 @@
</span><span class="cx"> return timelineOffset;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CGAffineTransform MediaPlayerPrivateMediaStreamAVFObjC::videoTransformationMatrix(MediaSample& sample)
</del><ins>+CGAffineTransform MediaPlayerPrivateMediaStreamAVFObjC::videoTransformationMatrix(MediaSample& sample, bool forceUpdate)
</ins><span class="cx"> {
</span><del>- if (m_transformIsValid)
</del><ins>+ if (!forceUpdate && m_transformIsValid)
</ins><span class="cx"> return m_videoTransform;
</span><span class="cx">
</span><span class="cx"> CMSampleBufferRef sampleBuffer = sample.platformSample().sample.cmSampleBuffer;
</span><span class="lines">@@ -373,19 +373,9 @@
</span><span class="cx"> if (sample.videoOrientation() != m_videoOrientation || sample.videoMirrored() != m_videoMirrored) {
</span><span class="cx"> m_videoOrientation = sample.videoOrientation();
</span><span class="cx"> m_videoMirrored = sample.videoMirrored();
</span><del>- m_transformIsValid = false;
- }
-
- if (m_videoSizeChanged || !m_transformIsValid) {
</del><span class="cx"> runWithoutAnimations([this, &sample] {
</span><del>- auto backgroundBounds = m_backgroundLayer.get().bounds;
- auto videoBounds = backgroundBounds;
- if (m_videoOrientation == MediaSample::VideoOrientation::LandscapeRight || m_videoOrientation == MediaSample::VideoOrientation::LandscapeLeft)
- std::swap(videoBounds.size.width, videoBounds.size.height);
- m_sampleBufferDisplayLayer.get().bounds = videoBounds;
- m_sampleBufferDisplayLayer.get().position = { backgroundBounds.size.width / 2, backgroundBounds.size.height / 2};
- m_sampleBufferDisplayLayer.get().affineTransform = videoTransformationMatrix(sample);
- m_videoSizeChanged = false;
</del><ins>+ m_sampleBufferDisplayLayer.get().affineTransform = videoTransformationMatrix(sample, true);
+ updateDisplayLayer();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -491,8 +481,9 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> updateRenderingMode();
</span><del>-
-#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
</del><ins>+ updateDisplayLayer();
+
+#if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
</ins><span class="cx"> m_videoFullscreenLayerManager->setVideoLayer(m_backgroundLayer.get(), snappedIntRect(m_player->client().mediaPlayerContentBoxRect()).size());
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -510,7 +501,7 @@
</span><span class="cx">
</span><span class="cx"> updateRenderingMode();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
</del><ins>+#if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
</ins><span class="cx"> m_videoFullscreenLayerManager->didDestroyVideoLayer();
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -578,7 +569,7 @@
</span><span class="cx"> if (!m_backgroundLayer || m_displayMode == None)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
</del><ins>+#if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
</ins><span class="cx"> return m_videoFullscreenLayerManager->videoInlineLayer();
</span><span class="cx"> #else
</span><span class="cx"> return m_backgroundLayer.get();
</span><span class="lines">@@ -869,9 +860,14 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
-void MediaPlayerPrivateMediaStreamAVFObjC::setVideoFullscreenLayer(PlatformLayer *videoFullscreenLayer, std::function<void()> completionHandler)
</del><ins>+#if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
+void MediaPlayerPrivateMediaStreamAVFObjC::setVideoFullscreenLayer(PlatformLayer* videoFullscreenLayer, std::function<void()> completionHandler)
</ins><span class="cx"> {
</span><ins>+ if (m_videoFullscreenLayerManager->videoFullscreenLayer() == videoFullscreenLayer) {
+ completionHandler();
+ return;
+ }
+
</ins><span class="cx"> m_videoFullscreenLayerManager->setVideoFullscreenLayer(videoFullscreenLayer, completionHandler);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1118,14 +1114,29 @@
</span><span class="cx"> pixelBufferConformer = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateMediaStreamAVFObjC::backgroundLayerBoundsChanged()
</del><ins>+void MediaPlayerPrivateMediaStreamAVFObjC::updateDisplayLayer()
</ins><span class="cx"> {
</span><span class="cx"> if (!m_backgroundLayer || !m_sampleBufferDisplayLayer)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_videoSizeChanged = true;
</del><ins>+ auto backgroundBounds = m_backgroundLayer.get().bounds;
+ auto videoBounds = backgroundBounds;
+ if (m_videoOrientation == MediaSample::VideoOrientation::LandscapeRight || m_videoOrientation == MediaSample::VideoOrientation::LandscapeLeft)
+ std::swap(videoBounds.size.width, videoBounds.size.height);
+
+ m_sampleBufferDisplayLayer.get().bounds = videoBounds;
+ m_sampleBufferDisplayLayer.get().position = { backgroundBounds.size.width / 2, backgroundBounds.size.height / 2};
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaPlayerPrivateMediaStreamAVFObjC::backgroundLayerBoundsChanged()
+{
+ scheduleDeferredTask([this] {
+ runWithoutAnimations([this] {
+ updateDisplayLayer();
+ });
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+}
+
</ins><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>