Changeset 293609 in webkit

Timestamp:

Apr 29, 2022 12:57:59 AM (3 months ago)

Author:

youenn@apple.com

Message:

HTMLMediaElement can get multiple interruptions for invisible autoplay
​https://bugs.webkit.org/show_bug.cgi?id=239842
<rdar://91809550>

Reviewed by Eric Carlson.

Source/WebCore:

A media element may be interrupted for invisible autoplay.
In some cases, like by calling play on the media element, the media element will no longer be in interrupted state.
This will lead to multiple invisible autoplay interruptions to be added to the same media element.
There will be only one end of interruption for invisible autoplay, which will lead to the media element to not restart as expected.

To prevent this, we store a boolean in HTMLMediaElement that tells us whether the media element has an ongoing invisible autoplay interruption.
Based on that, we make sure to always balance invisible autoplay interruption begin and end.

Test: media/video-mediastream-restricted-invisible-autoplay-not-allowed.html

• html/HTMLMediaElement.cpp:
• html/HTMLMediaElement.h:

LayoutTests:

• fast/mediastream/video-mediastream-restricted-invisible-autoplay-not-allowed-expected.txt: Added.
• fast/mediastream/video-mediastream-restricted-invisible-autoplay-not-allowed.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediastream/video-mediastream-restricted-invisible-autoplay-not-allowed-expected.txt (added)
• LayoutTests/fast/mediastream/video-mediastream-restricted-invisible-autoplay-not-allowed.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-04-29  Youenn Fablet  <youenn@apple.com>
+
+        HTMLMediaElement can get multiple interruptions for invisible autoplay
+        https://bugs.webkit.org/show_bug.cgi?id=239842
+        <rdar://91809550>
+
+        Reviewed by Eric Carlson.
+
+        * fast/mediastream/video-mediastream-restricted-invisible-autoplay-not-allowed-expected.txt: Added.
+        * fast/mediastream/video-mediastream-restricted-invisible-autoplay-not-allowed.html: Added.
+
 2022-04-28  Patrick Griffis  <pgriffis@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-04-29  Youenn Fablet  <youenn@apple.com>
+
+        HTMLMediaElement can get multiple interruptions for invisible autoplay
+        https://bugs.webkit.org/show_bug.cgi?id=239842
+        <rdar://91809550>
+
+        Reviewed by Eric Carlson.
+
+        A media element may be interrupted for invisible autoplay.
+        In some cases, like by calling play on the media element, the media element will no longer be in interrupted state.
+        This will lead to multiple invisible autoplay interruptions to be added to the same media element.
+        There will be only one end of interruption for invisible autoplay, which will lead to the media element to not restart as expected.
+
+        To prevent this, we store a boolean in HTMLMediaElement that tells us whether the media element has an ongoing invisible autoplay interruption.
+        Based on that, we make sure to always balance invisible autoplay interruption begin and end.
+
+        Test: media/video-mediastream-restricted-invisible-autoplay-not-allowed.html
+
+        * html/HTMLMediaElement.cpp:
+        * html/HTMLMediaElement.h:
+
 2022-04-29  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -8380 +8380 @@
 
     if (canAutoplay) {
-        if (mediaSession().state() == PlatformMediaSession::Interrupted) {
-            if (mediaSession().interruptionType() == PlatformMediaSession::InvisibleAutoplay)
-                mediaSession().endInterruption(PlatformMediaSession::MayResumePlaying);
-        } else if (!isPlaying())
+        if (m_wasInterruptedForInvisibleAutoplay) {
+            m_wasInterruptedForInvisibleAutoplay = false;
+            mediaSession().endInterruption(PlatformMediaSession::MayResumePlaying);
+            return;
+        }
+        if (!isPlaying())
             resumeAutoplaying();
         return;
     }
-    if (mediaSession().state() != PlatformMediaSession::Interrupted)
-        mediaSession().beginInterruption(PlatformMediaSession::InvisibleAutoplay);
+
+    if (mediaSession().state() == PlatformMediaSession::Interrupted)
+        return;
+
+    if (m_wasInterruptedForInvisibleAutoplay) {
+        m_wasInterruptedForInvisibleAutoplay = false;
+        mediaSession().endInterruption(PlatformMediaSession::NoFlags);
+    }
+
+    m_wasInterruptedForInvisibleAutoplay = true;
+    mediaSession().beginInterruption(PlatformMediaSession::InvisibleAutoplay);
 }
 

trunk/Source/WebCore/html/HTMLMediaElement.h

@@ -1249 +1249 @@
     AudioSessionCategory m_categoryAtMostRecentPlayback;
 #endif
+    bool m_wasInterruptedForInvisibleAutoplay { false };
 };