Changeset 280330 in webkit

Timestamp:

Jul 26, 2021 5:25:42 PM (12 months ago)

Author:

Jean-Yves Avenard

Message:

Video pauses after scrubbing with Touch Bar
​https://bugs.webkit.org/show_bug.cgi?id=228277
rdar://80606886

Reviewed by Jer Noble.

Source/WebCore:

In ​https://trac.webkit.org/r206487 ; in order to ensure that the playback state
was properly reflected following a seek using the touch bar, the element was paused.
It's unclear if that workaround is still required, but for now we will record if the
element was playing before the seek and if so, resume playback once the seek completes.
Now that the touch bar and Now Playing are hooked to the Media Session action handlers
the behaviour change will occur for all those components.

Test: media/media-session/play-after-seek.html

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::HTMLMediaElement): Initialize new member in constructor.
(WebCore::HTMLMediaElement::clearSeeking):
(WebCore::HTMLMediaElement::finishSeek): Call play() once seek completes if the element
was playing before.
(WebCore::HTMLMediaElement::pause): Ensure that if pause() is called before the seek
completes, the element stays paused.
(WebCore::HTMLMediaElement::handleSeekToPlaybackPosition): Record playing state before
pausing the element.

• html/HTMLMediaElement.h: Add new boolean member.

LayoutTests:

• media/media-session/play-after-seek-expected.txt: Added.
• media/media-session/play-after-seek.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/media-session/play-after-seek-expected.txt (added)
• LayoutTests/media/media-session/play-after-seek.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (6 diffs)
• Source/WebCore/html/HTMLMediaElement.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-07-26  Jean-Yves Avenard  <jya@apple.com>
+
+        Video pauses after scrubbing with Touch Bar
+        https://bugs.webkit.org/show_bug.cgi?id=228277
+        rdar://80606886
+
+        Reviewed by Jer Noble.
+
+        * media/media-session/play-after-seek-expected.txt: Added.
+        * media/media-session/play-after-seek.html: Added.
+
 2021-07-26  Eric Hutchison  <ehutchison@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-07-26  Jean-Yves Avenard  <jya@apple.com>
+
+        Video pauses after scrubbing with Touch Bar
+        https://bugs.webkit.org/show_bug.cgi?id=228277
+        rdar://80606886
+
+        Reviewed by Jer Noble.
+
+        In https://trac.webkit.org/r206487 ; in order to ensure that the playback state
+        was properly reflected following a seek using the touch bar, the element was paused.
+        It's unclear if that workaround is still required, but for now we will record if the
+        element was playing before the seek and if so, resume playback once the seek completes.
+        Now that the touch bar and Now Playing are hooked to the Media Session action handlers
+        the behaviour change will occur for all those components.
+
+        Test: media/media-session/play-after-seek.html
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::HTMLMediaElement): Initialize new member in constructor.
+        (WebCore::HTMLMediaElement::clearSeeking):
+        (WebCore::HTMLMediaElement::finishSeek): Call play() once seek completes if the element
+        was playing before.
+        (WebCore::HTMLMediaElement::pause): Ensure that if pause() is called before the seek
+        completes, the element stays paused.
+        (WebCore::HTMLMediaElement::handleSeekToPlaybackPosition): Record playing state before
+        pausing the element.
+        * html/HTMLMediaElement.h: Add new boolean member.
+
 2021-07-26  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -415 +415 @@
     , m_seeking(false)
     , m_seekRequested(false)
+    , m_wasPlayingBeforeSeeking(false)
     , m_sentStalledEvent(false)
     , m_sentEndEvent(false)
@@ -3082 +3083 @@
     m_seekRequested = false;
     m_pendingSeekType = NoSeek;
+    m_wasPlayingBeforeSeeking = false;
     invalidateCachedTime();
 }
@@ -3087 +3089 @@
 void HTMLMediaElement::finishSeek()
 {
+    bool wasPlayingBeforeSeeking = m_wasPlayingBeforeSeeking;
     // 4.8.10.9 Seeking
     // 14 - Set the seeking IDL attribute to false.
@@ -3112 +3115 @@
         m_mediaSource->monitorSourceBuffers();
 #endif
+    if (wasPlayingBeforeSeeking)
+        playInternal();
 }
 
@@ -3566 +3571 @@
 
     pauseInternal();
+    // If we have a pending seek, ensure playback doesn't resume.
+    m_wasPlayingBeforeSeeking = false;
 }
 
@@ -4855 +4862 @@
     if (!m_isScrubbingRemotely) {
         m_isScrubbingRemotely = true;
-        if (!paused())
+        if ((m_wasPlayingBeforeSeeking = !paused()))
             pauseInternal();
     }

trunk/Source/WebCore/html/HTMLMediaElement.h

@@ -1072 +1072 @@
     bool m_seeking : 1;
     bool m_seekRequested : 1;
+    bool m_wasPlayingBeforeSeeking : 1;
 
     // data has not been loaded since sending a "stalled" event