Changeset 287050 in webkit

Timestamp:

Dec 14, 2021, 2:36:14 PM (5 years ago)

Author:

jer.noble@apple.com

Message:

Safari intermittently stopping playing Spotify Web Player (currentTime goes backwards)
​https://bugs.webkit.org/show_bug.cgi?id=233257
<rdar://problem/85504967>

Reviewed by Eric Carlson.

Source/WebKit:

Test: media/video-currentTime-duration.html

Clamp currentMediaTime() to [0, durationMediaTime()].

• WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp:

(WebKit::MediaPlayerPrivateRemote::currentMediaTime const):

LayoutTests:

• media/video-currentTime-duration-expected.txt: Added.
• media/video-currentTime-duration.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/video-currentTime-duration-expected.txt (added)
• LayoutTests/media/video-currentTime-duration.html (added)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-12-14  Jer Noble  <jer.noble@apple.com>
+
+        Safari intermittently stopping playing Spotify Web Player (currentTime goes backwards)
+        https://bugs.webkit.org/show_bug.cgi?id=233257
+        <rdar://problem/85504967>
+
+        Reviewed by Eric Carlson.
+
+        * media/video-currentTime-duration-expected.txt: Added.
+        * media/video-currentTime-duration.html: Added.
+
 2021-12-14  Tyler Wilcock  <tyler_w@apple.com>
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-12-14  Jer Noble  <jer.noble@apple.com>
+
+        Safari intermittently stopping playing Spotify Web Player (currentTime goes backwards)
+        https://bugs.webkit.org/show_bug.cgi?id=233257
+        <rdar://problem/85504967>
+
+        Reviewed by Eric Carlson.
+
+        Test: media/video-currentTime-duration.html
+
+        Clamp currentMediaTime() to [0, durationMediaTime()].
+
+        * WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp:
+        (WebKit::MediaPlayerPrivateRemote::currentMediaTime const):
+
 2021-12-14  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp

@@ -286 +286 @@
         return m_cachedMediaTime;
 
-    return m_cachedMediaTime + MediaTime::createWithDouble(m_rate * (MonotonicTime::now() - m_cachedMediaTimeQueryTime).seconds());
+    auto calculatedCurrentTime = m_cachedMediaTime + MediaTime::createWithDouble(m_rate * (MonotonicTime::now() - m_cachedMediaTimeQueryTime).seconds());
+    return std::min(std::max(calculatedCurrentTime, MediaTime::zeroTime()), durationMediaTime());
 }