<!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>[203423] trunk</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/203423">203423</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-19 15:35:51 -0700 (Tue, 19 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>HTMLVideoElement frames do not update on iOS when src is a MediaStream blob
https://bugs.webkit.org/show_bug.cgi?id=159833
<rdar://problem/27379487>
Patch by George Ruan <gruan@apple.com> on 2016-07-19
Reviewed by Eric Carlson.
Source/WebCore:
Test: fast/mediastream/MediaStream-video-element-displays-buffer.html
* WebCore.xcodeproj/project.pbxproj:
* platform/graphics/avfoundation/MediaSampleAVFObjC.h: Change create to return a Ref<T> instead
of RefPtr<T>
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h: Make observer of
MediaStreamTrackPrivate and make MediaPlayer use an AVSampleBufferDisplayLayer instead of CALayer.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm: Ditto.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::~MediaPlayerPrivateMediaStreamAVFObjC): Clean up
observers and AVSampleBufferDisplayLayer
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::isAvailable): Ensures AVSampleBufferDisplayLayer
is available.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::enqueueAudioSampleBufferFromTrack): Placeholder.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::enqueueVideoSampleBufferFromTrack): Responsible
for enqueuing sample buffers to the active video track.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::ensureLayer): Ensures that an AVSampleBufferDisplayLayer
exists.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::destroyLayer): Destroys the AVSampleBufferDisplayLayer.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::platformLayer): Replace CALayer with AVSampleBufferDisplayLayer.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::currentDisplayMode): Ditto.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::sampleBufferUpdated): Called from MediaStreamTrackPrivate when a
new SampleBuffer is available.
(WebCore::updateTracksOfType): Manage adding and removing self as observer from tracks.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::updateTracks): Replace CALayer with AVSampleBufferDisplayLayer
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::acceleratedRenderingStateChanged): Copied from
MediaPlayerPrivateMediaSourceAVFObjC.mm
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::load): Deleted CALayer.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::updateDisplayMode): Deleted process of updating CALayer.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::updateIntrinsicSize): Deleted CALayer.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::createPreviewLayers): Deleted.
* platform/mediastream/MediaStreamPrivate.cpp:
(WebCore::MediaStreamPrivate::updateActiveVideoTrack): Remove redundant check.
* platform/mediastream/MediaStreamTrackPrivate.cpp:
(WebCore::MediaStreamTrackPrivate::sourceHasMoreMediaData): Called from RealtimeMediaSource when a new SampleBuffer
is available.
* platform/mediastream/MediaStreamTrackPrivate.h:
(WebCore::MediaStreamTrackPrivate::Observer::sampleBufferUpdated): Relays to MediaPlayerPrivateMediaStream that
a new SampleBuffer is available to enqueue to the AVSampleBufferDisplayLayer.
* platform/mediastream/RealtimeMediaSource.cpp:
(WebCore::RealtimeMediaSource::mediaDataUpdated): Relays to all observers that a new SampleBuffer is available.
* platform/mediastream/RealtimeMediaSource.h:
* platform/mediastream/mac/AVVideoCaptureSource.mm:
(WebCore::AVVideoCaptureSource::processNewFrame): Calls mediaDataUpdated when a new SampleBuffer is captured.
LayoutTests:
* fast/mediastream/MediaStream-video-element-displays-buffer-expected.txt: Added.
* fast/mediastream/MediaStream-video-element-displays-buffer.html: Added. Checks that
a video element with a mediastream source displays frames that are neither black or transparent.
* fast/mediastream/resources/getUserMedia-helper.js:
(setupVideoElementWithStream): Sets up video element with global variable mediastream.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamresourcesgetUserMediahelperjs">trunk/LayoutTests/fast/mediastream/resources/getUserMedia-helper.js</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationMediaSampleAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/MediaSampleAVFObjC.h</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>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamPrivatecpp">trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamTrackPrivatecpp">trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamTrackPrivateh">trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeMediaSourcecpp">trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceh">trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVVideoCaptureSourcemm">trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreamvideoelementdisplaysbufferexpectedtxt">trunk/LayoutTests/fast/mediastream/MediaStream-video-element-displays-buffer-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreamvideoelementdisplaysbufferhtml">trunk/LayoutTests/fast/mediastream/MediaStream-video-element-displays-buffer.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (203422 => 203423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-07-19 21:55:51 UTC (rev 203422)
+++ trunk/LayoutTests/ChangeLog 2016-07-19 22:35:51 UTC (rev 203423)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-07-19 George Ruan <gruan@apple.com>
+
+ HTMLVideoElement frames do not update on iOS when src is a MediaStream blob
+ https://bugs.webkit.org/show_bug.cgi?id=159833
+ <rdar://problem/27379487>
+
+ Reviewed by Eric Carlson.
+
+ * fast/mediastream/MediaStream-video-element-displays-buffer-expected.txt: Added.
+ * fast/mediastream/MediaStream-video-element-displays-buffer.html: Added. Checks that
+ a video element with a mediastream source displays frames that are neither black or transparent.
+ * fast/mediastream/resources/getUserMedia-helper.js:
+ (setupVideoElementWithStream): Sets up video element with global variable mediastream.
+
</ins><span class="cx"> 2016-07-19 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Land test expectations for rdar://problem/27356144.
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreamvideoelementdisplaysbufferexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/mediastream/MediaStream-video-element-displays-buffer-expected.txt (0 => 203423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-video-element-displays-buffer-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-video-element-displays-buffer-expected.txt 2016-07-19 22:35:51 UTC (rev 203423)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+Tests that the stream displays captured buffers to the video element.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS mediaDevices.getUserMedia generated a stream successfully.
+video.src = window.URL.createObjectURL(mediaStream)
+video.play()
+
+ === checking pixels ===
+PASS isPixelTransparent(buffer) is true
+PASS isPixelTransparent(buffer) is false
+PASS isPixelBlack(buffer) is false
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreamvideoelementdisplaysbufferhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/mediastream/MediaStream-video-element-displays-buffer.html (0 => 203423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-video-element-displays-buffer.html (rev 0)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-video-element-displays-buffer.html 2016-07-19 22:35:51 UTC (rev 203423)
</span><span class="lines">@@ -0,0 +1,71 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <script src="../../resources/js-test-pre.js"></script>
+ <script src="./resources/getUserMedia-helper.js"></script>
+</head>
+<body onload="start()">
+<p id="description"></p>
+<div id="console"></div>
+<video controls width="680" height="360"></video>
+<canvas width="680" height="360"></canvas>
+<script>
+ let mediaStream;
+ let video;
+ let canvas;
+ let context;
+
+ let buffer;
+
+ function isPixelTransparent(pixel)
+ {
+ return pixel[0] === 0 && pixel[1] === 0 && pixel[2] === 0 && pixel[3] === 0;
+ }
+
+ function isPixelBlack(pixel)
+ {
+ return pixel[0] === 255 && pixel[1] === 255 && pixel[2] === 255 && pixel[3] === 255;
+ }
+
+ function verifyFramesBeingDisplayed()
+ {
+ debug('<br> === checking pixels ===');
+
+ context.clearRect(0, 0, canvas.width, canvas.height);
+
+ buffer = context.getImageData(0, 0, 1, 1).data;
+ shouldBeTrue('isPixelTransparent(buffer)');
+
+ context.drawImage(video, 0, 0, canvas.width, canvas.height);
+
+ buffer = context.getImageData(0, 0, 1, 1).data;
+ shouldBeFalse('isPixelTransparent(buffer)');
+ shouldBeFalse('isPixelBlack(buffer)');
+
+ finishJSTest();
+ }
+
+ function canplay()
+ {
+ evalAndLog('video.play()');
+ }
+
+ function start()
+ {
+ description("Tests that the stream displays captured buffers to the video element.");
+
+ canvas = document.querySelector('canvas');
+ context = canvas.getContext('2d');
+
+ video = document.querySelector('video');
+ video.addEventListener('canplay', canplay, false);
+ video.addEventListener('canplaythrough', verifyFramesBeingDisplayed, false);
+
+ getUserMedia("allow", {video:true}, setupVideoElementWithStream);
+ }
+
+ window.jsTestIsAsync = true;
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamresourcesgetUserMediahelperjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/resources/getUserMedia-helper.js (203422 => 203423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/resources/getUserMedia-helper.js 2016-07-19 21:55:51 UTC (rev 203422)
+++ trunk/LayoutTests/fast/mediastream/resources/getUserMedia-helper.js 2016-07-19 22:35:51 UTC (rev 203423)
</span><span class="lines">@@ -24,3 +24,10 @@
</span><span class="cx"> testFailed('getUserMedia failed:' + e);
</span><span class="cx"> finishJSTest();
</span><span class="cx"> }
</span><ins>+
+function setupVideoElementWithStream(stream)
+{
+ mediaStream = stream;
+ testPassed('mediaDevices.getUserMedia generated a stream successfully.');
+ evalAndLog('video.src = window.URL.createObjectURL(mediaStream)');
+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203422 => 203423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-19 21:55:51 UTC (rev 203422)
+++ trunk/Source/WebCore/ChangeLog 2016-07-19 22:35:51 UTC (rev 203423)
</span><span class="lines">@@ -1,3 +1,55 @@
</span><ins>+2016-07-19 George Ruan <gruan@apple.com>
+
+ HTMLVideoElement frames do not update on iOS when src is a MediaStream blob
+ https://bugs.webkit.org/show_bug.cgi?id=159833
+ <rdar://problem/27379487>
+
+ Reviewed by Eric Carlson.
+
+ Test: fast/mediastream/MediaStream-video-element-displays-buffer.html
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/graphics/avfoundation/MediaSampleAVFObjC.h: Change create to return a Ref<T> instead
+ of RefPtr<T>
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h: Make observer of
+ MediaStreamTrackPrivate and make MediaPlayer use an AVSampleBufferDisplayLayer instead of CALayer.
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm: Ditto.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::~MediaPlayerPrivateMediaStreamAVFObjC): Clean up
+ observers and AVSampleBufferDisplayLayer
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::isAvailable): Ensures AVSampleBufferDisplayLayer
+ is available.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::enqueueAudioSampleBufferFromTrack): Placeholder.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::enqueueVideoSampleBufferFromTrack): Responsible
+ for enqueuing sample buffers to the active video track.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::ensureLayer): Ensures that an AVSampleBufferDisplayLayer
+ exists.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::destroyLayer): Destroys the AVSampleBufferDisplayLayer.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::platformLayer): Replace CALayer with AVSampleBufferDisplayLayer.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::currentDisplayMode): Ditto.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::sampleBufferUpdated): Called from MediaStreamTrackPrivate when a
+ new SampleBuffer is available.
+ (WebCore::updateTracksOfType): Manage adding and removing self as observer from tracks.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::updateTracks): Replace CALayer with AVSampleBufferDisplayLayer
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::acceleratedRenderingStateChanged): Copied from
+ MediaPlayerPrivateMediaSourceAVFObjC.mm
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::load): Deleted CALayer.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::updateDisplayMode): Deleted process of updating CALayer.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::updateIntrinsicSize): Deleted CALayer.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::createPreviewLayers): Deleted.
+ * platform/mediastream/MediaStreamPrivate.cpp:
+ (WebCore::MediaStreamPrivate::updateActiveVideoTrack): Remove redundant check.
+ * platform/mediastream/MediaStreamTrackPrivate.cpp:
+ (WebCore::MediaStreamTrackPrivate::sourceHasMoreMediaData): Called from RealtimeMediaSource when a new SampleBuffer
+ is available.
+ * platform/mediastream/MediaStreamTrackPrivate.h:
+ (WebCore::MediaStreamTrackPrivate::Observer::sampleBufferUpdated): Relays to MediaPlayerPrivateMediaStream that
+ a new SampleBuffer is available to enqueue to the AVSampleBufferDisplayLayer.
+ * platform/mediastream/RealtimeMediaSource.cpp:
+ (WebCore::RealtimeMediaSource::mediaDataUpdated): Relays to all observers that a new SampleBuffer is available.
+ * platform/mediastream/RealtimeMediaSource.h:
+ * platform/mediastream/mac/AVVideoCaptureSource.mm:
+ (WebCore::AVVideoCaptureSource::processNewFrame): Calls mediaDataUpdated when a new SampleBuffer is captured.
+
</ins><span class="cx"> 2016-07-19 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Get rid of a #define private public hack in WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (203422 => 203423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-07-19 21:55:51 UTC (rev 203422)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-07-19 22:35:51 UTC (rev 203423)
</span><span class="lines">@@ -985,6 +985,7 @@
</span><span class="cx"> 1AFE119A0CBFFCC4003017FA /* JSSQLResultSetRowList.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFE11980CBFFCC4003017FA /* JSSQLResultSetRowList.h */; };
</span><span class="cx"> 1B124D8D1D380B7000ECDFB0 /* MediaSampleAVFObjC.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B124D8C1D380B7000ECDFB0 /* MediaSampleAVFObjC.h */; };
</span><span class="cx"> 1B124D8F1D380BB600ECDFB0 /* MediaSampleAVFObjC.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1B124D8E1D380BB600ECDFB0 /* MediaSampleAVFObjC.mm */; };
</span><ins>+ 1BF9DB3C1D3973AD0026AEB7 /* MediaSample.h in Headers */ = {isa = PBXBuildFile; fileRef = CD641EC7181ED60100EE4C41 /* MediaSample.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 1C010700192594DF008A4201 /* InlineTextBoxStyle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C0106FE192594DF008A4201 /* InlineTextBoxStyle.cpp */; };
</span><span class="cx"> 1C010701192594DF008A4201 /* InlineTextBoxStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C0106FF192594DF008A4201 /* InlineTextBoxStyle.h */; };
</span><span class="cx"> 1C0939EA1A13E12900B788E5 /* CachedSVGFont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C0939E81A13E12900B788E5 /* CachedSVGFont.cpp */; };
</span><span class="lines">@@ -27034,6 +27035,7 @@
</span><span class="cx"> 75793EC90D0CE72D007FC0AC /* JSMessageEvent.h in Headers */,
</span><span class="cx"> E1ADEDDA0E76BD93004A1A5E /* JSMessagePort.h in Headers */,
</span><span class="cx"> 41F584C7104652CB009CAA64 /* JSMessagePortCustom.h in Headers */,
</span><ins>+ 1BF9DB3C1D3973AD0026AEB7 /* MediaSample.h in Headers */,
</ins><span class="cx"> 2D6F3E951C1F85550061DBD4 /* JSMockPageOverlay.h in Headers */,
</span><span class="cx"> E38838991BAD145F00D62EE3 /* JSModuleLoader.h in Headers */,
</span><span class="cx"> A86629D109DA2B48009633A5 /* JSMouseEvent.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationMediaSampleAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaSampleAVFObjC.h (203422 => 203423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaSampleAVFObjC.h 2016-07-19 21:55:51 UTC (rev 203422)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaSampleAVFObjC.h 2016-07-19 22:35:51 UTC (rev 203423)
</span><span class="lines">@@ -32,8 +32,8 @@
</span><span class="cx">
</span><span class="cx"> class MediaSampleAVFObjC final : public MediaSample {
</span><span class="cx"> public:
</span><del>- static RefPtr<MediaSampleAVFObjC> create(CMSampleBufferRef sample, int trackID) { return adoptRef(new MediaSampleAVFObjC(sample, trackID)); }
- static RefPtr<MediaSampleAVFObjC> create(CMSampleBufferRef sample) { return adoptRef(new MediaSampleAVFObjC(sample)); }
</del><ins>+ static Ref<MediaSampleAVFObjC> create(CMSampleBufferRef sample, int trackID) { return adoptRef(*new MediaSampleAVFObjC(sample, trackID)); }
+ static Ref<MediaSampleAVFObjC> create(CMSampleBufferRef sample) { return adoptRef(*new MediaSampleAVFObjC(sample)); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> MediaSampleAVFObjC(CMSampleBufferRef sample)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h (203422 => 203423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h 2016-07-19 21:55:51 UTC (rev 203422)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h 2016-07-19 22:35:51 UTC (rev 203423)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #if ENABLE(MEDIA_STREAM) && USE(AVFOUNDATION)
</span><span class="cx">
</span><span class="cx"> #include "MediaPlayerPrivate.h"
</span><ins>+#include "MediaSample.h"
</ins><span class="cx"> #include "MediaStreamPrivate.h"
</span><span class="cx"> #include <wtf/Function.h>
</span><span class="cx"> #include <wtf/MediaTime.h>
</span><span class="lines">@@ -36,6 +37,7 @@
</span><span class="cx"> #include <wtf/WeakPtr.h>
</span><span class="cx">
</span><span class="cx"> OBJC_CLASS AVSampleBufferAudioRenderer;
</span><ins>+OBJC_CLASS AVSampleBufferDisplayLayer;
</ins><span class="cx"> OBJC_CLASS AVStreamSession;
</span><span class="cx"> typedef struct opaqueCMSampleBuffer *CMSampleBufferRef;
</span><span class="cx">
</span><span class="lines">@@ -51,7 +53,7 @@
</span><span class="cx"> class VideoFullscreenLayerManager;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-class MediaPlayerPrivateMediaStreamAVFObjC : public MediaPlayerPrivateInterface, public MediaStreamPrivate::Observer {
</del><ins>+class MediaPlayerPrivateMediaStreamAVFObjC : public MediaPlayerPrivateInterface, public MediaStreamPrivate::Observer, public MediaStreamTrackPrivate::Observer {
</ins><span class="cx"> public:
</span><span class="cx"> explicit MediaPlayerPrivateMediaStreamAVFObjC(MediaPlayer*);
</span><span class="cx"> virtual ~MediaPlayerPrivateMediaStreamAVFObjC();
</span><span class="lines">@@ -70,6 +72,9 @@
</span><span class="cx">
</span><span class="cx"> WeakPtr<MediaPlayerPrivateMediaStreamAVFObjC> createWeakPtr() { return m_weakPtrFactory.createWeakPtr(); }
</span><span class="cx">
</span><ins>+ void ensureLayer();
+ void destroyLayer();
+
</ins><span class="cx"> private:
</span><span class="cx"> // MediaPlayerPrivateInterface
</span><span class="cx">
</span><span class="lines">@@ -117,10 +122,14 @@
</span><span class="cx">
</span><span class="cx"> void setSize(const IntSize&) override { /* No-op */ }
</span><span class="cx">
</span><ins>+ void enqueueAudioSampleBufferFromTrack(MediaStreamTrackPrivate&, PlatformSample);
+ void enqueueVideoSampleBufferFromTrack(MediaStreamTrackPrivate&, PlatformSample);
+
</ins><span class="cx"> void paint(GraphicsContext&, const FloatRect&) override;
</span><span class="cx"> void paintCurrentFrameInContext(GraphicsContext&, const FloatRect&) override;
</span><span class="cx"> bool metaDataAvailable() const { return m_mediaStreamPrivate && m_readyState >= MediaPlayer::HaveMetadata; }
</span><span class="cx">
</span><ins>+ void acceleratedRenderingStateChanged() override;
</ins><span class="cx"> bool supportsAcceleratedRendering() const override { return true; }
</span><span class="cx">
</span><span class="cx"> bool hasSingleSecurityOrigin() const override { return true; }
</span><span class="lines">@@ -139,7 +148,6 @@
</span><span class="cx"> void updateReadyState();
</span><span class="cx">
</span><span class="cx"> void updateIntrinsicSize(const FloatSize&);
</span><del>- void createPreviewLayers();
</del><span class="cx"> void updateTracks();
</span><span class="cx"> void renderingModeChanged();
</span><span class="cx">
</span><span class="lines">@@ -160,6 +168,13 @@
</span><span class="cx"> void didAddTrack(MediaStreamTrackPrivate&) override;
</span><span class="cx"> void didRemoveTrack(MediaStreamTrackPrivate&) override;
</span><span class="cx">
</span><ins>+ // MediaStreamPrivateTrack::Observer
+ void trackEnded(MediaStreamTrackPrivate&) override { };
+ void trackMutedChanged(MediaStreamTrackPrivate&) override { };
+ void trackSettingsChanged(MediaStreamTrackPrivate&) override { };
+ void trackEnabledChanged(MediaStreamTrackPrivate&) override { };
+ void sampleBufferUpdated(MediaStreamTrackPrivate&, MediaSample&) override;
+
</ins><span class="cx"> #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
</span><span class="cx"> void setVideoFullscreenLayer(PlatformLayer*, std::function<void()> completionHandler) override;
</span><span class="cx"> void setVideoFullscreenFrame(FloatRect) override;
</span><span class="lines">@@ -168,8 +183,7 @@
</span><span class="cx"> MediaPlayer* m_player { nullptr };
</span><span class="cx"> WeakPtrFactory<MediaPlayerPrivateMediaStreamAVFObjC> m_weakPtrFactory;
</span><span class="cx"> RefPtr<MediaStreamPrivate> m_mediaStreamPrivate;
</span><del>- mutable RetainPtr<CALayer> m_previewLayer;
- mutable RetainPtr<PlatformLayer> m_videoBackgroundLayer;
</del><ins>+ RetainPtr<AVSampleBufferDisplayLayer> m_sampleBufferDisplayLayer;
</ins><span class="cx"> RetainPtr<CGImageRef> m_pausedImage;
</span><span class="cx"> std::unique_ptr<Clock> m_clock;
</span><span class="cx">
</span><span class="lines">@@ -185,6 +199,7 @@
</span><span class="cx"> bool m_muted { false };
</span><span class="cx"> bool m_haveEverPlayed { false };
</span><span class="cx"> bool m_ended { false };
</span><ins>+ bool m_hasEverEnqueuedVideoFrame { false };
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
</span><span class="cx"> std::unique_ptr<VideoFullscreenLayerManager> m_videoFullscreenLayerManager;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm (203422 => 203423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2016-07-19 21:55:51 UTC (rev 203422)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2016-07-19 22:35:51 UTC (rev 203423)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #import "Logging.h"
</span><span class="cx"> #import "MediaStreamPrivate.h"
</span><span class="cx"> #import "VideoTrackPrivateMediaStream.h"
</span><ins>+#import <AVFoundation/AVSampleBufferDisplayLayer.h>
</ins><span class="cx"> #import <QuartzCore/CALayer.h>
</span><span class="cx"> #import <QuartzCore/CATransaction.h>
</span><span class="cx"> #import <objc_runtime.h>
</span><span class="lines">@@ -52,6 +53,8 @@
</span><span class="cx">
</span><span class="cx"> SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation)
</span><span class="cx">
</span><ins>+SOFT_LINK_CLASS_OPTIONAL(AVFoundation, AVSampleBufferDisplayLayer)
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> #pragma mark -
</span><span class="lines">@@ -71,8 +74,17 @@
</span><span class="cx"> MediaPlayerPrivateMediaStreamAVFObjC::~MediaPlayerPrivateMediaStreamAVFObjC()
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "MediaPlayerPrivateMediaStreamAVFObjC::~MediaPlayerPrivateMediaStreamAVFObjC(%p)", this);
</span><del>- if (m_mediaStreamPrivate)
</del><ins>+ if (m_mediaStreamPrivate) {
</ins><span class="cx"> m_mediaStreamPrivate->removeObserver(*this);
</span><ins>+
+ for (auto& track : m_mediaStreamPrivate->tracks())
+ track->removeObserver(*this);
+ }
+
+ m_audioTrackMap.clear();
+ m_videoTrackMap.clear();
+
+ destroyLayer();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark -
</span><span class="lines">@@ -87,7 +99,7 @@
</span><span class="cx">
</span><span class="cx"> bool MediaPlayerPrivateMediaStreamAVFObjC::isAvailable()
</span><span class="cx"> {
</span><del>- return AVFoundationLibrary() && isCoreMediaFrameworkAvailable();
</del><ins>+ return AVFoundationLibrary() && isCoreMediaFrameworkAvailable() && getAVSampleBufferDisplayLayerClass();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateMediaStreamAVFObjC::getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>& types)
</span><span class="lines">@@ -105,6 +117,60 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark -
</span><ins>+#pragma mark AVSampleBuffer Methods
+
+void MediaPlayerPrivateMediaStreamAVFObjC::enqueueAudioSampleBufferFromTrack(MediaStreamTrackPrivate&, PlatformSample)
+{
+ // FIXME: https://bugs.webkit.org/show_bug.cgi?id=159836
+}
+
+void MediaPlayerPrivateMediaStreamAVFObjC::enqueueVideoSampleBufferFromTrack(MediaStreamTrackPrivate& track, PlatformSample platformSample)
+{
+ if (&track != m_mediaStreamPrivate->activeVideoTrack())
+ return;
+
+ if (m_displayMode == LivePreview && [m_sampleBufferDisplayLayer isReadyForMoreMediaData]) {
+ [m_sampleBufferDisplayLayer enqueueSampleBuffer:platformSample.sample.cmSampleBuffer];
+
+ if (!m_hasEverEnqueuedVideoFrame) {
+ m_hasEverEnqueuedVideoFrame = true;
+ m_player->firstVideoFrameAvailable();
+ }
+ }
+}
+
+void MediaPlayerPrivateMediaStreamAVFObjC::ensureLayer()
+{
+ if (m_sampleBufferDisplayLayer)
+ return;
+
+ m_sampleBufferDisplayLayer = adoptNS([allocAVSampleBufferDisplayLayerInstance() init]);
+#ifndef NDEBUG
+ [m_sampleBufferDisplayLayer setName:@"MediaPlayerPrivateMediaStreamAVFObjC AVSampleBufferDisplayLayer"];
+#endif
+
+ renderingModeChanged();
+
+#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+ m_videoFullscreenLayerManager->setVideoLayer(m_sampleBufferDisplayLayer.get(), snappedIntRect(m_player->client().mediaPlayerContentBoxRect()).size());
+#endif
+}
+
+void MediaPlayerPrivateMediaStreamAVFObjC::destroyLayer()
+{
+ if (!m_sampleBufferDisplayLayer)
+ return;
+
+ [m_sampleBufferDisplayLayer flush];
+ m_sampleBufferDisplayLayer = nullptr;
+ renderingModeChanged();
+
+#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+ m_videoFullscreenLayerManager->didDestroyVideoLayer();
+#endif
+}
+
+#pragma mark -
</ins><span class="cx"> #pragma mark MediaPlayerPrivateInterface Overrides
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateMediaStreamAVFObjC::load(const String&)
</span><span class="lines">@@ -129,7 +195,6 @@
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "MediaPlayerPrivateMediaStreamAVFObjC::load(%p)", this);
</span><span class="cx">
</span><del>- m_previewLayer = nullptr;
</del><span class="cx"> m_intrinsicSize = FloatSize();
</span><span class="cx">
</span><span class="cx"> m_mediaStreamPrivate = &stream;
</span><span class="lines">@@ -157,19 +222,19 @@
</span><span class="cx">
</span><span class="cx"> PlatformLayer* MediaPlayerPrivateMediaStreamAVFObjC::platformLayer() const
</span><span class="cx"> {
</span><del>- if (!m_videoBackgroundLayer || m_displayMode == None)
</del><ins>+ if (!m_sampleBufferDisplayLayer || m_displayMode == None)
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
</span><span class="cx"> return m_videoFullscreenLayerManager->videoInlineLayer();
</span><span class="cx"> #else
</span><del>- return m_videoBackgroundLayer.get();
</del><ins>+ return m_sampleBufferDisplayLayer.get();
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaPlayerPrivateMediaStreamAVFObjC::DisplayMode MediaPlayerPrivateMediaStreamAVFObjC::currentDisplayMode() const
</span><span class="cx"> {
</span><del>- if (m_ended || m_intrinsicSize.isEmpty() || !metaDataAvailable() || !m_videoBackgroundLayer)
</del><ins>+ if (m_ended || m_intrinsicSize.isEmpty() || !metaDataAvailable() || !m_sampleBufferDisplayLayer)
</ins><span class="cx"> return None;
</span><span class="cx">
</span><span class="cx"> if (m_mediaStreamPrivate->activeVideoTrack() && !m_mediaStreamPrivate->activeVideoTrack()->enabled())
</span><span class="lines">@@ -194,51 +259,6 @@
</span><span class="cx">
</span><span class="cx"> if (m_displayMode == None)
</span><span class="cx"> return;
</span><del>-
- [CATransaction begin];
- [CATransaction setAnimationDuration:0];
- [CATransaction setDisableActions:YES];
-
- do {
- if (m_displayMode < LivePreview) {
-
- if (m_displayMode == PausedImage) {
- if (m_videoBackgroundLayer.get().contents)
- break;
-
- RefPtr<Image> image = m_mediaStreamPrivate->currentFrameImage();
- if (!image) {
- m_displayMode = PaintItBlack;
- continue;
- }
-
- m_pausedImage = image->getCGImageRef();
- if (!m_pausedImage) {
- m_displayMode = PaintItBlack;
- continue;
- }
-
- m_videoBackgroundLayer.get().contents = (id)m_pausedImage.get();
- m_videoBackgroundLayer.get().backgroundColor = nil;
- } else {
- m_videoBackgroundLayer.get().contents = nil;
- m_videoBackgroundLayer.get().backgroundColor = cachedCGColor(Color::black);
- m_pausedImage = nullptr;
- }
-
- m_previewLayer.get().hidden = true;
-
- } else {
-
- m_previewLayer.get().hidden = false;
- m_videoBackgroundLayer.get().contents = nil;
- m_pausedImage = nullptr;
- }
-
- break;
- } while (1);
-
- [CATransaction commit];
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateMediaStreamAVFObjC::play()
</span><span class="lines">@@ -387,46 +407,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_intrinsicSize = size;
</span><del>-
- if (m_videoBackgroundLayer || !m_player || !m_player->client().mediaPlayerRenderingCanBeAccelerated(m_player))
- return;
-
- if (!m_mediaStreamPrivate || !m_mediaStreamPrivate->platformLayer())
- return;
-
- createPreviewLayers();
</del><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateMediaStreamAVFObjC::createPreviewLayers()
-{
- if (!m_videoBackgroundLayer) {
- m_videoBackgroundLayer = adoptNS([[CALayer alloc] init]);
- m_videoBackgroundLayer.get().name = @"MediaPlayerPrivateMediaStreamAVFObjC preview background layer";
-
-#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
- m_videoFullscreenLayerManager->setVideoLayer(m_videoBackgroundLayer.get(), snappedIntRect(m_player->client().mediaPlayerContentBoxRect()).size());
-#endif
- }
-
- if (!m_previewLayer) {
- m_previewLayer = m_mediaStreamPrivate->platformLayer();
- if (m_previewLayer) {
- m_previewLayer.get().contentsGravity = kCAGravityResizeAspect;
- m_previewLayer.get().anchorPoint = CGPointZero;
- if (!m_playing)
- m_previewLayer.get().hidden = true;
-
- [m_videoBackgroundLayer addSublayer:m_previewLayer.get()];
-#if PLATFORM(MAC)
- [m_previewLayer setFrame:[m_videoBackgroundLayer bounds]];
- [m_previewLayer setAutoresizingMask:(kCALayerWidthSizable | kCALayerHeightSizable)];
-#endif
- }
- }
-
- renderingModeChanged();
-}
-
</del><span class="cx"> void MediaPlayerPrivateMediaStreamAVFObjC::renderingModeChanged()
</span><span class="cx"> {
</span><span class="cx"> updateDisplayMode();
</span><span class="lines">@@ -473,6 +455,26 @@
</span><span class="cx"> updateTracks();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaPlayerPrivateMediaStreamAVFObjC::sampleBufferUpdated(MediaStreamTrackPrivate& track, MediaSample& mediaSample)
+{
+ ASSERT(track.id() == mediaSample.trackID());
+ ASSERT(mediaSample.platformSample().type == PlatformSample::CMSampleBufferType);
+ ASSERT(m_mediaStreamPrivate);
+
+
+ switch (track.type()) {
+ case RealtimeMediaSource::None:
+ // Do nothing.
+ break;
+ case RealtimeMediaSource::Audio:
+ // FIXME: https://bugs.webkit.org/show_bug.cgi?id=159836
+ break;
+ case RealtimeMediaSource::Video:
+ enqueueVideoSampleBufferFromTrack(track, mediaSample.platformSample());
+ break;
+ }
+}
+
</ins><span class="cx"> #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
</span><span class="cx"> void MediaPlayerPrivateMediaStreamAVFObjC::setVideoFullscreenLayer(PlatformLayer *videoFullscreenLayer, std::function<void()> completionHandler)
</span><span class="cx"> {
</span><span class="lines">@@ -486,7 +488,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> template <typename RefT, typename PassRefT>
</span><del>-void updateTracksOfType(HashMap<String, RefT>& trackMap, RealtimeMediaSource::Type trackType, MediaStreamTrackPrivateVector& currentTracks, RefT (*itemFactory)(MediaStreamTrackPrivate&), MediaPlayer* player, void (MediaPlayer::*removedFunction)(PassRefT), void (MediaPlayer::*addedFunction)(PassRefT), std::function<void(RefT, int)> configureCallback)
</del><ins>+void updateTracksOfType(HashMap<String, RefT>& trackMap, RealtimeMediaSource::Type trackType, MediaStreamTrackPrivateVector& currentTracks, RefT (*itemFactory)(MediaStreamTrackPrivate&), MediaPlayer* player, void (MediaPlayer::*removedFunction)(PassRefT), void (MediaPlayer::*addedFunction)(PassRefT), std::function<void(RefT, int)> configureCallback, MediaPlayerPrivateMediaStreamAVFObjC* trackObserver)
</ins><span class="cx"> {
</span><span class="cx"> Vector<RefT> removedTracks;
</span><span class="cx"> Vector<RefT> addedTracks;
</span><span class="lines">@@ -519,17 +521,20 @@
</span><span class="cx"> for (const auto& track : trackMap.values())
</span><span class="cx"> configureCallback(track, index++);
</span><span class="cx">
</span><del>- for (auto& track : removedTracks)
</del><ins>+ for (auto& track : removedTracks) {
</ins><span class="cx"> (player->*removedFunction)(track);
</span><ins>+ track->streamTrack()->removeObserver(*trackObserver);
+ }
</ins><span class="cx">
</span><del>- for (auto& track : addedTracks)
</del><ins>+ for (auto& track : addedTracks) {
</ins><span class="cx"> (player->*addedFunction)(track);
</span><ins>+ track->streamTrack()->addObserver(*trackObserver);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateMediaStreamAVFObjC::updateTracks()
</span><span class="cx"> {
</span><span class="cx"> MediaStreamTrackPrivateVector currentTracks = m_mediaStreamPrivate->tracks();
</span><del>- bool selectedVideoTrackChanged = false;
</del><span class="cx">
</span><span class="cx"> std::function<void(RefPtr<AudioTrackPrivateMediaStream>, int)> enableAudioTrack = [this](auto track, int index)
</span><span class="cx"> {
</span><span class="lines">@@ -536,24 +541,17 @@
</span><span class="cx"> track->setTrackIndex(index);
</span><span class="cx"> track->setEnabled(track->streamTrack()->enabled() && !track->streamTrack()->muted());
</span><span class="cx"> };
</span><del>- updateTracksOfType(m_audioTrackMap, RealtimeMediaSource::Audio, currentTracks, &AudioTrackPrivateMediaStream::create, m_player, &MediaPlayer::removeAudioTrack, &MediaPlayer::addAudioTrack, enableAudioTrack);
</del><ins>+ updateTracksOfType(m_audioTrackMap, RealtimeMediaSource::Audio, currentTracks, &AudioTrackPrivateMediaStream::create, m_player, &MediaPlayer::removeAudioTrack, &MediaPlayer::addAudioTrack, enableAudioTrack, this);
</ins><span class="cx">
</span><del>- std::function<void(RefPtr<VideoTrackPrivateMediaStream>, int)> enableVideoTrack = [this, &selectedVideoTrackChanged](auto track, int index)
</del><ins>+ std::function<void(RefPtr<VideoTrackPrivateMediaStream>, int)> enableVideoTrack = [this](auto track, int index)
</ins><span class="cx"> {
</span><del>- bool wasSelected = track->selected();
</del><span class="cx"> track->setTrackIndex(index);
</span><span class="cx"> track->setSelected(track->streamTrack() == m_mediaStreamPrivate->activeVideoTrack());
</span><del>- if (wasSelected != track->selected())
- selectedVideoTrackChanged = true;
</del><ins>+
+ if (track->selected())
+ ensureLayer();
</ins><span class="cx"> };
</span><del>- updateTracksOfType(m_videoTrackMap, RealtimeMediaSource::Video, currentTracks, &VideoTrackPrivateMediaStream::create, m_player, &MediaPlayer::removeVideoTrack, &MediaPlayer::addVideoTrack, enableVideoTrack);
-
- if (selectedVideoTrackChanged) {
- if (m_previewLayer)
- m_previewLayer = nullptr;
-
- createPreviewLayers();
- }
</del><ins>+ updateTracksOfType(m_videoTrackMap, RealtimeMediaSource::Video, currentTracks, &VideoTrackPrivateMediaStream::create, m_player, &MediaPlayer::removeVideoTrack, &MediaPlayer::addVideoTrack, enableVideoTrack, this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<PlatformTimeRanges> MediaPlayerPrivateMediaStreamAVFObjC::seekable() const
</span><span class="lines">@@ -593,6 +591,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaPlayerPrivateMediaStreamAVFObjC::acceleratedRenderingStateChanged()
+{
+ if (m_player->client().mediaPlayerRenderingCanBeAccelerated(m_player))
+ ensureLayer();
+ else
+ destroyLayer();
+}
+
</ins><span class="cx"> String MediaPlayerPrivateMediaStreamAVFObjC::engineDescription() const
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<String> description(ASCIILiteral("AVFoundation MediaStream Engine"));
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp (203422 => 203423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2016-07-19 21:55:51 UTC (rev 203422)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2016-07-19 22:35:51 UTC (rev 203423)
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_activeVideoTrack = nullptr;
</span><span class="cx"> for (auto& track : m_trackSet.values()) {
</span><del>- if (!track->ended() && track->type() == RealtimeMediaSource::Type::Video && !track->ended()) {
</del><ins>+ if (!track->ended() && track->type() == RealtimeMediaSource::Type::Video) {
</ins><span class="cx"> m_activeVideoTrack = track.get();
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamTrackPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp (203422 => 203423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp 2016-07-19 21:55:51 UTC (rev 203422)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp 2016-07-19 22:35:51 UTC (rev 203423)
</span><span class="lines">@@ -213,6 +213,13 @@
</span><span class="cx"> return !m_isEnded;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaStreamTrackPrivate::sourceHasMoreMediaData(MediaSample& mediaSample)
+{
+ mediaSample.setTrackID(id());
+ for (auto& observer : m_observers)
+ observer->sampleBufferUpdated(*this, mediaSample);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MEDIA_STREAM)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamTrackPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h (203422 => 203423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h 2016-07-19 21:55:51 UTC (rev 203422)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h 2016-07-19 22:35:51 UTC (rev 203423)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx">
</span><span class="cx"> class AudioSourceProvider;
</span><span class="cx"> class GraphicsContext;
</span><ins>+class MediaSample;
</ins><span class="cx"> class MediaSourceSettings;
</span><span class="cx"> class RealtimeMediaSourceCapabilities;
</span><span class="cx">
</span><span class="lines">@@ -50,6 +51,7 @@
</span><span class="cx"> virtual void trackMutedChanged(MediaStreamTrackPrivate&) = 0;
</span><span class="cx"> virtual void trackSettingsChanged(MediaStreamTrackPrivate&) = 0;
</span><span class="cx"> virtual void trackEnabledChanged(MediaStreamTrackPrivate&) = 0;
</span><ins>+ virtual void sampleBufferUpdated(MediaStreamTrackPrivate&, MediaSample&) { };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static RefPtr<MediaStreamTrackPrivate> create(RefPtr<RealtimeMediaSource>&&);
</span><span class="lines">@@ -104,6 +106,7 @@
</span><span class="cx"> void sourceMutedChanged() final;
</span><span class="cx"> void sourceSettingsChanged() final;
</span><span class="cx"> bool preventSourceFromStopping() final;
</span><ins>+ void sourceHasMoreMediaData(MediaSample&) final;
</ins><span class="cx">
</span><span class="cx"> Vector<Observer*> m_observers;
</span><span class="cx"> RefPtr<RealtimeMediaSource> m_source;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeMediaSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp (203422 => 203423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp 2016-07-19 21:55:51 UTC (rev 203422)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp 2016-07-19 22:35:51 UTC (rev 203423)
</span><span class="lines">@@ -96,6 +96,12 @@
</span><span class="cx"> observer->sourceSettingsChanged();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RealtimeMediaSource::mediaDataUpdated(MediaSample& mediaSample)
+{
+ for (auto& observer : m_observers)
+ observer->sourceHasMoreMediaData(mediaSample);
+}
+
</ins><span class="cx"> bool RealtimeMediaSource::readonly() const
</span><span class="cx"> {
</span><span class="cx"> return m_readonly;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h (203422 => 203423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h 2016-07-19 21:55:51 UTC (rev 203422)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h 2016-07-19 22:35:51 UTC (rev 203423)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> #include "AudioSourceProvider.h"
</span><span class="cx"> #include "Image.h"
</span><span class="cx"> #include "MediaConstraints.h"
</span><ins>+#include "MediaSample.h"
</ins><span class="cx"> #include "PlatformLayer.h"
</span><span class="cx"> #include "RealtimeMediaSourceCapabilities.h"
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="lines">@@ -66,6 +67,9 @@
</span><span class="cx">
</span><span class="cx"> // Observer state queries.
</span><span class="cx"> virtual bool preventSourceFromStopping() = 0;
</span><ins>+
+ // Media data changes.
+ virtual void sourceHasMoreMediaData(MediaSample&) = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> virtual ~RealtimeMediaSource() { }
</span><span class="lines">@@ -87,6 +91,7 @@
</span><span class="cx"> virtual RefPtr<RealtimeMediaSourceCapabilities> capabilities() = 0;
</span><span class="cx"> virtual const RealtimeMediaSourceSettings& settings() = 0;
</span><span class="cx"> void settingsDidChanged();
</span><ins>+ void mediaDataUpdated(MediaSample&);
</ins><span class="cx">
</span><span class="cx"> bool stopped() const { return m_stopped; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVVideoCaptureSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm (203422 => 203423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2016-07-19 21:55:51 UTC (rev 203422)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2016-07-19 22:35:51 UTC (rev 203423)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #import "IntRect.h"
</span><span class="cx"> #import "Logging.h"
</span><span class="cx"> #import "MediaConstraints.h"
</span><ins>+#import "MediaSampleAVFObjC.h"
</ins><span class="cx"> #import "NotImplemented.h"
</span><span class="cx"> #import "PlatformLayer.h"
</span><span class="cx"> #import "RealtimeMediaSourceCenter.h"
</span><span class="lines">@@ -298,7 +299,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (settingsChanged)
</span><del>- this->settingsDidChanged();
</del><ins>+ settingsDidChanged();
+
+ mediaDataUpdated(MediaSampleAVFObjC::create(sampleBuffer.get()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AVVideoCaptureSource::captureOutputDidOutputSampleBufferFromConnection(AVCaptureOutputType*, CMSampleBufferRef sampleBuffer, AVCaptureConnectionType*)
</span></span></pre>
</div>
</div>
</body>
</html>