[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [252960] trunk
From: youenn () apple ! com
Date: 2019-11-30 19:07:31
Message-ID: 20191130190731.6FFF210051CC () svn ! webkit ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!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>[252960] trunk</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/252960">252960</a></dd> \
<dt>Author</dt> <dd>youenn@apple.com</dd> <dt>Date</dt> <dd>2019-11-30 11:07:31 -0800 \
(Sat, 30 Nov 2019)</dd> </dl>
<h3>Log Message</h3>
<pre>Update RealtimeOutgoingAudioSourceCocoa::m_writeCount when sampleRate changes
https://bugs.webkit.org/show_bug.cgi?id=204606
Reviewed by Eric Carlson.
Source/WebCore:
Update m_writeCount to make sure our high/low buffer computation is done right.
Test: webrtc/audio-samplerate-change.html
* platform/mediastream/mac/RealtimeOutgoingAudioSourceCocoa.cpp:
(WebCore::RealtimeOutgoingAudioSourceCocoa::audioSamplesAvailable):
LayoutTests:
* webrtc/audio-samplerate-change-expected.txt: Added.
* webrtc/audio-samplerate-change.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacRealtimeOutgoingAudioSourceCocoa \
cpp">trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSourceCocoa.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestswebrtcaudiosampleratechangeexpectedtxt">trunk/LayoutTests/webrtc/audio-samplerate-change-expected.txt</a></li>
<li><a href="#trunkLayoutTestswebrtcaudiosampleratechangehtml">trunk/LayoutTests/webrtc/audio-samplerate-change.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (252959 => \
252960)</h4> <pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2019-11-30 16:30:54 UTC (rev \
252959)
+++ trunk/LayoutTests/ChangeLog 2019-11-30 19:07:31 UTC (rev 252960)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2019-11-30 youenn fablet <youenn@apple.com>
+
+ Update RealtimeOutgoingAudioSourceCocoa::m_writeCount when sampleRate \
changes + https://bugs.webkit.org/show_bug.cgi?id=204606
+
+ Reviewed by Eric Carlson.
+
+ * webrtc/audio-samplerate-change-expected.txt: Added.
+ * webrtc/audio-samplerate-change.html: Added.
+
</ins><span class="cx"> 2019-11-30 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [Web Animations] Forward-filling animations should \
not schedule updates while filling </span></span></pre></div>
<a id="trunkLayoutTestswebrtcaudiosampleratechangeexpectedtxt"></a>
<div class="addfile"><h4>Added: \
trunk/LayoutTests/webrtc/audio-samplerate-change-expected.txt (0 => 252960)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/LayoutTests/webrtc/audio-samplerate-change-expected.txt \
(rev 0)
+++ trunk/LayoutTests/webrtc/audio-samplerate-change-expected.txt 2019-11-30 19:07:31 \
UTC (rev 252960) </span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+
+
+PASS Audio connection with track changing sample rate
+
</ins></span></pre></div>
<a id="trunkLayoutTestswebrtcaudiosampleratechangehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webrtc/audio-samplerate-change.html \
(0 => 252960)</h4> <pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/audio-samplerate-change.html \
(rev 0)
+++ trunk/LayoutTests/webrtc/audio-samplerate-change.html 2019-11-30 19:07:31 UTC \
(rev 252960) </span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8">
+ <title>Testing replacing an audio track during a WebRTC call</title>
+ <script src="../resources/testharness.js"></script>
+ <script src="../resources/testharnessreport.js"></script>
+ <script src ="routines.js"></script>
+</head>
+<body>
+ <video id=video autoplay controls></video>
+ <script>
+var usesLowSampleRate = false;
+promise_test(async (test) => {
+ if (window.testRunner)
+ testRunner.setUserMediaPermission(true);
+
+ const localStream = await navigator.mediaDevices.getUserMedia({ audio: true });
+ setInterval(() => {
+ usesLowSampleRate = !usesLowSampleRate;
+ const rate = usesLowSampleRate ? 44100 : 48000;
+ localStream.getAudioTracks()[0].applyConstraints({sampleRate: rate});
+ }, 200);
+ const remoteStream = await new Promise((resolve, reject) => {
+ createConnections((firstConnection) => {
+ sender = firstConnection.addTrack(localStream.getAudioTracks()[0], \
localStream); + }, (secondConnection) => {
+ receivingConnection = secondConnection;
+ secondConnection.ontrack = (trackEvent) => { \
resolve(trackEvent.streams[0]); }; + });
+ setTimeout(() => reject("Test timed out"), 5000);
+ });
+ video.srcObject = remoteStream;
+
+ await new Promise(resolve => setTimeout(resolve, 1000));
+ localStream.getAudioTracks()[0].stop();
+}, "Audio connection with track changing sample rate");
+ </script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (252959 => \
252960)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2019-11-30 16:30:54 UTC (rev \
252959)
+++ trunk/Source/WebCore/ChangeLog 2019-11-30 19:07:31 UTC (rev 252960)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2019-11-30 youenn fablet <youenn@apple.com>
+
+ Update RealtimeOutgoingAudioSourceCocoa::m_writeCount when sampleRate \
changes + https://bugs.webkit.org/show_bug.cgi?id=204606
+
+ Reviewed by Eric Carlson.
+
+ Update m_writeCount to make sure our high/low buffer computation is done \
right. +
+ Test: webrtc/audio-samplerate-change.html
+
+ * platform/mediastream/mac/RealtimeOutgoingAudioSourceCocoa.cpp:
+ (WebCore::RealtimeOutgoingAudioSourceCocoa::audioSamplesAvailable):
+
</ins><span class="cx"> 2019-11-30 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Move path implementation functions in \
LineLayoutTraversal to *Path classes </span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacRealtimeOutgoingAudioSourceCocoacpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSourceCocoa.cpp \
(252959 => 252960)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSourceCocoa.cpp 2019-11-30 \
16:30:54 UTC (rev 252959)
+++ trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSourceCocoa.cpp 2019-11-30 \
19:07:31 UTC (rev 252960) </span><span class="lines">@@ -91,6 +91,11 @@
</span><span class="cx"> void \
RealtimeOutgoingAudioSourceCocoa::audioSamplesAvailable(const MediaTime&, const \
PlatformAudioData& audioData, const AudioStreamDescription& \
streamDescription, size_t sampleCount) </span><span class="cx"> {
</span><span class="cx"> if (m_inputStreamDescription != streamDescription) {
</span><ins>+ if (m_writeCount && \
m_inputStreamDescription.sampleRate()) { + // Update m_writeCount to be \
valid according the new sampleRate. + m_writeCount = (m_writeCount * \
streamDescription.sampleRate()) / m_inputStreamDescription.sampleRate(); + }
+
</ins><span class="cx"> m_inputStreamDescription = \
toCAAudioStreamDescription(streamDescription); </span><span class="cx"> auto \
status = m_sampleConverter->setInputFormat(m_inputStreamDescription); \
</span><span class="cx"> ASSERT_UNUSED(status, !status); </span><span \
class="lines">@@ -110,8 +115,6 @@ </span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // If we change the audio track or its sample rate changes, the \
timestamp based on m_writeCount may be wrong.
- // FIXME: We should update m_writeCount to be valid according the new \
sampleRate. </del><span class="cx"> \
m_sampleConverter->pushSamples(MediaTime(m_writeCount, \
static_cast<uint32_t>(m_inputStreamDescription.sampleRate())), audioData, \
sampleCount); </span><span class="cx"> m_writeCount += sampleCount;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic