Changeset 207764 in webkit

Timestamp:

Oct 24, 2016, 10:53:12 AM (8 years ago)

Author:

eric.carlson@apple.com

Message:

[MediaStream] Separate media capture and audio playback muting
​https://bugs.webkit.org/show_bug.cgi?id=163855
<rdar://problem/28827186>

Reviewed by Darin Adler.

Source/WebCore:

Test: fast/mediastream/MediaStream-page-muted.html

Change page.muted from a bool to a bitfield so audio and media capture muted are independent.
Fix a couple of bugs in the mock media capture device uncovered by new test case.

• Modules/mediastream/MediaStream.cpp:

(WebCore::MediaStream::pageMutedStateDidChange): page.isMuted -> page.mutedState.

• Modules/webaudio/AudioContext.cpp:

(WebCore::AudioContext::pageMutedStateDidChange): Ditto.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::updateVolume): Ditto.
(WebCore::HTMLMediaElement::effectiveMuted): Ditto.

• page/MediaProducer.h: Add MutedState enum.

• page/Page.cpp:

(WebCore::Page::Page):
(WebCore::Page::setMuted): Take MutedStateFlags instead of bool. m_muted -> m_mutedState.

• page/Page.h:

• platform/mock/MockRealtimeMediaSource.cpp:

(WebCore::MockRealtimeMediaSource::startProducingData): Call setMuted.
(WebCore::MockRealtimeMediaSource::stopProducingData): Ditto.

• platform/mock/MockRealtimeMediaSource.h:

• platform/mock/MockRealtimeVideoSource.cpp:

(WebCore::MockRealtimeVideoSource::stopProducingData): Call correct base class method.

• testing/Internals.cpp:

(WebCore::Internals::setPageMuted): Change parameter from a bool to a string.

• testing/Internals.h:

• testing/Internals.idl:

Source/WebKit2:

• Shared/WebPageCreationParameters.h: Change 'muted' from bool to MutedStateFlags.

• UIProcess/API/C/WKPage.cpp: Change parameter from bool to WKMediaMutedState.

(WKPageSetMuted):

• UIProcess/API/C/WKPagePrivate.h: Define WKMediaMutedState.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::setMuted): m_muted -> m_mutedState.
(WebKit::WebPageProxy::creationParameters): Ditto.

• UIProcess/WebPageProxy.h:

• WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::isMuted): page.isMuted -> page.mutedState.

• WebProcess/WebPage/WebPage.messages.in: Change SetMuted parameter.

LayoutTests:

• fast/mediastream/MediaStream-page-muted-expected.txt: Added.
• fast/mediastream/MediaStream-page-muted.html: Added.
• media/video-muted-after-setting-page-muted-state.html: Updated.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediastream/MediaStream-page-muted-expected.txt (added)
• LayoutTests/fast/mediastream/MediaStream-page-muted.html (added)
• LayoutTests/media/video-muted-after-setting-page-muted-state.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/MediaStream.cpp (modified) (1 diff)
• Source/WebCore/Modules/webaudio/AudioContext.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (2 diffs)
• Source/WebCore/page/MediaProducer.h (modified) (1 diff)
• Source/WebCore/page/Page.cpp (modified) (2 diffs)
• Source/WebCore/page/Page.h (modified) (2 diffs)
• Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp (modified) (3 diffs)
• Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp (modified) (1 diff)
• Source/WebCore/platform/mock/MockRealtimeMediaSource.h (modified) (1 diff)
• Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp (modified) (1 diff)
• Source/WebCore/testing/Internals.cpp (modified) (3 diffs)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/Shared/WebPageCreationParameters.h (modified) (2 diffs)
• Source/WebKit2/UIProcess/API/C/WKPage.cpp (modified) (1 diff)
• Source/WebKit2/UIProcess/API/C/WKPagePrivate.h (modified) (2 diffs)
• Source/WebKit2/UIProcess/WebPageProxy.cpp (modified) (4 diffs)
• Source/WebKit2/UIProcess/WebPageProxy.h (modified) (2 diffs)
• Source/WebKit2/WebProcess/Plugins/PluginView.cpp (modified) (1 diff)
• Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (modified) (1 diff)

