HLS videos sometimes fail to reach "ended" state & cannot be restarted

jernoble · jernoble · commit d9da700801d7 · 2023-01-24T23:33:37.000-08:00
https://bugs.webkit.org/show_bug.cgi?id=251119 rdar://102114139 Reviewed by Eric Carlson. When WebKit receives the AVPlayerItemDidPlayToEndTimeNotification notification, it still attempts to estimate the current time because it believes it is still playing, as it hasn't yet received the -timeControlStatus KVO. Reset the values for currentTime estimation when receiving this notification so that the values returned are consistent. * LayoutTests/http/tests/media/hls/hls-ended-expected.txt: Added. * LayoutTests/http/tests/media/hls/hls-ended.html: Added. * Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp: (WebCore::MediaPlayerPrivateAVFoundation::didEnd): * Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm: (WebCore::MediaPlayerPrivateAVFoundationObjC::didEnd): Canonical link: https://commits.webkit.org/259342@main
diff --git a/LayoutTests/http/tests/media/hls/hls-ended-expected.txt b/LayoutTests/http/tests/media/hls/hls-ended-expected.txt
@@ -0,0 +1,9 @@
+
+RUN(video.src = "../resources/hls/test-vod.m3u8")
+EVENT(canplay)
+RUN(video.currentTime = video.duration - 0.5)
+EVENT(seeked)
+RUN(video.play())
+EVENT(ended)
+END OF TEST
+
diff --git a/LayoutTests/http/tests/media/hls/hls-ended.html b/LayoutTests/http/tests/media/hls/hls-ended.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>hls-ended</title>
+    <script src=../../media-resources/video-test.js></script>
+    <script>
+    window.addEventListener('load', async event => {
+        video = document.getElementById('video');
+        run('video.src = "../resources/hls/test-vod.m3u8"');
+        await waitFor(video, 'canplay');
+        run('video.currentTime = video.duration - 0.5');
+        await waitFor(video, 'seeked');
+        run('video.play()');
+        await waitFor(video, 'ended');
+        endTest();
+    });
+    </script>
+</head>
+<body>
+    <video id="video"></video>
+</body>
+</html>
diff --git a/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp b/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp
@@ -687,6 +687,7 @@ void MediaPlayerPrivateAVFoundation::didEnd()
     // Hang onto the current time and use it as duration from now on since we are definitely at
     // the end of the movie. Do this because the initial duration is sometimes an estimate.
     MediaTime now = currentMediaTime();
+    ALWAYS_LOG(LOGIDENTIFIER, "currentTime: ", now, ", seeking: ", m_seeking);
     if (now > MediaTime::zeroTime() && !m_seeking)
         m_cachedDuration = now;
 
diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
@@ -1388,6 +1388,8 @@ static URL conformFragmentIdentifierForURL(const URL& url)
 void MediaPlayerPrivateAVFoundationObjC::didEnd()
 {
     m_requestedPlaying = false;
+    m_timeControlStatusAtCachedCurrentTime = AVPlayerTimeControlStatusPaused;
+    m_wallClockAtCachedCurrentTime = std::nullopt;
     MediaPlayerPrivateAVFoundation::didEnd();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1388,6 +1388,8 @@ static URL conformFragmentIdentifierForURL(const URL& url)`
`1388`	`1388`	`void MediaPlayerPrivateAVFoundationObjC::didEnd()`
`1389`	`1389`	`{`
`1390`	`1390`	`m_requestedPlaying = false;`
	`1391`	`+ m_timeControlStatusAtCachedCurrentTime = AVPlayerTimeControlStatusPaused;`
	`1392`	`+ m_wallClockAtCachedCurrentTime = std::nullopt;`
`1391`	`1393`	`MediaPlayerPrivateAVFoundation::didEnd();`
`1392`	`1394`	`}`
`1393`	`1395`