<!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>[214130] 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/214130">214130</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2017-03-17 17:34:00 -0700 (Fri, 17 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MediaStream] Compensate for video capture orientation
https://bugs.webkit.org/show_bug.cgi?id=169313
<rdar://problem/30994785>
Unreviewed, fix a crash in <a href="http://trac.webkit.org/projects/webkit/changeset/214120">r214120</a> found by the bots.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
(-[WebAVSampleBufferStatusChangeListener invalidate]): Drive-by removal of unnecessary code.
(-[WebAVSampleBufferStatusChangeListener observeValueForKeyPath:ofObject:change:context:]):
Actually retain self before callOnMainThread.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::~MediaPlayerPrivateMediaStreamAVFObjC):
Invalidate the change listener first.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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 (214129 => 214130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-17 23:40:22 UTC (rev 214129)
+++ trunk/Source/WebCore/ChangeLog 2017-03-18 00:34:00 UTC (rev 214130)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-03-17 Eric Carlson <eric.carlson@apple.com>
+
+ [MediaStream] Compensate for video capture orientation
+ https://bugs.webkit.org/show_bug.cgi?id=169313
+ <rdar://problem/30994785>
+
+ Unreviewed, fix a crash in r214120 found by the bots.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
+ (-[WebAVSampleBufferStatusChangeListener invalidate]): Drive-by removal of unnecessary code.
+ (-[WebAVSampleBufferStatusChangeListener observeValueForKeyPath:ofObject:change:context:]):
+ Actually retain self before callOnMainThread.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::~MediaPlayerPrivateMediaStreamAVFObjC):
+ Invalidate the change listener first.
+
</ins><span class="cx"> 2017-03-17 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> MediaQueryList instances do not update for `prefers-reduced-motion`
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm (214129 => 214130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2017-03-17 23:40:22 UTC (rev 214129)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2017-03-18 00:34:00 UTC (rev 214130)
</span><span class="lines">@@ -98,9 +98,6 @@
</span><span class="cx"> - (void)invalidate
</span><span class="cx"> {
</span><span class="cx"> [self stopObservingLayers];
</span><del>-
- [[NSNotificationCenter defaultCenter] removeObserver:self];
-
</del><span class="cx"> _parent = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -134,6 +131,9 @@
</span><span class="cx"> UNUSED_PARAM(keyPath);
</span><span class="cx"> ASSERT(_parent);
</span><span class="cx">
</span><ins>+ if (!_parent)
+ return;
+
</ins><span class="cx"> if ([object isKindOfClass:getAVSampleBufferDisplayLayerClass()]) {
</span><span class="cx"> RetainPtr<AVSampleBufferDisplayLayer> layer = (AVSampleBufferDisplayLayer *)object;
</span><span class="cx"> ASSERT(layer.get() == _parent->displayLayer());
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx">
</span><span class="cx"> if ([keyPath isEqualToString:@"status"]) {
</span><span class="cx"> RetainPtr<NSNumber> status = [change valueForKey:NSKeyValueChangeNewKey];
</span><del>- callOnMainThread([protectedSelf = WTFMove(self), layer = WTFMove(layer), status = WTFMove(status)] {
</del><ins>+ callOnMainThread([protectedSelf = RetainPtr<WebAVSampleBufferStatusChangeListener>(self), layer = WTFMove(layer), status = WTFMove(status)] {
</ins><span class="cx"> if (!protectedSelf->_parent)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx">
</span><span class="cx"> if ([keyPath isEqualToString:@"error"]) {
</span><span class="cx"> RetainPtr<NSNumber> status = [change valueForKey:NSKeyValueChangeNewKey];
</span><del>- callOnMainThread([protectedSelf = WTFMove(self), layer = WTFMove(layer), status = WTFMove(status)] {
</del><ins>+ callOnMainThread([protectedSelf = RetainPtr<WebAVSampleBufferStatusChangeListener>(self), layer = WTFMove(layer), status = WTFMove(status)] {
</ins><span class="cx"> if (!protectedSelf->_parent)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx">
</span><span class="cx"> if ((CALayer *)object == _parent->backgroundLayer()) {
</span><span class="cx"> if ([keyPath isEqualToString:@"bounds"]) {
</span><del>- callOnMainThread([protectedSelf = WTFMove(self)] {
</del><ins>+ callOnMainThread([protectedSelf = RetainPtr<WebAVSampleBufferStatusChangeListener>(self)] {
</ins><span class="cx"> if (!protectedSelf->_parent)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -200,6 +200,9 @@
</span><span class="cx"> MediaPlayerPrivateMediaStreamAVFObjC::~MediaPlayerPrivateMediaStreamAVFObjC()
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "MediaPlayerPrivateMediaStreamAVFObjC::~MediaPlayerPrivateMediaStreamAVFObjC(%p)", this);
</span><ins>+
+ [m_statusChangeListener invalidate];
+
</ins><span class="cx"> for (const auto& track : m_audioTrackMap.values())
</span><span class="cx"> track->pause();
</span><span class="cx">
</span><span class="lines">@@ -212,8 +215,6 @@
</span><span class="cx">
</span><span class="cx"> destroyLayers();
</span><span class="cx">
</span><del>- [m_statusChangeListener invalidate];
-
</del><span class="cx"> m_audioTrackMap.clear();
</span><span class="cx"> m_videoTrackMap.clear();
</span><span class="cx"> }
</span><span class="lines">@@ -498,9 +499,6 @@
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateMediaStreamAVFObjC::destroyLayers()
</span><span class="cx"> {
</span><del>- if (!m_sampleBufferDisplayLayer)
- return;
-
</del><span class="cx"> [m_statusChangeListener stopObservingLayers];
</span><span class="cx"> if (m_sampleBufferDisplayLayer) {
</span><span class="cx"> m_pendingVideoSampleQueue.clear();
</span></span></pre>
</div>
</div>
</body>
</html>