<!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>[212714] 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/212714">212714</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2017-02-21 09:19:10 -0800 (Tue, 21 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>AudioSampleBufferList::zeroABL() takes a byte-count, not a sample-count.
https://bugs.webkit.org/show_bug.cgi?id=168635
Reviewed by Jon Lee.
* platform/audio/mac/AudioSampleDataSource.cpp:
(WebCore::AudioSampleDataSource::pullSamplesInternal):
(WebCore::AudioSampleDataSource::pullAvalaibleSamplesAsChunks):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformaudiomacAudioSampleDataSourcecpp">trunk/Source/WebCore/platform/audio/mac/AudioSampleDataSource.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212713 => 212714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-21 16:27:35 UTC (rev 212713)
+++ trunk/Source/WebCore/ChangeLog 2017-02-21 17:19:10 UTC (rev 212714)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-02-21 Jer Noble <jer.noble@apple.com>
+
+ AudioSampleBufferList::zeroABL() takes a byte-count, not a sample-count.
+ https://bugs.webkit.org/show_bug.cgi?id=168635
+
+ Reviewed by Jon Lee.
+
+ * platform/audio/mac/AudioSampleDataSource.cpp:
+ (WebCore::AudioSampleDataSource::pullSamplesInternal):
+ (WebCore::AudioSampleDataSource::pullAvalaibleSamplesAsChunks):
+
</ins><span class="cx"> 2017-02-21 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r212681): Crash when dragging links without a drag image
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiomacAudioSampleDataSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/mac/AudioSampleDataSource.cpp (212713 => 212714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/mac/AudioSampleDataSource.cpp 2017-02-21 16:27:35 UTC (rev 212713)
+++ trunk/Source/WebCore/platform/audio/mac/AudioSampleDataSource.cpp 2017-02-21 17:19:10 UTC (rev 212714)
</span><span class="lines">@@ -207,16 +207,17 @@
</span><span class="cx"> bool AudioSampleDataSource::pullSamplesInternal(AudioBufferList& buffer, size_t& sampleCount, uint64_t timeStamp, double /*hostTime*/, PullMode mode)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_lock.isHeld());
</span><ins>+ size_t byteCount = sampleCount * m_outputDescription->bytesPerFrame();
</ins><span class="cx">
</span><span class="cx"> ASSERT(buffer.mNumberBuffers == m_ringBuffer->channelCount());
</span><span class="cx"> if (buffer.mNumberBuffers != m_ringBuffer->channelCount()) {
</span><del>- AudioSampleBufferList::zeroABL(buffer, sampleCount);
</del><ins>+ AudioSampleBufferList::zeroABL(buffer, byteCount);
</ins><span class="cx"> sampleCount = 0;
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_ringBuffer || m_muted || m_inputSampleOffset == MediaTime::invalidTime()) {
</span><del>- AudioSampleBufferList::zeroABL(buffer, sampleCount);
</del><ins>+ AudioSampleBufferList::zeroABL(buffer, byteCount);
</ins><span class="cx"> sampleCount = 0;
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -228,7 +229,7 @@
</span><span class="cx"> if (m_transitioningFromPaused) {
</span><span class="cx"> uint64_t buffered = endFrame - m_timeStamp;
</span><span class="cx"> if (buffered < sampleCount * 2) {
</span><del>- AudioSampleBufferList::zeroABL(buffer, sampleCount);
</del><ins>+ AudioSampleBufferList::zeroABL(buffer, byteCount);
</ins><span class="cx"> sampleCount = 0;
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -264,7 +265,7 @@
</span><span class="cx"> LOG(MediaCaptureSamples, "** pullSamplesInternal: sample %lld is not completely in range [%lld .. %lld], returning %lld frames", timeStamp, startFrame, endFrame, framesAvailable);
</span><span class="cx">
</span><span class="cx"> if (!framesAvailable) {
</span><del>- AudioSampleBufferList::zeroABL(buffer, sampleCount);
</del><ins>+ AudioSampleBufferList::zeroABL(buffer, byteCount);
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -281,7 +282,7 @@
</span><span class="cx">
</span><span class="cx"> m_scratchBuffer->applyGain(m_volume);
</span><span class="cx"> if (m_scratchBuffer->copyTo(buffer, sampleCount))
</span><del>- AudioSampleBufferList::zeroABL(buffer, sampleCount);
</del><ins>+ AudioSampleBufferList::zeroABL(buffer, byteCount);
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -316,7 +317,8 @@
</span><span class="cx"> {
</span><span class="cx"> std::unique_lock<Lock> lock(m_lock, std::try_to_lock);
</span><span class="cx"> if (!lock.owns_lock() || !m_ringBuffer) {
</span><del>- AudioSampleBufferList::zeroABL(buffer, sampleCount);
</del><ins>+ size_t byteCount = sampleCount * m_outputDescription->bytesPerFrame();
+ AudioSampleBufferList::zeroABL(buffer, byteCount);
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>