<!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>[168794] branches/safari-538.34-branch/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/168794">168794</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-05-13 23:42:24 -0700 (Tue, 13 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/168536">r168536</a>. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53834branchSourceWebCoreChangeLog">branches/safari-538.34-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53834branchSourceWebCoreplatformgraphicsavfoundationobjcSourceBufferPrivateAVFObjCh">branches/safari-538.34-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h</a></li>
<li><a href="#branchessafari53834branchSourceWebCoreplatformgraphicsavfoundationobjcSourceBufferPrivateAVFObjCmm">branches/safari-538.34-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53834branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebCore/ChangeLog (168793 => 168794)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebCore/ChangeLog 2014-05-14 06:39:49 UTC (rev 168793)
+++ branches/safari-538.34-branch/Source/WebCore/ChangeLog 2014-05-14 06:42:24 UTC (rev 168794)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2014-04-17 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r168536
+
+ 2014-05-09 Jer Noble <jer.noble@apple.com>
+
+ [MSE][Mac] Destroy the AVStreamDataParser when the SourceBuffer is removed from its MediaSource.
+ https://bugs.webkit.org/show_bug.cgi?id=132710
+
+ Reviewed by Eric Carlson.
+
+ The AVStreamDataParser should be destroyed when the SourceBuffer is removed, so that subsequent
+ SourceBuffers can utilize resources released by the parser on destruction.
+
+ * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h:
+ * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
+ (-[WebAVStreamDataParserListener invalidate]):
+ (-[WebAVStreamDataParserListener streamDataParser:didParseStreamDataAsAsset:]): Protect against _parent being invalidated.
+ (-[WebAVStreamDataParserListener streamDataParser:didParseStreamDataAsAsset:withDiscontinuity:]): Ditto.
+ (-[WebAVStreamDataParserListener streamDataParser:didFailToParseStreamDataWithError:]): Ditto.
+ (-[WebAVStreamDataParserListener streamDataParser:didProvideMediaData:forTrackID:mediaType:flags:]): Ditto.
+ (WebCore::SourceBufferPrivateAVFObjC::~SourceBufferPrivateAVFObjC): Call destroyParser();.
+ (WebCore::SourceBufferPrivateAVFObjC::removedFromMediaSource): Ditto.
+ (WebCore::SourceBufferPrivateAVFObjC::destroyParser): Call -[WebAVStreamDataParserListener invalidate].
+
+2014-04-17 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r168519
</span><span class="cx">
</span><span class="cx"> 2014-05-08 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebCoreplatformgraphicsavfoundationobjcSourceBufferPrivateAVFObjCh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h (168793 => 168794)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h 2014-05-14 06:39:49 UTC (rev 168793)
+++ branches/safari-538.34-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h 2014-05-14 06:42:24 UTC (rev 168794)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> OBJC_CLASS NSData;
</span><span class="cx"> OBJC_CLASS NSError;
</span><span class="cx"> OBJC_CLASS NSObject;
</span><ins>+OBJC_CLASS WebAVStreamDataParserListener;
</ins><span class="cx"> typedef struct opaqueCMSampleBuffer *CMSampleBufferRef;
</span><span class="cx"> typedef const struct opaqueCMFormatDescription *CMFormatDescriptionRef;
</span><span class="cx">
</span><span class="lines">@@ -109,6 +110,7 @@
</span><span class="cx">
</span><span class="cx"> void didBecomeReadyForMoreSamples(int trackID);
</span><span class="cx"> void appendCompleted();
</span><ins>+ void destroyParser();
</ins><span class="cx"> void destroyRenderers();
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<VideoTrackPrivateMediaSourceAVFObjC>> m_videoTracks;
</span><span class="lines">@@ -118,7 +120,7 @@
</span><span class="cx"> RetainPtr<AVAsset> m_asset;
</span><span class="cx"> RetainPtr<AVSampleBufferDisplayLayer> m_displayLayer;
</span><span class="cx"> std::map<int, RetainPtr<AVSampleBufferAudioRenderer>> m_audioRenderers;
</span><del>- RetainPtr<NSObject> m_delegate;
</del><ins>+ RetainPtr<WebAVStreamDataParserListener> m_delegate;
</ins><span class="cx">
</span><span class="cx"> MediaSourcePrivateAVFObjC* m_mediaSource;
</span><span class="cx"> SourceBufferPrivateClient* m_client;
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebCoreplatformgraphicsavfoundationobjcSourceBufferPrivateAVFObjCmm"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm (168793 => 168794)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2014-05-14 06:39:49 UTC (rev 168793)
+++ branches/safari-538.34-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2014-05-14 06:42:24 UTC (rev 168794)
</span><span class="lines">@@ -179,6 +179,13 @@
</span><span class="cx"> [super dealloc];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)invalidate
+{
+ [_parser setDelegate:nil];
+ _parent = nullptr;
+ _parser = nullptr;
+}
+
</ins><span class="cx"> - (void)streamDataParser:(AVStreamDataParser *)streamDataParser didParseStreamDataAsAsset:(AVAsset *)asset
</span><span class="cx"> {
</span><span class="cx"> #if ASSERT_DISABLED
</span><span class="lines">@@ -186,6 +193,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> ASSERT(streamDataParser == _parser);
</span><span class="cx"> RefPtr<WebCore::SourceBufferPrivateAVFObjC> strongParent = _parent;
</span><ins>+ if (!strongParent)
+ return;
+
</ins><span class="cx"> RetainPtr<AVAsset*> strongAsset = asset;
</span><span class="cx"> callOnMainThread([strongParent, strongAsset] {
</span><span class="cx"> strongParent->didParseStreamDataAsAsset(strongAsset.get());
</span><span class="lines">@@ -200,6 +210,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> ASSERT(streamDataParser == _parser);
</span><span class="cx"> RefPtr<WebCore::SourceBufferPrivateAVFObjC> strongParent = _parent;
</span><ins>+ if (!strongParent)
+ return;
+
</ins><span class="cx"> RetainPtr<AVAsset*> strongAsset = asset;
</span><span class="cx"> callOnMainThread([strongParent, strongAsset] {
</span><span class="cx"> strongParent->didParseStreamDataAsAsset(strongAsset.get());
</span><span class="lines">@@ -213,6 +226,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> ASSERT(streamDataParser == _parser);
</span><span class="cx"> RefPtr<WebCore::SourceBufferPrivateAVFObjC> strongParent = _parent;
</span><ins>+ if (!strongParent)
+ return;
+
</ins><span class="cx"> RetainPtr<NSError> strongError = error;
</span><span class="cx"> callOnMainThread([strongParent, strongError] {
</span><span class="cx"> strongParent->didFailToParseStreamDataWithError(strongError.get());
</span><span class="lines">@@ -226,6 +242,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> ASSERT(streamDataParser == _parser);
</span><span class="cx"> RefPtr<WebCore::SourceBufferPrivateAVFObjC> strongParent = _parent;
</span><ins>+ if (!strongParent)
+ return;
+
</ins><span class="cx"> RetainPtr<CMSampleBufferRef> strongSample = sample;
</span><span class="cx"> String mediaType = nsMediaType;
</span><span class="cx"> callOnMainThread([strongParent, strongSample, trackID, mediaType, flags] {
</span><span class="lines">@@ -240,6 +259,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> ASSERT(streamDataParser == _parser);
</span><span class="cx"> RefPtr<WebCore::SourceBufferPrivateAVFObjC> strongParent = _parent;
</span><ins>+ if (!strongParent)
+ return;
+
</ins><span class="cx"> String mediaType = nsMediaType;
</span><span class="cx"> callOnMainThread([strongParent, trackID, mediaType] {
</span><span class="cx"> strongParent->didReachEndOfTrackWithTrackID(trackID, mediaType);
</span><span class="lines">@@ -253,6 +275,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> ASSERT(streamDataParser == _parser);
</span><span class="cx"> RefPtr<WebCore::SourceBufferPrivateAVFObjC> strongParent = _parent;
</span><ins>+ if (!strongParent)
+ return;
+
</ins><span class="cx"> RetainPtr<NSData> strongData = initData;
</span><span class="cx"> callOnMainThread([strongParent, strongData, trackID] {
</span><span class="cx"> strongParent->didProvideContentKeyRequestInitializationDataForTrackID(strongData.get(), trackID);
</span><span class="lines">@@ -373,6 +398,7 @@
</span><span class="cx">
</span><span class="cx"> SourceBufferPrivateAVFObjC::~SourceBufferPrivateAVFObjC()
</span><span class="cx"> {
</span><ins>+ destroyParser();
</ins><span class="cx"> destroyRenderers();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -520,6 +546,13 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void SourceBufferPrivateAVFObjC::destroyParser()
+{
+ [m_delegate invalidate];
+ m_delegate = nullptr;
+ m_parser = nullptr;
+}
+
</ins><span class="cx"> void SourceBufferPrivateAVFObjC::destroyRenderers()
</span><span class="cx"> {
</span><span class="cx"> if (m_displayLayer) {
</span><span class="lines">@@ -543,6 +576,7 @@
</span><span class="cx">
</span><span class="cx"> void SourceBufferPrivateAVFObjC::removedFromMediaSource()
</span><span class="cx"> {
</span><ins>+ destroyParser();
</ins><span class="cx"> destroyRenderers();
</span><span class="cx">
</span><span class="cx"> if (m_mediaSource)
</span></span></pre>
</div>
</div>
</body>
</html>