Changeset 271488 in webkit

Timestamp:

Jan 14, 2021, 9:19:00 AM (6 years ago)

Author:

youenn@apple.com

Message:

MediaSessionManager should update its state as soon as an audio capture track is ended
​https://bugs.webkit.org/show_bug.cgi?id=220619

Reviewed by Eric Carlson.

Source/WebCore:

We were updating the audio session category on track destruction.
It should be done as soon as track is ended (either by web page or underlying)
instead of when GC might happen.

Covered by updated test.

• Modules/mediastream/MediaStreamTrack.cpp:

(WebCore::MediaStreamTrack::~MediaStreamTrack):
(WebCore::MediaStreamTrack::trackEnded):

• platform/audio/PlatformMediaSessionManager.h:

(WebCore::PlatformMediaSessionManager::hasAudioCaptureSource const):

LayoutTests:

• fast/mediastream/audio-track-enabled-expected.txt:
• fast/mediastream/audio-track-enabled.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediastream/audio-track-enabled-expected.txt (modified) (1 diff)
• LayoutTests/fast/mediastream/audio-track-enabled.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp (modified) (2 diffs)
• Source/WebCore/platform/audio/PlatformMediaSessionManager.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-01-14  Youenn Fablet  <youenn@apple.com>
+
+        MediaSessionManager should update its state as soon as an audio capture track is ended
+        https://bugs.webkit.org/show_bug.cgi?id=220619
+
+        Reviewed by Eric Carlson.
+
+        * fast/mediastream/audio-track-enabled-expected.txt:
+        * fast/mediastream/audio-track-enabled.html:
+
 2021-01-14  Martin Robinson  <mrobinson@igalia.com>
 

trunk/LayoutTests/fast/mediastream/audio-track-enabled-expected.txt

@@ -1 +1 @@
 
 
-PASS Check audio session state in case of disabled audio tracks
+PASS Check audio session state in case of disabled and stopped audio tracks
 

trunk/LayoutTests/fast/mediastream/audio-track-enabled.html

@@ -14 +14 @@
     internals.settings.setShouldManageAudioSessionCategory(true);
 
+    const defaultCategory = internals.audioSessionCategory();
+
     let stream = await navigator.mediaDevices.getUserMedia({audio : true});
 
@@ -25 +27 @@
     assert_equals(internals.audioSessionCategory(), "PlayAndRecord");
 
-    stream.removeTrack(stream.getAudioTracks()[0]);
+    const audioTrack = stream.getAudioTracks()[0];
+    stream.removeTrack(audioTrack);
     await new Promise(resolve => setTimeout(resolve, 10));
     assert_equals(internals.audioSessionCategory(), "PlayAndRecord");
-}, "Check audio session state in case of disabled audio tracks");
+
+    audioTrack.stop();
+    const maxTries = 100;
+    let counter = 0;
+    while (++counter < maxTries) {
+        if (internals.audioSessionCategory() != "PlayAndRecord")
+            break;
+        await new Promise(resolve => setTimeout(resolve, 10));
+    }
+    assert_less_than(counter, maxTries);
+    assert_equals(internals.audioSessionCategory(), defaultCategory);
+}, "Check audio session state in case of disabled and stopped audio tracks");
 </script>
 </body>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-01-14  Youenn Fablet  <youenn@apple.com>
+
+        MediaSessionManager should update its state as soon as an audio capture track is ended
+        https://bugs.webkit.org/show_bug.cgi?id=220619
+
+        Reviewed by Eric Carlson.
+
+        We were updating the audio session category on track destruction.
+        It should be done as soon as track is ended (either by web page or underlying)
+        instead of when GC might happen.
+
+        Covered by updated test.
+
+        * Modules/mediastream/MediaStreamTrack.cpp:
+        (WebCore::MediaStreamTrack::~MediaStreamTrack):
+        (WebCore::MediaStreamTrack::trackEnded):
+        * platform/audio/PlatformMediaSessionManager.h:
+        (WebCore::PlatformMediaSessionManager::hasAudioCaptureSource const):
+
 2021-01-14  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp

@@ -106 +106 @@
     allCaptureTracks().remove(this);
 
-    if (m_private->type() == RealtimeMediaSource::Type::Audio)
-        PlatformMediaSessionManager::sharedManager().removeAudioCaptureSource(*this);
+    ASSERT(m_private->type() != RealtimeMediaSource::Type::Audio || !PlatformMediaSessionManager::sharedManager().hasAudioCaptureSource(*this));
 }
 
@@ -539 +538 @@
 void MediaStreamTrack::trackEnded(MediaStreamTrackPrivate&)
 {
+    if (m_isCaptureTrack && m_private->type() == RealtimeMediaSource::Type::Audio)
+        PlatformMediaSessionManager::sharedManager().removeAudioCaptureSource(*this);
+
     // http://w3c.github.io/mediacapture-main/#life-cycle
     // When a MediaStreamTrack track ends for any reason other than the stop() method being invoked, the User Agent must queue a task that runs the following steps:

trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.h

@@ -147 +147 @@
     WEBCORE_EXPORT void addAudioCaptureSource(PlatformMediaSession::AudioCaptureSource&);
     WEBCORE_EXPORT void removeAudioCaptureSource(PlatformMediaSession::AudioCaptureSource&);
+    bool hasAudioCaptureSource(PlatformMediaSession::AudioCaptureSource& source) const { return m_audioCaptureSources.contains(source); }
 
     WEBCORE_EXPORT void processDidReceiveRemoteControlCommand(PlatformMediaSession::RemoteControlCommandType, const PlatformMediaSession::RemoteCommandArgument*);