<!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>[199067] branches/safari-601.1.46-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/199067">199067</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-04-05 12:38:49 -0700 (Tue, 05 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/199042">r199042</a>. rdar://problem/25533763</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformaudioiosAudioDestinationIOScpp">branches/safari-601.1.46-branch/Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformaudioiosAudioDestinationIOSh">branches/safari-601.1.46-branch/Source/WebCore/platform/audio/ios/AudioDestinationIOS.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (199066 => 199067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-04-05 19:38:45 UTC (rev 199066)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-04-05 19:38:49 UTC (rev 199067)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2016-04-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r199042. rdar://problem/25533763
+
+ 2016-04-04 Jer Noble <jer.noble@apple.com>
+
+ [iOS] Crash when playing <video> after playing Web Audio
+ https://bugs.webkit.org/show_bug.cgi?id=156185
+ <rdar://problem/10177005>
+
+ Reviewed by Eric Carlson.
+
+ Off-by-one error in AudioDestinationIOS::render. The ivars m_firstSpareFrame and m_lastSpareFrame imply that
+ the sample range is inclusive, i.e. [m_firstSpareFrame .. m_lastSpareFrame], but the length of the range was
+ being calculated as if m_lastSpareFrame was exclusive; when the two were equal, the length was calculated as
+ 0, rather than 1. This was caught by an ASSERT (and would have been caught by a downstream ASSERT had that one
+ not been present).
+
+ Fix the off-by-one by treating them as inclusive/exclusive--similar to C++ iterators--and renaming them to reflect
+ this: [m_startSpareFrame .. m_endSpareFrame). This corrects the "length" math which caused the crash.
+
+ * platform/audio/ios/AudioDestinationIOS.cpp:
+ (WebCore::AudioDestinationIOS::render):
+ * platform/audio/ios/AudioDestinationIOS.h:
+
+2016-04-05 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r198035. rdar://problem/25467558
</span><span class="cx">
</span><span class="cx"> 2016-03-10 Jer Noble <jer.noble@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformaudioiosAudioDestinationIOScpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp (199066 => 199067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp 2016-04-05 19:38:45 UTC (rev 199066)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp 2016-04-05 19:38:49 UTC (rev 199067)
</span><span class="lines">@@ -217,15 +217,15 @@
</span><span class="cx"> UInt32 framesRemaining = numberOfFrames;
</span><span class="cx"> UInt32 frameOffset = 0;
</span><span class="cx"> while (framesRemaining > 0) {
</span><del>- if (m_firstSpareFrame && m_lastSpareFrame) {
- ASSERT(m_firstSpareFrame < m_lastSpareFrame);
- UInt32 framesThisTime = m_lastSpareFrame - m_firstSpareFrame;
</del><ins>+ if (m_startSpareFrame && m_endSpareFrame) {
+ ASSERT(m_startSpareFrame < m_endSpareFrame);
+ UInt32 framesThisTime = m_endSpareFrame - m_startSpareFrame;
</ins><span class="cx"> assignAudioBuffersToBus(buffers, *m_renderBus, numberOfBuffers, numberOfFrames, frameOffset, framesThisTime);
</span><del>- m_renderBus->copyFromRange(*m_spareBus, m_firstSpareFrame, m_lastSpareFrame);
</del><ins>+ m_renderBus->copyFromRange(*m_spareBus, m_startSpareFrame, m_endSpareFrame);
</ins><span class="cx"> frameOffset += framesThisTime;
</span><span class="cx"> framesRemaining -= framesThisTime;
</span><del>- m_firstSpareFrame = 0;
- m_lastSpareFrame = 0;
</del><ins>+ m_startSpareFrame = 0;
+ m_endSpareFrame = 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> UInt32 framesThisTime = std::min<UInt32>(kRenderBufferSize, framesRemaining);
</span><span class="lines">@@ -234,8 +234,8 @@
</span><span class="cx"> if (framesThisTime < kRenderBufferSize) {
</span><span class="cx"> m_callback.render(0, m_spareBus.get(), kRenderBufferSize);
</span><span class="cx"> m_renderBus->copyFromRange(*m_spareBus, 0, framesThisTime);
</span><del>- m_firstSpareFrame = framesThisTime;
- m_lastSpareFrame = kRenderBufferSize - 1;
</del><ins>+ m_startSpareFrame = framesThisTime;
+ m_endSpareFrame = kRenderBufferSize;
</ins><span class="cx"> } else
</span><span class="cx"> m_callback.render(0, m_renderBus.get(), framesThisTime);
</span><span class="cx"> frameOffset += framesThisTime;
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformaudioiosAudioDestinationIOSh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/audio/ios/AudioDestinationIOS.h (199066 => 199067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/audio/ios/AudioDestinationIOS.h 2016-04-05 19:38:45 UTC (rev 199066)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/audio/ios/AudioDestinationIOS.h 2016-04-05 19:38:49 UTC (rev 199067)
</span><span class="lines">@@ -66,8 +66,8 @@
</span><span class="cx"> AudioIOCallback& m_callback;
</span><span class="cx"> RefPtr<AudioBus> m_renderBus;
</span><span class="cx"> RefPtr<AudioBus> m_spareBus;
</span><del>- unsigned m_firstSpareFrame { 0 };
- unsigned m_lastSpareFrame { 0 };
</del><ins>+ unsigned m_startSpareFrame { 0 };
+ unsigned m_endSpareFrame { 0 };
</ins><span class="cx">
</span><span class="cx"> double m_sampleRate;
</span><span class="cx"> bool m_isPlaying;
</span></span></pre>
</div>
</div>
</body>
</html>