<!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>[214227] 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/214227">214227</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2017-03-21 12:45:38 -0700 (Tue, 21 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Crash in WebCore: WebCore::CARingBuffer::getCurrentFrameBounds + 28
https://bugs.webkit.org/show_bug.cgi?id=169887
<rdar://problem/23648082>
Reviewed by Eric Carlson.
Because AudioSourceProviderAVFObjC::prepareCallback() can concievably be called after the AudioSourceProviderAVFObjC
it refers to has been destroyed, add an extra layer of indirection between the tap and the provider, and invalidate
that level of indirection before the AudioSourceProviderAVFObjC is destroyed.
* platform/graphics/avfoundation/AudioSourceProviderAVFObjC.h:
* platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm:
(WebCore::AudioSourceProviderAVFObjC::initCallback):
(WebCore::AudioSourceProviderAVFObjC::finalizeCallback):
(WebCore::AudioSourceProviderAVFObjC::prepareCallback):
(WebCore::AudioSourceProviderAVFObjC::unprepareCallback):
(WebCore::AudioSourceProviderAVFObjC::processCallback):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationAudioSourceProviderAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationAudioSourceProviderAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214226 => 214227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-21 18:18:35 UTC (rev 214226)
+++ trunk/Source/WebCore/ChangeLog 2017-03-21 19:45:38 UTC (rev 214227)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2017-03-20 Jer Noble <jer.noble@apple.com>
+
+ Crash in WebCore: WebCore::CARingBuffer::getCurrentFrameBounds + 28
+ https://bugs.webkit.org/show_bug.cgi?id=169887
+ <rdar://problem/23648082>
+
+ Reviewed by Eric Carlson.
+
+ Because AudioSourceProviderAVFObjC::prepareCallback() can concievably be called after the AudioSourceProviderAVFObjC
+ it refers to has been destroyed, add an extra layer of indirection between the tap and the provider, and invalidate
+ that level of indirection before the AudioSourceProviderAVFObjC is destroyed.
+
+ * platform/graphics/avfoundation/AudioSourceProviderAVFObjC.h:
+ * platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm:
+ (WebCore::AudioSourceProviderAVFObjC::initCallback):
+ (WebCore::AudioSourceProviderAVFObjC::finalizeCallback):
+ (WebCore::AudioSourceProviderAVFObjC::prepareCallback):
+ (WebCore::AudioSourceProviderAVFObjC::unprepareCallback):
+ (WebCore::AudioSourceProviderAVFObjC::processCallback):
+
</ins><span class="cx"> 2017-03-21 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove logging left in by mistake.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationAudioSourceProviderAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.h (214226 => 214227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.h 2017-03-21 18:18:35 UTC (rev 214226)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.h 2017-03-21 19:45:38 UTC (rev 214227)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx">
</span><span class="cx"> #include "AudioSourceProvider.h"
</span><span class="cx"> #include <atomic>
</span><del>-#include <wtf/Lock.h>
</del><span class="cx"> #include <wtf/MediaTime.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="lines">@@ -90,7 +89,6 @@
</span><span class="cx"> std::unique_ptr<AudioStreamBasicDescription> m_outputDescription;
</span><span class="cx"> std::unique_ptr<CARingBuffer> m_ringBuffer;
</span><span class="cx">
</span><del>- Lock m_mutex;
</del><span class="cx"> MediaTime m_startTimeAtLastProcess;
</span><span class="cx"> MediaTime m_endTimeAtLastProcess;
</span><span class="cx"> std::atomic<uint64_t> m_writeAheadCount { 0 };
</span><span class="lines">@@ -99,6 +97,9 @@
</span><span class="cx"> std::atomic<uint64_t> m_seekTo { NoSeek };
</span><span class="cx"> bool m_paused { true };
</span><span class="cx"> AudioSourceProviderClient* m_client { nullptr };
</span><ins>+
+ struct TapStorage;
+ TapStorage* m_tapStorage { nullptr };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationAudioSourceProviderAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm (214226 => 214227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm 2017-03-21 18:18:35 UTC (rev 214226)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm 2017-03-21 19:45:38 UTC (rev 214227)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> #import <AVFoundation/AVPlayerItem.h>
</span><span class="cx"> #import <mutex>
</span><span class="cx"> #import <objc/runtime.h>
</span><ins>+#import <wtf/Lock.h>
</ins><span class="cx"> #import <wtf/MainThread.h>
</span><span class="cx">
</span><span class="cx"> #if !LOG_DISABLED
</span><span class="lines">@@ -70,6 +71,12 @@
</span><span class="cx">
</span><span class="cx"> static const double kRingBufferDuration = 1;
</span><span class="cx">
</span><ins>+struct AudioSourceProviderAVFObjC::TapStorage {
+ TapStorage(AudioSourceProviderAVFObjC* _this) : _this(_this) { }
+ AudioSourceProviderAVFObjC* _this;
+ Lock mutex;
+};
+
</ins><span class="cx"> RefPtr<AudioSourceProviderAVFObjC> AudioSourceProviderAVFObjC::create(AVPlayerItem *item)
</span><span class="cx"> {
</span><span class="cx"> if (!canLoadMTAudioProcessingTapCreate())
</span><span class="lines">@@ -85,6 +92,11 @@
</span><span class="cx"> AudioSourceProviderAVFObjC::~AudioSourceProviderAVFObjC()
</span><span class="cx"> {
</span><span class="cx"> setClient(nullptr);
</span><ins>+ if (m_tapStorage) {
+ std::unique_lock<Lock> lock(m_tapStorage->mutex);
+ m_tapStorage->_this = nullptr;
+ m_tapStorage = nullptr;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AudioSourceProviderAVFObjC::provideInput(AudioBus* bus, size_t framesToProcess)
</span><span class="lines">@@ -92,7 +104,12 @@
</span><span class="cx"> // Protect access to m_ringBuffer by try_locking the mutex. If we failed
</span><span class="cx"> // to aquire, a re-configure is underway, and m_ringBuffer is unsafe to access.
</span><span class="cx"> // Emit silence.
</span><del>- std::unique_lock<Lock> lock(m_mutex, std::try_to_lock);
</del><ins>+ if (!m_tapStorage) {
+ bus->zero();
+ return;
+ }
+
+ std::unique_lock<Lock> lock(m_tapStorage->mutex, std::try_to_lock);
</ins><span class="cx"> if (!lock.owns_lock() || !m_ringBuffer) {
</span><span class="cx"> bus->zero();
</span><span class="cx"> return;
</span><span class="lines">@@ -222,35 +239,54 @@
</span><span class="cx"> {
</span><span class="cx"> AudioSourceProviderAVFObjC* _this = static_cast<AudioSourceProviderAVFObjC*>(clientInfo);
</span><span class="cx"> _this->m_tap = tap;
</span><ins>+ _this->m_tapStorage = new TapStorage(_this);
</ins><span class="cx"> _this->init(clientInfo, tapStorageOut);
</span><ins>+ *tapStorageOut = _this->m_tapStorage;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AudioSourceProviderAVFObjC::finalizeCallback(MTAudioProcessingTapRef tap)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(tap);
</span><del>- AudioSourceProviderAVFObjC* _this = static_cast<AudioSourceProviderAVFObjC*>(MTAudioProcessingTapGetStorage(tap));
- _this->finalize();
</del><ins>+ TapStorage* tapStorage = static_cast<TapStorage*>(MTAudioProcessingTapGetStorage(tap));
+
+ std::lock_guard<Lock> lock(tapStorage->mutex);
+
+ if (tapStorage->_this)
+ tapStorage->_this->finalize();
+ delete tapStorage;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AudioSourceProviderAVFObjC::prepareCallback(MTAudioProcessingTapRef tap, CMItemCount maxFrames, const AudioStreamBasicDescription *processingFormat)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(tap);
</span><del>- AudioSourceProviderAVFObjC* _this = static_cast<AudioSourceProviderAVFObjC*>(MTAudioProcessingTapGetStorage(tap));
- _this->prepare(maxFrames, processingFormat);
</del><ins>+ TapStorage* tapStorage = static_cast<TapStorage*>(MTAudioProcessingTapGetStorage(tap));
+
+ std::lock_guard<Lock> lock(tapStorage->mutex);
+
+ if (tapStorage->_this)
+ tapStorage->_this->prepare(maxFrames, processingFormat);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AudioSourceProviderAVFObjC::unprepareCallback(MTAudioProcessingTapRef tap)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(tap);
</span><del>- AudioSourceProviderAVFObjC* _this = static_cast<AudioSourceProviderAVFObjC*>(MTAudioProcessingTapGetStorage(tap));
- _this->unprepare();
</del><ins>+ TapStorage* tapStorage = static_cast<TapStorage*>(MTAudioProcessingTapGetStorage(tap));
+
+ std::lock_guard<Lock> lock(tapStorage->mutex);
+
+ if (tapStorage->_this)
+ tapStorage->_this->unprepare();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AudioSourceProviderAVFObjC::processCallback(MTAudioProcessingTapRef tap, CMItemCount numberFrames, MTAudioProcessingTapFlags flags, AudioBufferList *bufferListInOut, CMItemCount *numberFramesOut, MTAudioProcessingTapFlags *flagsOut)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(tap);
</span><del>- AudioSourceProviderAVFObjC* _this = static_cast<AudioSourceProviderAVFObjC*>(MTAudioProcessingTapGetStorage(tap));
- _this->process(numberFrames, flags, bufferListInOut, numberFramesOut, flagsOut);
</del><ins>+ TapStorage* tapStorage = static_cast<TapStorage*>(MTAudioProcessingTapGetStorage(tap));
+
+ std::lock_guard<Lock> lock(tapStorage->mutex);
+
+ if (tapStorage->_this)
+ tapStorage->_this->process(numberFrames, flags, bufferListInOut, numberFramesOut, flagsOut);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AudioSourceProviderAVFObjC::init(void* clientInfo, void** tapStorageOut)
</span><span class="lines">@@ -262,6 +298,10 @@
</span><span class="cx">
</span><span class="cx"> void AudioSourceProviderAVFObjC::finalize()
</span><span class="cx"> {
</span><ins>+ if (m_tapStorage) {
+ m_tapStorage->_this = nullptr;
+ m_tapStorage = nullptr;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AudioSourceProviderAVFObjC::prepare(CMItemCount maxFrames, const AudioStreamBasicDescription *processingFormat)
</span><span class="lines">@@ -268,8 +308,6 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(maxFrames >= 0);
</span><span class="cx">
</span><del>- std::lock_guard<Lock> lock(m_mutex);
-
</del><span class="cx"> m_tapDescription = std::make_unique<AudioStreamBasicDescription>(*processingFormat);
</span><span class="cx"> int numberOfChannels = processingFormat->mChannelsPerFrame;
</span><span class="cx"> double sampleRate = processingFormat->mSampleRate;
</span><span class="lines">@@ -312,8 +350,6 @@
</span><span class="cx">
</span><span class="cx"> void AudioSourceProviderAVFObjC::unprepare()
</span><span class="cx"> {
</span><del>- std::lock_guard<Lock> lock(m_mutex);
-
</del><span class="cx"> m_tapDescription = nullptr;
</span><span class="cx"> m_outputDescription = nullptr;
</span><span class="cx"> m_ringBuffer = nullptr;
</span></span></pre>
</div>
</div>
</body>
</html>