trunk/LayoutTests/ChangeLog ¶

@@ +1 @@
+2016-10-24  Eric Carlson  <eric.carlson@apple.com>
+
+        [MediaStream] Separate media capture and audio playback muting
+        https://bugs.webkit.org/show_bug.cgi?id=163855
+        <rdar://problem/28827186>
+
+        Reviewed by Darin Adler.
+
+        * fast/mediastream/MediaStream-page-muted-expected.txt: Added.
+        * fast/mediastream/MediaStream-page-muted.html: Added.
+        * media/video-muted-after-setting-page-muted-state.html: Updated.
+
 2016-10-24  Youenn Fablet  <youenn@apple.com>
 

trunk/LayoutTests/media/video-muted-after-setting-page-muted-state.html ¶

@@ -6 +6 @@
     testExpected("video.muted", false);
     if (window.internals)
-        internals.setPageMuted(true);
+        internals.setPageMuted("audio");
     testExpected("video.muted", false);
 
@@ -12 +12 @@
     testExpected("video.muted", true);
     if (window.internals)
-        internals.setPageMuted(false);
+        internals.setPageMuted("");
     testExpected("video.muted", true);
     endTest();

trunk/Source/WebCore/ChangeLog ¶

@@ +1 @@
+2016-10-24  Eric Carlson  <eric.carlson@apple.com>
+
+        [MediaStream] Separate media capture and audio playback muting
+        https://bugs.webkit.org/show_bug.cgi?id=163855
+        <rdar://problem/28827186>
+
+        Reviewed by Darin Adler.
+
+        Test: fast/mediastream/MediaStream-page-muted.html
+
+        Change page.muted from a bool to a bitfield so audio and media capture muted are independent.
+        Fix a couple of bugs in the mock media capture device uncovered by new test case.
+        
+        * Modules/mediastream/MediaStream.cpp:
+        (WebCore::MediaStream::pageMutedStateDidChange): page.isMuted -> page.mutedState.
+
+        * Modules/webaudio/AudioContext.cpp:
+        (WebCore::AudioContext::pageMutedStateDidChange): Ditto.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::updateVolume): Ditto.
+        (WebCore::HTMLMediaElement::effectiveMuted): Ditto.
+
+        * page/MediaProducer.h: Add MutedState enum.
+
+        * page/Page.cpp:
+        (WebCore::Page::Page):
+        (WebCore::Page::setMuted): Take MutedStateFlags instead of bool. m_muted -> m_mutedState.
+        * page/Page.h:
+
+        * platform/mock/MockRealtimeMediaSource.cpp:
+        (WebCore::MockRealtimeMediaSource::startProducingData): Call setMuted.
+        (WebCore::MockRealtimeMediaSource::stopProducingData): Ditto.
+        * platform/mock/MockRealtimeMediaSource.h:
+
+        * platform/mock/MockRealtimeVideoSource.cpp:
+        (WebCore::MockRealtimeVideoSource::stopProducingData): Call correct base class method.
+
+        * testing/Internals.cpp:
+        (WebCore::Internals::setPageMuted): Change parameter from a bool to a string.
+        * testing/Internals.h:
+
+        * testing/Internals.idl:
+
 2016-10-24  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp ¶

@@ -257 +257 @@
         return;
 
-    bool pageMuted = document->page()->isMuted();
+    bool pageMuted = document->page()->isMediaCaptureMuted();
     if (m_externallyMuted == pageMuted)
         return;

trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp ¶

@@ -974 +974 @@
 {
     if (m_destinationNode && document()->page())
-        m_destinationNode->setMuted(document()->page()->isMuted());
+        m_destinationNode->setMuted(document()->page()->isAudioMuted());
 }
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp ¶

