Changeset 272583 in webkit

Timestamp:

Feb 9, 2021 9:47:37 AM (18 months ago)

Author:

youenn@apple.com

Message:

MediaStream-backed video elements should not compute the mediaType based on track muted states
​https://bugs.webkit.org/show_bug.cgi?id=221601

Reviewed by Eric Carlson.

Source/WebCore:

In case of entering background, two things happen:

• video elements get paused
• local video capture track gets muted

When entering foreground:

• video element should resume but did not as the local video track was muted and video element was considered as an audio element.
• local video capture track gets unmuted but this is too late.

To fix this, compute hasVideo/hasAudio based on available tracks, no matter their active state.

Test: fast/mediastream/MediaStream-video-element-enter-background.html

• platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:

(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::hasVideo const):
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::hasAudio const):

LayoutTests:

• fast/mediastream/MediaStream-video-element-enter-background-expected.txt: Added.
• fast/mediastream/MediaStream-video-element-enter-background.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediastream/MediaStream-video-element-enter-background-expected.txt (added)
• LayoutTests/fast/mediastream/MediaStream-video-element-enter-background.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-02-09  Youenn Fablet  <youenn@apple.com>
+
+        MediaStream-backed video elements should not compute the mediaType based on track muted states
+        https://bugs.webkit.org/show_bug.cgi?id=221601
+
+        Reviewed by Eric Carlson.
+
+        * fast/mediastream/MediaStream-video-element-enter-background-expected.txt: Added.
+        * fast/mediastream/MediaStream-video-element-enter-background.html: Added.
+
 2021-02-09  Chris Gambrell  <cgambrell@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-02-09  Youenn Fablet  <youenn@apple.com>
+
+        MediaStream-backed video elements should not compute the mediaType based on track muted states
+        https://bugs.webkit.org/show_bug.cgi?id=221601
+
+        Reviewed by Eric Carlson.
+
+        In case of entering background, two things happen:
+        - video elements get paused
+        - local video capture track gets muted
+        When entering foreground:
+        - video element should resume but did not as the local video track was muted and video element was considered as an audio element.
+        - local video capture track gets unmuted but this is too late.
+        To fix this, compute hasVideo/hasAudio based on available tracks, no matter their active state.
+
+        Test: fast/mediastream/MediaStream-video-element-enter-background.html
+
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
+        (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::hasVideo const):
+        (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::hasAudio const):
+
 2021-02-09  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm

@@ -578 +578 @@
 bool MediaPlayerPrivateMediaStreamAVFObjC::hasVideo() const
 {
-    if (!metaDataAvailable())
-        return false;
-    
-    return m_mediaStreamPrivate->hasVideo();
+    return !m_videoTrackMap.isEmpty();
 }
 
 bool MediaPlayerPrivateMediaStreamAVFObjC::hasAudio() const
 {
-    if (!metaDataAvailable())
-        return false;
-    
-    return m_mediaStreamPrivate->hasAudio();
+    return !m_audioTrackMap.isEmpty();
 }