Changeset 179869 in webkit

Timestamp:

Feb 10, 2015, 7:47:51 AM (12 years ago)

Author:

eric.carlson@apple.com

Message:

[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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/video-interruption-with-resume-allowing-play-expected.txt (modified) (1 diff)
• LayoutTests/media/video-interruption-with-resume-allowing-play.html (modified) (3 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/audio/MediaSession.cpp (modified) (2 diffs)
• Source/WebCore/platform/audio/MediaSession.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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.
+
 2015-02-10  Marcos Chavarría Teijeiro  <chavarria1991@gmail.com>
 

trunk/LayoutTests/media/video-interruption-with-resume-allowing-play-expected.txt

@@ -16 +16 @@
 EXPECTED (video.paused == 'false') OK
 
+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
+
 END OF TEST
 

trunk/LayoutTests/media/video-interruption-with-resume-allowing-play.html

@@ -5 +5 @@
         <script>
             var state = 0;
+            var resumeCount = 0;
 
             function checkState()
@@ -16 +17 @@
                     consoleWrite("");
                     break;
+
                 case "interrupted":
                     consoleWrite("100ms timer fired...");
@@ -23 +25 @@
                     consoleWrite("");
                     break;
+
                 case "resuming":
                     testExpected("video.paused", false);
                     consoleWrite("");
-                    endTest();
+                    if (++resumeCount == 2)
+                        endTest();
+                    state = "playing";
+                    setTimeout(checkState, 100);
                     break;
                 }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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:
+
 2015-02-10  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/platform/audio/MediaSession.cpp

@@ -82 +82 @@
 void MediaSession::beginInterruption(InterruptionType type)
 {
-    LOG(Media, "MediaSession::beginInterruption(%p), state = %s", this, stateName(m_state));
-
-    if (type == EnteringBackground && client().overrideBackgroundPlaybackRestriction())
+    LOG(Media, "MediaSession::beginInterruption(%p), state = %s, interruption count = %i", this, stateName(m_state), m_interruptionCount);
+
+    if (++m_interruptionCount > 1 || (type == EnteringBackground && client().overrideBackgroundPlaybackRestriction()))
         return;
 
@@ -96 +96 @@
 void MediaSession::endInterruption(EndInterruptionFlags flags)
 {
-    LOG(Media, "MediaSession::endInterruption(%p) - flags = %i, stateToRestore = %s", this, (int)flags, stateName(m_stateToRestore));
+    LOG(Media, "MediaSession::endInterruption(%p) - flags = %i, stateToRestore = %s, interruption count = %i", this, (int)flags, stateName(m_stateToRestore), m_interruptionCount);
+
+    if (!m_interruptionCount) {
+        LOG(Media, "MediaSession::endInterruption(%p) - !! ignoring spurious interruption end !!", this);
+        return;
+    }
+
+    if (--m_interruptionCount)
+        return;
 
     State stateToRestore = m_stateToRestore;

trunk/Source/WebCore/platform/audio/MediaSession.h

@@ -123 +123 @@
     State m_state;
     State m_stateToRestore;
+    int m_interruptionCount { 0 };
     bool m_notifyingClient;
 };