@@ -4847 +4847 @@
         if (m_mediaController) {
             volumeMultiplier *= m_mediaController->volume();
-            shouldMute = m_mediaController->muted() || (page && page->isMuted());
+            shouldMute = m_mediaController->muted() || (page && page->isAudioMuted());
         }
 
@@ -7008 +7008 @@
 bool HTMLMediaElement::effectiveMuted() const
 {
-    return muted() || (document().page() && document().page()->isMuted());
+    return muted() || (document().page() && document().page()->isAudioMuted());
 }
 

trunk/Source/WebCore/page/MediaProducer.h ¶

@@ -49 +49 @@
 
     virtual MediaStateFlags mediaState() const = 0;
+
+    enum MutedState {
+        NoneMuted = 0,
+        AudioIsMuted = 1 << 0,
+        CaptureDevicesAreMuted = 1 << 1,
+    };
+    typedef unsigned MutedStateFlags;
+
     virtual void pageMutedStateDidChange() = 0;
 

trunk/Source/WebCore/page/Page.cpp ¶

@@ -194 +194 @@
     , m_areMemoryCacheClientCallsEnabled(true)
     , m_mediaVolume(1)
-    , m_muted(false)
     , m_pageScaleFactor(1)
     , m_zoomedOutPageScaleFactor(0)
@@ -1382 +1381 @@
 }
 
