<!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>[179869] 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/179869">179869</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-02-10 07:47:51 -0800 (Tue, 10 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] don't get out of sync when interrupt/resume calls are not balanced
https://bugs.webkit.org/show_bug.cgi?id=141310
Reviewed by Jer Noble.
Source/WebCore:
No new tests, updated media/video-interruption-with-resume-allowing-play.html.
* platform/audio/MediaSession.cpp:
(WebCore::MediaSession::beginInterruption): Count interruptions.
(WebCore::MediaSession::endInterruption): Ignore calls when m_interruptionCount is already zero.
* platform/audio/MediaSession.h:
LayoutTests:
* media/video-interruption-with-resume-allowing-play-expected.txt:
* media/video-interruption-with-resume-allowing-play.html: Updated to test unbalanced calls
to begin/end interruption.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediavideointerruptionwithresumeallowingplayexpectedtxt">trunk/LayoutTests/media/video-interruption-with-resume-allowing-play-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediavideointerruptionwithresumeallowingplayhtml">trunk/LayoutTests/media/video-interruption-with-resume-allowing-play.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioMediaSessioncpp">trunk/Source/WebCore/platform/audio/MediaSession.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioMediaSessionh">trunk/Source/WebCore/platform/audio/MediaSession.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (179868 => 179869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-02-10 14:42:26 UTC (rev 179868)
+++ trunk/LayoutTests/ChangeLog 2015-02-10 15:47:51 UTC (rev 179869)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-02-10 Eric Carlson <eric.carlson@apple.com>
+
+ [iOS] don't get out of sync when interrupt/resume calls are not balanced
+ https://bugs.webkit.org/show_bug.cgi?id=141310
+
+ Reviewed by Jer Noble.
+
+ * media/video-interruption-with-resume-allowing-play-expected.txt:
+ * media/video-interruption-with-resume-allowing-play.html: Updated to test unbalanced calls
+ to begin/end interruption.
+
</ins><span class="cx"> 2015-02-10 Marcos ChavarrÃa Teijeiro <chavarria1991@gmail.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed GTK Gardening.
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideointerruptionwithresumeallowingplayexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/video-interruption-with-resume-allowing-play-expected.txt (179868 => 179869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-interruption-with-resume-allowing-play-expected.txt 2015-02-10 14:42:26 UTC (rev 179868)
+++ trunk/LayoutTests/media/video-interruption-with-resume-allowing-play-expected.txt 2015-02-10 15:47:51 UTC (rev 179869)
</span><span class="lines">@@ -15,5 +15,15 @@
</span><span class="cx"> EVENT(playing)
</span><span class="cx"> EXPECTED (video.paused == 'false') OK
</span><span class="cx">
</span><ins>+EXPECTED (video.paused == 'false') OK
+RUN(internals.beginMediaSessionInterruption())
+
+100ms timer fired...
+EXPECTED (video.paused == 'true') OK
+RUN(internals.endMediaSessionInterruption('MayResumePlaying'))
+
+EVENT(playing)
+EXPECTED (video.paused == 'false') OK
+
</ins><span class="cx"> END OF TEST
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideointerruptionwithresumeallowingplayhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/video-interruption-with-resume-allowing-play.html (179868 => 179869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-interruption-with-resume-allowing-play.html 2015-02-10 14:42:26 UTC (rev 179868)
+++ trunk/LayoutTests/media/video-interruption-with-resume-allowing-play.html 2015-02-10 15:47:51 UTC (rev 179869)
</span><span class="lines">@@ -4,6 +4,7 @@
</span><span class="cx"> <script src=video-test.js></script>
</span><span class="cx"> <script>
</span><span class="cx"> var state = 0;
</span><ins>+ var resumeCount = 0;
</ins><span class="cx">
</span><span class="cx"> function checkState()
</span><span class="cx"> {
</span><span class="lines">@@ -15,6 +16,7 @@
</span><span class="cx"> setTimeout(checkState, 100);
</span><span class="cx"> consoleWrite("");
</span><span class="cx"> break;
</span><ins>+
</ins><span class="cx"> case "interrupted":
</span><span class="cx"> consoleWrite("100ms timer fired...");
</span><span class="cx"> testExpected("video.paused", true);
</span><span class="lines">@@ -22,10 +24,14 @@
</span><span class="cx"> run("internals.endMediaSessionInterruption('MayResumePlaying')");
</span><span class="cx"> consoleWrite("");
</span><span class="cx"> break;
</span><ins>+
</ins><span class="cx"> case "resuming":
</span><span class="cx"> testExpected("video.paused", false);
</span><span class="cx"> consoleWrite("");
</span><del>- endTest();
</del><ins>+ if (++resumeCount == 2)
+ endTest();
+ state = "playing";
+ setTimeout(checkState, 100);
</ins><span class="cx"> break;
</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 (179868 => 179869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-10 14:42:26 UTC (rev 179868)
+++ trunk/Source/WebCore/ChangeLog 2015-02-10 15:47:51 UTC (rev 179869)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-02-10 Eric Carlson <eric.carlson@apple.com>
+
+ [iOS] don't get out of sync when interrupt/resume calls are not balanced
+ https://bugs.webkit.org/show_bug.cgi?id=141310
+
+ Reviewed by Jer Noble.
+
+ No new tests, updated media/video-interruption-with-resume-allowing-play.html.
+
+ * platform/audio/MediaSession.cpp:
+ (WebCore::MediaSession::beginInterruption): Count interruptions.
+ (WebCore::MediaSession::endInterruption): Ignore calls when m_interruptionCount is already zero.
+ * platform/audio/MediaSession.h:
+
</ins><span class="cx"> 2015-02-10 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] GMutexLocker build issue
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioMediaSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/MediaSession.cpp (179868 => 179869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/MediaSession.cpp 2015-02-10 14:42:26 UTC (rev 179868)
+++ trunk/Source/WebCore/platform/audio/MediaSession.cpp 2015-02-10 15:47:51 UTC (rev 179869)
</span><span class="lines">@@ -81,9 +81,9 @@
</span><span class="cx">
</span><span class="cx"> void MediaSession::beginInterruption(InterruptionType type)
</span><span class="cx"> {
</span><del>- LOG(Media, "MediaSession::beginInterruption(%p), state = %s", this, stateName(m_state));
</del><ins>+ LOG(Media, "MediaSession::beginInterruption(%p), state = %s, interruption count = %i", this, stateName(m_state), m_interruptionCount);
</ins><span class="cx">
</span><del>- if (type == EnteringBackground && client().overrideBackgroundPlaybackRestriction())
</del><ins>+ if (++m_interruptionCount > 1 || (type == EnteringBackground && client().overrideBackgroundPlaybackRestriction()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_stateToRestore = state();
</span><span class="lines">@@ -95,8 +95,16 @@
</span><span class="cx">
</span><span class="cx"> void MediaSession::endInterruption(EndInterruptionFlags flags)
</span><span class="cx"> {
</span><del>- LOG(Media, "MediaSession::endInterruption(%p) - flags = %i, stateToRestore = %s", this, (int)flags, stateName(m_stateToRestore));
</del><ins>+ LOG(Media, "MediaSession::endInterruption(%p) - flags = %i, stateToRestore = %s, interruption count = %i", this, (int)flags, stateName(m_stateToRestore), m_interruptionCount);
</ins><span class="cx">
</span><ins>+ if (!m_interruptionCount) {
+ LOG(Media, "MediaSession::endInterruption(%p) - !! ignoring spurious interruption end !!", this);
+ return;
+ }
+
+ if (--m_interruptionCount)
+ return;
+
</ins><span class="cx"> State stateToRestore = m_stateToRestore;
</span><span class="cx"> m_stateToRestore = Idle;
</span><span class="cx"> setState(Paused);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioMediaSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/MediaSession.h (179868 => 179869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/MediaSession.h 2015-02-10 14:42:26 UTC (rev 179868)
+++ trunk/Source/WebCore/platform/audio/MediaSession.h 2015-02-10 15:47:51 UTC (rev 179869)
</span><span class="lines">@@ -122,6 +122,7 @@
</span><span class="cx"> Timer m_clientDataBufferingTimer;
</span><span class="cx"> State m_state;
</span><span class="cx"> State m_stateToRestore;
</span><ins>+ int m_interruptionCount { 0 };
</ins><span class="cx"> bool m_notifyingClient;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>