<!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>[213931] 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/213931">213931</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2017-03-14 12:57:11 -0700 (Tue, 14 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pulling more frames from AudioSampleDataSource than the last push added will always fail.
https://bugs.webkit.org/show_bug.cgi?id=168644
Reviewed by Eric Carlson.
Rather than use the delta between the ring buffer's end time and the last pushed timestamp
(or what is effectively the number of samples in the last push operation) to determine if
there is enough buffered data to satisfy a pull operation, use the ring buffer's actual
buffered duration.
Then, instead of saving the last pushed timestamp, explicitly save the last push count, and
use that data to inform how much to offset the output timestamps (or what is effectively how
much to allow the source to pre-buffer).
* platform/audio/mac/AudioSampleDataSource.cpp:
(WebCore::AudioSampleDataSource::pushSamplesInternal):
(WebCore::AudioSampleDataSource::pullSamplesInternal):
* platform/audio/mac/AudioSampleDataSource.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformaudiomacAudioSampleDataSourceh">trunk/Source/WebCore/platform/audio/mac/AudioSampleDataSource.h</a></li>
<li><a href="#trunkSourceWebCoreplatformaudiomacAudioSampleDataSourcemm">trunk/Source/WebCore/platform/audio/mac/AudioSampleDataSource.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213930 => 213931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-14 19:29:26 UTC (rev 213930)
+++ trunk/Source/WebCore/ChangeLog 2017-03-14 19:57:11 UTC (rev 213931)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-03-14 Jer Noble <jer.noble@apple.com>
+
+ Pulling more frames from AudioSampleDataSource than the last push added will always fail.
+ https://bugs.webkit.org/show_bug.cgi?id=168644
+
+ Reviewed by Eric Carlson.
+
+ Rather than use the delta between the ring buffer's end time and the last pushed timestamp
+ (or what is effectively the number of samples in the last push operation) to determine if
+ there is enough buffered data to satisfy a pull operation, use the ring buffer's actual
+ buffered duration.
+
+ Then, instead of saving the last pushed timestamp, explicitly save the last push count, and
+ use that data to inform how much to offset the output timestamps (or what is effectively how
+ much to allow the source to pre-buffer).
+
+ * platform/audio/mac/AudioSampleDataSource.cpp:
+ (WebCore::AudioSampleDataSource::pushSamplesInternal):
+ (WebCore::AudioSampleDataSource::pullSamplesInternal):
+ * platform/audio/mac/AudioSampleDataSource.h:
+
</ins><span class="cx"> 2017-03-14 Megan Gardner <megan_gardner@apple.com>
</span><span class="cx">
</span><span class="cx"> Correctly export WebItemProviderPasteboard
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiomacAudioSampleDataSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/mac/AudioSampleDataSource.h (213930 => 213931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/mac/AudioSampleDataSource.h 2017-03-14 19:29:26 UTC (rev 213930)
+++ trunk/Source/WebCore/platform/audio/mac/AudioSampleDataSource.h 2017-03-14 19:57:11 UTC (rev 213931)
</span><span class="lines">@@ -81,7 +81,6 @@
</span><span class="cx">
</span><span class="cx"> MediaTime hostTime() const;
</span><span class="cx">
</span><del>- uint64_t m_timeStamp { 0 };
</del><span class="cx"> uint64_t m_lastPushedSampleCount { 0 };
</span><span class="cx"> MediaTime m_expectedNextPushedSampleTime { MediaTime::invalidTime() };
</span><span class="cx"> double m_hostTime { -1 };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiomacAudioSampleDataSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/mac/AudioSampleDataSource.mm (213930 => 213931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/mac/AudioSampleDataSource.mm 2017-03-14 19:29:26 UTC (rev 213930)
+++ trunk/Source/WebCore/platform/audio/mac/AudioSampleDataSource.mm 2017-03-14 19:57:11 UTC (rev 213931)
</span><span class="lines">@@ -173,9 +173,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_ringBuffer->store(sampleBufferList, sampleCount, sampleTime.timeValue());
</span><del>- m_timeStamp = sampleTime.timeValue();
</del><ins>+ m_lastPushedSampleCount = sampleCount;
</ins><span class="cx">
</span><del>-
</del><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> uint64_t startFrame2 = 0;
</span><span class="cx"> uint64_t endFrame2 = 0;
</span><span class="lines">@@ -224,7 +223,7 @@
</span><span class="cx"> m_ringBuffer->getCurrentFrameBounds(startFrame, endFrame);
</span><span class="cx">
</span><span class="cx"> if (m_transitioningFromPaused) {
</span><del>- uint64_t buffered = endFrame - m_timeStamp;
</del><ins>+ uint64_t buffered = endFrame - startFrame;
</ins><span class="cx"> if (buffered < sampleCount * 2) {
</span><span class="cx"> AudioSampleBufferList::zeroABL(buffer, byteCount);
</span><span class="cx"> sampleCount = 0;
</span><span class="lines">@@ -235,12 +234,12 @@
</span><span class="cx"> const double tenMS = .01;
</span><span class="cx"> const double fiveMS = .005;
</span><span class="cx"> double sampleRate = m_outputDescription->sampleRate();
</span><del>- m_outputSampleOffset = timeStamp + m_timeStamp;
- if (buffered > sampleRate * twentyMS)
</del><ins>+ m_outputSampleOffset = timeStamp + (endFrame - sampleCount);
+ if (m_lastPushedSampleCount > sampleRate * twentyMS)
</ins><span class="cx"> m_outputSampleOffset -= sampleRate * twentyMS;
</span><del>- else if (buffered > sampleRate * tenMS)
</del><ins>+ else if (m_lastPushedSampleCount > sampleRate * tenMS)
</ins><span class="cx"> m_outputSampleOffset -= sampleRate * tenMS;
</span><del>- else if (buffered > sampleRate * fiveMS)
</del><ins>+ else if (m_lastPushedSampleCount > sampleRate * fiveMS)
</ins><span class="cx"> m_outputSampleOffset -= sampleRate * fiveMS;
</span><span class="cx">
</span><span class="cx"> m_transitioningFromPaused = false;
</span></span></pre>
</div>
</div>
</body>
</html>