-void Page::setMuted(bool muted)
-{
-    if (m_muted == muted)
-        return;
-
-    m_muted = muted;
+void Page::setMuted(MediaProducer::MutedStateFlags muted)
+{
+    if (m_mutedState == muted)
+        return;
+
+    m_mutedState = muted;
 
     for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {

trunk/Source/WebCore/page/Page.h ¶

@@ -481 +481 @@
     MediaProducer::MediaStateFlags mediaState() const { return m_mediaState; }
     void updateIsPlayingMedia(uint64_t);
-    bool isMuted() const { return m_muted; }
-    WEBCORE_EXPORT void setMuted(bool);
+    MediaProducer::MutedStateFlags mutedState() const { return m_mutedState; }
+    bool isAudioMuted() const { return m_mutedState & MediaProducer::AudioIsMuted; }
+    bool isMediaCaptureMuted() const { return m_mutedState & MediaProducer::CaptureDevicesAreMuted; };
+    WEBCORE_EXPORT void setMuted(MediaProducer::MutedStateFlags);
 
 #if ENABLE(MEDIA_SESSION)
@@ -610 +612 @@
     bool m_areMemoryCacheClientCallsEnabled;
     float m_mediaVolume;
-    bool m_muted;
+    MediaProducer::MutedStateFlags m_mutedState { MediaProducer::NoneMuted };
 
     float m_pageScaleFactor;

trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp ¶

@@ -85 +85 @@
 void RealtimeMediaSource::setMuted(bool muted)
 {
-    if (m_muted == muted)
+    if (m_stopped || m_muted == muted)
         return;
 
@@ -151 +151 @@
 }
 
-#if 1
 double RealtimeMediaSource::fitnessDistance(const MediaConstraint& constraint)
 {
@@ -276 +275 @@
     return 0;
 }
-#endif
 
 template <typename ValueType>

trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp ¶

@@ -125 +125 @@
 }
 
+void MockRealtimeMediaSource::startProducingData()
+{
+    m_isProducingData = true;
+    setMuted(false);
+}
+
+void MockRealtimeMediaSource::stopProducingData()
+{
+    m_isProducingData = false;
+    setMuted(true);
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.h ¶

@@ -70 +70 @@
     virtual void initializeSupportedConstraints(RealtimeMediaSourceSupportedConstraints&) = 0;
 
-    void startProducingData() override { m_isProducingData = true; }
-    void stopProducingData() override { m_isProducingData = false; }
+    void startProducingData() override;
+    void stopProducingData() override;
 
     RefPtr<RealtimeMediaSourceCapabilities> capabilities() override;

trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp ¶

@@ -86 +86 @@
 void MockRealtimeVideoSource::stopProducingData()
 {
-    MockRealtimeMediaSource::startProducingData();
+    MockRealtimeMediaSource::stopProducingData();
     m_timer.stop();
     m_elapsedTime += monotonicallyIncreasingTime() - m_startTime;

trunk/Source/WebCore/testing/Internals.cpp ¶

@@ -87 +87 @@
 #include "MallocStatistics.h"
 #include "MediaPlayer.h"
+#include "MediaProducer.h"
 #include "MemoryCache.h"
 #include "MemoryInfo.h"
@@ -2946 +2947 @@
 }
 
-void Internals::setPageMuted(bool muted)
+void Internals::setPageMuted(const String& states)
 {
     Document* document = contextDocument();
@@ -2952 +2953 @@
         return;
 
+    WebCore::MediaProducer::MutedStateFlags state = MediaProducer::NoneMuted;
+    Vector<String> stateString;
+    states.split(',', false, stateString);
+    for (auto& muteString : stateString) {
+        if (equalLettersIgnoringASCIICase(muteString, "audio"))
+            state |= MediaProducer::AudioIsMuted;
+        if (equalLettersIgnoringASCIICase(muteString, "capturedevices"))
+            state |= MediaProducer::CaptureDevicesAreMuted;
+    }
+
     if (Page* page = document->page())
-        page->setMuted(muted);
+        page->setMuted(state);
 }
 

trunk/Source/WebCore/testing/Internals.h ¶

@@ -441 +441 @@
     ExceptionOr<String> pageOverlayLayerTreeAsText() const;
 
-    void setPageMuted(bool);
+    void setPageMuted(const String&);
     bool isPagePlayingAudio();
 

trunk/Source/WebCore/testing/Internals.idl ¶

@@ -418 +418 @@
     [MayThrowException] DOMString pageOverlayLayerTreeAsText();
 
-    void setPageMuted(boolean muted);
+    void setPageMuted(DOMString mutedState);
     boolean isPagePlayingAudio();
 

trunk/Source/WebKit2/ChangeLog ¶

@@ +1 @@
+2016-10-24  Eric Carlson  <eric.carlson@apple.com>
+
+        [MediaStream] Separate media capture and audio playback muting
+        https://bugs.webkit.org/show_bug.cgi?id=163855
+        <rdar://problem/28827186>
+
+        Reviewed by Darin Adler.
+
+        * Shared/WebPageCreationParameters.h: Change 'muted' from bool to MutedStateFlags.
+
+        * UIProcess/API/C/WKPage.cpp: Change parameter from bool to WKMediaMutedState.
+        (WKPageSetMuted):
+        * UIProcess/API/C/WKPagePrivate.h: Define WKMediaMutedState.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::WebPageProxy):
+        (WebKit::WebPageProxy::setMuted): m_muted -> m_mutedState.
+        (WebKit::WebPageProxy::creationParameters): Ditto.
+        * UIProcess/WebPageProxy.h:
+
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::isMuted): page.isMuted -> page.mutedState.
+
+        * WebProcess/WebPage/WebPage.messages.in: Change SetMuted parameter.
+
 2016-10-24  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit2/Shared/WebPageCreationParameters.h ¶

@@ -36 +36 @@
 #include <WebCore/FloatSize.h>
 #include <WebCore/IntSize.h>
+#include <WebCore/MediaProducer.h>
 #include <WebCore/Pagination.h>
 #include <WebCore/ScrollTypes.h>
@@ -100 +101 @@
     
     float mediaVolume;
-    bool muted;
+    WebCore::MediaProducer::MutedStateFlags muted;
     bool mayStartMediaWhenInWindow;
 

trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp ¶

@@ -2602 +2602 @@
 }
 
