<!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>[168966] 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/168966">168966</a></dd>
<dt>Author</dt> <dd>berto@igalia.com</dd>
<dt>Date</dt> <dd>2014-05-16 04:56:14 -0700 (Fri, 16 May 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>RTCDtmfSender default values need to be updated.
https://bugs.webkit.org/show_bug.cgi?id=132952

Patch by Kiran &lt;kiran.guduru@samsung.com&gt; on 2014-05-16
Reviewed by Eric Carlson.

Source/WebCore:
The default ToneDuration and ToneGap values are modified in the updated spec.
So these values need to be updated.

Test: fast/mediastream/RTCPeerConnection-dtmf.html.

* Modules/mediastream/RTCDTMFSender.cpp:

LayoutTests:
Added checks to test default, min value interToneGap
and duration and max value for duration.
(Spec does not specify any max value for inTertoneGap)

* fast/mediastream/RTCPeerConnection-dtmf.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectiondtmfhtml">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-dtmf.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDTMFSendercpp">trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (168965 => 168966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-05-16 09:02:40 UTC (rev 168965)
+++ trunk/LayoutTests/ChangeLog        2014-05-16 11:56:14 UTC (rev 168966)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-05-16  Kiran  &lt;kiran.guduru@samsung.com&gt;
+
+        RTCDtmfSender default values need to be updated.
+        https://bugs.webkit.org/show_bug.cgi?id=132952
+
+        Reviewed by Eric Carlson.
+
+        Added checks to test default, min value interToneGap
+        and duration and max value for duration.
+        (Spec does not specify any max value for inTertoneGap)
+
+        * fast/mediastream/RTCPeerConnection-dtmf.html:
+
</ins><span class="cx"> 2014-05-15  Daniel Bates  &lt;dabates@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         ASSERT_NOT_REACHED() in DocumentOrderedMap::get() when removing SVG subtree
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectiondtmfhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-dtmf.html (168965 => 168966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-dtmf.html        2014-05-16 09:02:40 UTC (rev 168965)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-dtmf.html        2014-05-16 11:56:14 UTC (rev 168966)
</span><span class="lines">@@ -16,14 +16,17 @@
</span><span class="cx">                 finishJSTest();
</span><span class="cx">             }
</span><span class="cx"> 
</span><del>-            var firstCall = true;
</del><ins>+            var lastCall = false;
+            var callCount = 1;
</ins><span class="cx"> 
</span><span class="cx">             function ontonechange(e) {
</span><span class="cx">                 testPassed(&quot;ontonechange was called.&quot;);
</span><span class="cx">                 event = e;
</span><del>-                if (firstCall) {
</del><ins>+                if (!lastCall) {
</ins><span class="cx">                     shouldBeEqualToString('event.tone', &quot;1&quot;);
</span><del>-                    firstCall = false;
</del><ins>+                    callCount++;
+                    if (3 == callCount)
+                        lastCall = true;
</ins><span class="cx">                 } else {
</span><span class="cx">                     shouldBeEqualToString('event.tone', &quot;&quot;);
</span><span class="cx">                     finishJSTest();
</span><span class="lines">@@ -43,6 +46,24 @@
</span><span class="cx">                     dtmfsender.ontonechange = ontonechange;
</span><span class="cx">                     dtmfsender.insertDTMF(&quot;1&quot;);
</span><span class="cx">                     shouldBeEqualToString('dtmfsender.toneBuffer', &quot;1&quot;);
</span><ins>+                    shouldBeEqualToString('dtmfsender.duration', &quot;100&quot;);
+                    shouldBeEqualToString('dtmfsender.interToneGap', &quot;70&quot;);
+
+                    dtmfsender.insertDTMF(&quot;1&quot;, &quot;40&quot;, &quot;30&quot;);
+                    shouldBeEqualToString('dtmfsender.toneBuffer', &quot;1&quot;);
+                    shouldBeEqualToString('dtmfsender.duration', &quot;40&quot;);
+                    shouldBeEqualToString('dtmfsender.interToneGap', &quot;30&quot;);
+
+                    dtmfsender.insertDTMF(&quot;1&quot;, &quot;6000&quot;);
+                    shouldBeEqualToString('dtmfsender.toneBuffer', &quot;1&quot;);
+                    shouldBeEqualToString('dtmfsender.duration', &quot;6000&quot;);
+                    shouldBeEqualToString('dtmfsender.interToneGap', &quot;70&quot;);
+
+                    shouldThrow('dtmfsender.insertDTMF(&quot;1&quot;, &quot;20&quot;);');
+                    shouldThrow('dtmfsender.insertDTMF(&quot;1&quot;, &quot;7000&quot;);');
+                    shouldThrow('dtmfsender.insertDTMF(&quot;1&quot;, &quot;70&quot;, &quot;10&quot;);');
+
+
</ins><span class="cx">                 }
</span><span class="cx">             }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168965 => 168966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-05-16 09:02:40 UTC (rev 168965)
+++ trunk/Source/WebCore/ChangeLog        2014-05-16 11:56:14 UTC (rev 168966)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-05-16  Kiran  &lt;kiran.guduru@samsung.com&gt;
+
+        RTCDtmfSender default values need to be updated.
+        https://bugs.webkit.org/show_bug.cgi?id=132952
+
+        Reviewed by Eric Carlson.
+
+        The default ToneDuration and ToneGap values are modified in the updated spec.
+        So these values need to be updated.
+
+        Test: fast/mediastream/RTCPeerConnection-dtmf.html.
+
+        * Modules/mediastream/RTCDTMFSender.cpp:
+
</ins><span class="cx"> 2014-05-15  Daniel Bates  &lt;dabates@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Attempt to fix the Apple Mavericks Release, Apple MountainLion Release,
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDTMFSendercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp (168965 => 168966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp        2014-05-16 09:02:40 UTC (rev 168965)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp        2014-05-16 11:56:14 UTC (rev 168966)
</span><span class="lines">@@ -38,11 +38,11 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-static const long minToneDurationMs = 70;
</del><ins>+static const long minToneDurationMs = 40;
</ins><span class="cx"> static const long defaultToneDurationMs = 100;
</span><span class="cx"> static const long maxToneDurationMs = 6000;
</span><del>-static const long minInterToneGapMs = 50;
-static const long defaultInterToneGapMs = 50;
</del><ins>+static const long minInterToneGapMs = 30;
+static const long defaultInterToneGapMs = 70;
</ins><span class="cx"> 
</span><span class="cx"> PassRefPtr&lt;RTCDTMFSender&gt; RTCDTMFSender::create(ScriptExecutionContext* context, RTCPeerConnectionHandler* peerConnectionHandler, PassRefPtr&lt;MediaStreamTrack&gt; prpTrack, ExceptionCode&amp; ec)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>

</body>
</html>