Changeset 271440 in webkit

Timestamp:

Jan 13, 2021, 7:53:27 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, reverting r271401.
​https://bugs.webkit.org/show_bug.cgi?id=220591

It is breaking iOS audio rendering

Reverted changeset:

"Unmuting a track in case of end of interruption by another
web process tab is not working well with capture muting icons"
​https://bugs.webkit.org/show_bug.cgi?id=220058
​https://trac.webkit.org/changeset/271401

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediastream/media-stream-track-interrupted.html (modified) (3 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp (modified) (3 diffs)
• Source/WebCore/Modules/mediastream/MediaStreamTrack.h (modified) (2 diffs)
• Source/WebCore/dom/Document.cpp (modified) (2 diffs)
• Source/WebCore/page/Page.cpp (modified) (2 diffs)
• Source/WebCore/page/Page.h (modified) (1 diff)
• Source/WebCore/platform/mediastream/mac/BaseAudioSharedUnit.cpp (modified) (2 diffs)
• Source/WebCore/testing/Internals.cpp (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/WebProcess/WebProcess.cpp (modified) (1 diff)
• Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-01-13  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r271401.
+        https://bugs.webkit.org/show_bug.cgi?id=220591
+
+        It is breaking iOS audio rendering
+
+        Reverted changeset:
+
+        "Unmuting a track in case of end of interruption by another
+        web process tab is not working well with capture muting icons"
+        https://bugs.webkit.org/show_bug.cgi?id=220058
+        https://trac.webkit.org/changeset/271401
+
 2021-01-13  Martin Robinson  <mrobinson@igalia.com>
 

trunk/LayoutTests/fast/mediastream/media-stream-track-interrupted.html

@@ -51 +51 @@
     function testTrack(track, title)
     {
-        promise_test(async (test) => {
-            if (track.muted)
-                await new Promise(resolve => track.onunmute = resolve);
-
-            await new Promise((resolve, reject) => {
+        promise_test((test) => {
+            return new Promise((resolve, reject) => {
                 let isVideo = track.kind == "video";
                 if (window.internals) {
@@ -71 +68 @@
                             waitForPageStateChange(10, pageState, resolve, reject)
                         }
+
                         if (window.internals) {
-                            assert_true(pageMediaState.includes('HasMutedAudioCaptureDevice'), 'audio muted');
-                            assert_true(pageMediaState.includes('HasMutedVideoCaptureDevice'), 'video muted');
+                            assert_true(pageMediaState.includes(isVideo ? 'HasMutedVideoCaptureDevice' : 'HasMutedAudioCaptureDevice'));
+                            assert_false(pageMediaState.includes(isVideo ? 'HasMutedAudioCaptureDevice' : 'HasMutedVideoCaptureDevice'));
+                            assert_true(pageMediaState.includes(isVideo ? 'HasActiveAudioCaptureDevice' : 'HasActiveVideoCaptureDevice'));
+                            assert_false(pageMediaState.includes(isVideo ? 'HasActiveVideoCaptureDevice' : 'HasActiveAudioCaptureDevice'));
                             pageState = internals.pageMediaState();
                             internals.setMediaStreamSourceInterrupted(track, false)
@@ -86 +86 @@
                 setTimeout(() => reject("Muted state did not change in 1 second"), 1000);
             });
-            track.onmute = () => { };
-            track.onunmute = () => { };
         }, title);
     }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-01-13  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r271401.
+        https://bugs.webkit.org/show_bug.cgi?id=220591
+
+        It is breaking iOS audio rendering
+
+        Reverted changeset:
+
+        "Unmuting a track in case of end of interruption by another
+        web process tab is not working well with capture muting icons"
+        https://bugs.webkit.org/show_bug.cgi?id=220058
+        https://trac.webkit.org/changeset/271401
+
 2021-01-13  Martin Robinson  <mrobinson@igalia.com>
 

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

@@ -72 +72 @@
     track->suspendIfNeeded();
 
-    if (track->isCaptureTrack()) {
-        if (auto* page = track->document()->page())
-            track->updateToPageMutedState(page->mutedState());
-    }
+    if (track->isCaptureTrack())
+        track->updateToPageMutedState();
 
     return track;
@@ -472 +470 @@
 #endif
 
-void MediaStreamTrack::updateCaptureAccordingToMutedState(Document& document, MediaProducer::MutedStateFlags mutedState)
+void MediaStreamTrack::updateCaptureAccordingToMutedState(Document& document)
 {
 #if PLATFORM(IOS_FAMILY)
@@ -479 +477 @@
         return;
 
-    bool pageMuted = mutedState & MediaProducer::AudioAndVideoCaptureIsMuted;
-
-    auto updateTracksAccordingPageMutedState = [](const Document& document, CaptureDevice::DeviceType deviceType, bool pageMuted) {
-        // We can only have one source at a time: we can mute all tracks but unmute only one of them.
-        for (auto* captureTrack : allCaptureTracks()) {
-            if (captureTrack->document() != &document || captureTrack->ended() || captureTrack->source().deviceType() != deviceType)
-                continue;
-            captureTrack->m_private->setMuted(pageMuted);
-            // If unmuting, unmute the first source of the document we know.
-            if (!pageMuted)
-                break;
-        }
-    };
     auto* activeAudioSource = RealtimeMediaSourceCenter::singleton().audioCaptureFactory().activeSource();
-    if (activeAudioSource && isSourceCapturingForTrackInDocument(*activeAudioSource, document))
+    if (activeAudioSource && isSourceCapturingForTrackInDocument(*activeAudioSource, document)) {
+        bool pageMuted = page->mutedState() & MediaProducer::AudioAndVideoCaptureIsMuted;
         activeAudioSource->setMuted(pageMuted || (document.hidden() && document.settings().interruptAudioOnPageVisibilityChangeEnabled()));
-    else
-        updateTracksAccordingPageMutedState(document, CaptureDevice::DeviceType::Microphone, pageMuted);
+    }
 
     auto* activeVideoSource = RealtimeMediaSourceCenter::singleton().videoCaptureFactory().activeSource();
-    if (activeVideoSource && isSourceCapturingForTrackInDocument(*activeVideoSource, document))
+    if (activeVideoSource && isSourceCapturingForTrackInDocument(*activeVideoSource, document)) {
+        bool pageMuted = page->mutedState() & MediaProducer::AudioAndVideoCaptureIsMuted;
         activeVideoSource->setMuted(pageMuted || document.hidden());
-    else
-        updateTracksAccordingPageMutedState(document, CaptureDevice::DeviceType::Camera, pageMuted);
+    }
 #else
     for (auto* captureTrack : allCaptureTracks()) {
         if (captureTrack->document() == &document && !captureTrack->ended())
-            captureTrack->updateToPageMutedState(mutedState);
+            captureTrack->updateToPageMutedState();
     }
 #endif
 }
 
-void MediaStreamTrack::updateToPageMutedState(MediaProducer::MutedStateFlags mutedState)
+void MediaStreamTrack::updateToPageMutedState()
 {
     ASSERT(isCaptureTrack());
+    auto* page = document()->page();
+    if (!page)
+        return;
 
     switch (source().deviceType()) {
     case CaptureDevice::DeviceType::Microphone:
     case CaptureDevice::DeviceType::Camera:
-        m_private->setMuted(mutedState & MediaProducer::AudioAndVideoCaptureIsMuted);
+        m_private->setMuted(page->mutedState() & MediaProducer::AudioAndVideoCaptureIsMuted);
         break;
     case CaptureDevice::DeviceType::Screen:
     case CaptureDevice::DeviceType::Window:
-        m_private->setMuted(mutedState & MediaProducer::ScreenCaptureIsMuted);
+        m_private->setMuted(page->mutedState() & MediaProducer::ScreenCaptureIsMuted);
         break;
     case CaptureDevice::DeviceType::Speaker:

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

@@ -73 +73 @@
 
     static MediaProducer::MediaStateFlags captureState(Document&);
-    static void updateCaptureAccordingToMutedState(Document&, MediaProducer::MutedStateFlags);
+    static void updateCaptureAccordingToMutedState(Document&);
 
     virtual bool isCanvas() const { return false; }
@@ -170 +170 @@
 
     void configureTrackRendering();
-    void updateToPageMutedState(MediaProducer::MutedStateFlags);
+    void updateToPageMutedState();
 
     // ActiveDOMObject API.

trunk/Source/WebCore/dom/Document.cpp

@@ -1810 +1810 @@
 
 #if ENABLE(MEDIA_STREAM) && PLATFORM(IOS_FAMILY)
-    auto* page = this->page();
-    if (!page)
-        return;
-
     if (auto mediaSessionManager = PlatformMediaSessionManager::sharedManagerIfExists()) {
         if (!mediaSessionManager->isInterrupted())
-            MediaStreamTrack::updateCaptureAccordingToMutedState(*this, page->mutedState());
+            MediaStreamTrack::updateCaptureAccordingToMutedState(*this);
     }
 #endif
@@ -4302 +4298 @@
 
 #if ENABLE(MEDIA_STREAM)
-    MediaStreamTrack::updateCaptureAccordingToMutedState(*this, page()->mutedState());
+    MediaStreamTrack::updateCaptureAccordingToMutedState(*this);
 #endif
 }

trunk/Source/WebCore/page/Page.cpp

@@ -80 +80 @@
 #include "MediaCanStartListener.h"
 #include "MediaRecorderProvider.h"
-#include "MediaStreamTrack.h"
 #include "Navigator.h"
 #include "PageConfiguration.h"
@@ -2076 +2075 @@
 }
 
-void Page::beginAudioCaptureInterruption()
-{
-#if ENABLE(MEDIA_STREAM)
-    forEachDocument([mutedState = mutedState()](auto& document) {
-        MediaStreamTrack::updateCaptureAccordingToMutedState(document, mutedState | MediaProducer::AudioAndVideoCaptureIsMuted);
-    });
-#endif
-}
-
-void Page::endAudioCaptureInterruption()
-{
-#if ENABLE(MEDIA_STREAM)
-    forEachDocument([mutedState = mutedState()](auto& document) {
-        MediaStreamTrack::updateCaptureAccordingToMutedState(document, mutedState);
-    });
-#endif
-}
-
 bool Page::mediaPlaybackExists()
 {

trunk/Source/WebCore/page/Page.h

@@ -832 +832 @@
     void setTextInteractionEnabled(bool value) { m_textInteractionEnabled = value; }
 
-    WEBCORE_EXPORT void beginAudioCaptureInterruption();
-    WEBCORE_EXPORT void endAudioCaptureInterruption();
-
 private:
     struct Navigation {

trunk/Source/WebCore/platform/mediastream/mac/BaseAudioSharedUnit.cpp

@@ -184 +184 @@
         reconfigure();
     }
+
+    ASSERT(!m_producingCount);
+
+    forEachClient([](auto& client) {
+        client.setMuted(false);
+    });
+
     return 0;
 }
@@ -195 +202 @@
     m_suspended = true;
     stopInternal();
+
+    forEachClient([](auto& client) {
+        client.setMuted(true);
+    });
+
+    ASSERT(!m_producingCount);
+
     return 0;
 }

trunk/Source/WebCore/testing/Internals.cpp

@@ -5279 +5279 @@
 void Internals::setMediaStreamSourceInterrupted(MediaStreamTrack& track, bool interrupted)
 {
-    auto* document = contextDocument();
-    auto* page = document ? document->page() : nullptr;
-    if (!page)
-        return;
-
     track.source().setInterruptedForTesting(interrupted);
-    if (interrupted)
-        page->beginAudioCaptureInterruption();
-    else
-        page->endAudioCaptureInterruption();
 }
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-01-13  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r271401.
+        https://bugs.webkit.org/show_bug.cgi?id=220591
+
+        It is breaking iOS audio rendering
+
+        Reverted changeset:
+
+        "Unmuting a track in case of end of interruption by another
+        web process tab is not working well with capture muting icons"
+        https://bugs.webkit.org/show_bug.cgi?id=220058
+        https://trac.webkit.org/changeset/271401
+
 2021-01-12  BJ Burg  <bburg@apple.com>
 

trunk/Source/WebKit/WebProcess/WebProcess.cpp

@@ -1815 +1815 @@
 void WebProcess::revokeUserMediaDeviceSandboxExtensions(const Vector<String>& extensionIDs)
 {
-    if (!MockRealtimeMediaSourceCenter::mockRealtimeMediaSourceCenterEnabled())
-        checkDocumentsCaptureStateConsistency(extensionIDs);
+    checkDocumentsCaptureStateConsistency(extensionIDs);
 
     for (const auto& extensionID : extensionIDs) {

trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm

@@ -55 +55 @@
 #import <WebCore/AVAssetMIMETypeCache.h>
 #import <WebCore/AXObjectCache.h>
-#import <WebCore/AudioSession.h>
 #import <WebCore/CPUMonitor.h>
 #import <WebCore/DisplayRefreshMonitorManager.h>
@@ -172 +171 @@
 #endif
 
-#if PLATFORM(IOS)
-static void listenToAudioSessionInterruption();
-#endif
-
 void WebProcess::platformSetCacheModel(CacheModel)
 {
@@ -412 +407 @@
 
     WebCore::IOSurface::setMaximumSize(parameters.maximumIOSurfaceSize);
-
-#if PLATFORM(IOS)
-    listenToAudioSessionInterruption();
-#endif
 }
 
@@ -1187 +1178 @@
 }
 
-#if PLATFORM(IOS)
-class PageAudioSessionInterruptionObserver : public AudioSession::InterruptionObserver {
-public:
-    PageAudioSessionInterruptionObserver();
-    ~PageAudioSessionInterruptionObserver();
-
-private:
-    void beginAudioSessionInterruption() final;
-    void endAudioSessionInterruption(WebCore::AudioSession::MayResume) final;
-};
-
-PageAudioSessionInterruptionObserver::PageAudioSessionInterruptionObserver()
-{
-    AudioSession::sharedSession().addInterruptionObserver(*this);
-}
-
-PageAudioSessionInterruptionObserver::~PageAudioSessionInterruptionObserver()
-{
-    AudioSession::sharedSession().removeInterruptionObserver(*this);
-}
-
-void PageAudioSessionInterruptionObserver::beginAudioSessionInterruption()
-{
-    Page::forEachPage([](auto& page) {
-        page.beginAudioCaptureInterruption();
-    });
-}
-
-void PageAudioSessionInterruptionObserver::endAudioSessionInterruption(AudioSession::MayResume mayResume)
-{
-    if (mayResume == AudioSession::MayResume::No)
-        return;
-    Page::forEachPage([](auto& page) {
-        page.endAudioCaptureInterruption();
-    });
-}
-
-void listenToAudioSessionInterruption()
-{
-    static NeverDestroyed<PageAudioSessionInterruptionObserver> observer;
-}
-#endif
-
 } // namespace WebKit