-void WKPageSetMuted(WKPageRef page, bool muted)
+void WKPageSetMuted(WKPageRef page, WKMediaMutedState muted)
 {
     toImpl(page)->setMuted(muted);

trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h ¶

@@ -121 +121 @@
 
 WK_EXPORT bool WKPageIsPlayingAudio(WKPageRef page);
-WK_EXPORT void WKPageSetMuted(WKPageRef page, bool muted);
+
+enum {
+    kWKMediaNoneMuted = 0,
+    kWKMediaAudioMuted = 1 << 0,
+    kWKMediaCaptureDevicesMuted = 1 << 1,
+};
+typedef uint32_t WKMediaMutedState;
+WK_EXPORT void WKPageSetMuted(WKPageRef page, WKMediaMutedState muted);
 
 enum {
@@ -130 +137 @@
 };
 typedef uint32_t WKMediaState;
+
 
 WK_EXPORT WKMediaState WKPageGetMediaState(WKPageRef page);

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp ¶

@@ -445 +445 @@
     , m_autoSizingShouldExpandToViewHeight(false)
     , m_mediaVolume(1)
-    , m_muted(false)
     , m_mayStartMediaWhenInWindow(true)
     , m_waitingForDidUpdateViewState(false)
@@ -1589 +1588 @@
     // We should suppress if the page is not active, is visually idle, and supression is enabled.
     bool isLoading = m_pageLoadState.isLoading();
-    bool isPlayingAudio = m_mediaState & MediaProducer::IsPlayingAudio && !m_muted;
+    bool isPlayingAudio = m_mediaState & MediaProducer::IsPlayingAudio && !(m_mutedState & MediaProducer::AudioIsMuted);
     bool pageShouldBeSuppressed = !isLoading && !isPlayingAudio && processSuppressionEnabled && (m_viewState & ViewState::IsVisuallyIdle);
     if (m_pageSuppressed != pageShouldBeSuppressed) {
@@ -4153 +4152 @@
 }
 
-void WebPageProxy::setMuted(bool muted)
-{
-    if (m_muted == muted)
-        return;
-
-    m_muted = muted;
-
-    if (!isValid())
-        return;
-
-    m_process->send(Messages::WebPage::SetMuted(muted), m_pageID);
+void WebPageProxy::setMuted(WebCore::MediaProducer::MutedStateFlags state)
+{
+    if (m_mutedState == state)
+        return;
+
+    m_mutedState = state;
+
+    if (!isValid())
+        return;
+
+    m_process->send(Messages::WebPage::SetMuted(state), m_pageID);
 
     updateThrottleState();
@@ -5484 +5483 @@
     parameters.topContentInset = m_topContentInset;
     parameters.mediaVolume = m_mediaVolume;
-    parameters.muted = m_muted;
+    parameters.muted = m_mutedState;
     parameters.mayStartMediaWhenInWindow = m_mayStartMediaWhenInWindow;
     parameters.minimumLayoutSize = m_minimumLayoutSize;

trunk/Source/WebKit2/UIProcess/WebPageProxy.h ¶

@@ -938 +938 @@
     
     void setMediaVolume(float);
-    void setMuted(bool);
+    void setMuted(WebCore::MediaProducer::MutedStateFlags);
     void setMayStartMediaWhenInWindow(bool);
     bool mayStartMediaWhenInWindow() const { return m_mayStartMediaWhenInWindow; }
@@ -1853 +1853 @@
 
     float m_mediaVolume;
-    bool m_muted;
+    WebCore::MediaProducer::MutedStateFlags m_mutedState { WebCore::MediaProducer::NoneMuted };
     bool m_mayStartMediaWhenInWindow;
 

trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp ¶

@@ -1532 +1532 @@
         return false;
 
-    return frame()->page()->isMuted();
+    return frame()->page()->isAudioMuted();
 }
 #endif

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in ¶

@@ -315 +315 @@
     # Media
     SetMediaVolume(float volume)
-    SetMuted(bool muted)
+    SetMuted(WebCore::MediaProducer::MutedStateFlags muted)
     SetMayStartMediaWhenInWindow(bool mayStartMedia)