Changeset 214980 in webkit

Timestamp:

Apr 5, 2017, 5:03:44 PM (8 years ago)

Author:

eric.carlson@apple.com

Message:

[MediaStream] Host application should be able to mute and unmute media streams
​https://bugs.webkit.org/show_bug.cgi?id=170519
<rdar://problem/31174326>

Unreviewed, address review comments missed in the initial checkin.

• Modules/mediastream/MediaStream.cpp:

(WebCore::MediaStream::MediaStream): Mute the private stream if the page doesn't allow
capture.
(WebCore::MediaStream::pageMutedStateDidChange): setMuted -> setCaptureTracksMuted.

• platform/mediastream/MediaStreamPrivate.cpp:

(WebCore::MediaStreamPrivate::addTrack): Don't track muted state, the capture source already does.
(WebCore::MediaStreamPrivate::startProducingData): Ditto.
(WebCore::MediaStreamPrivate::setCaptureTracksMuted): Renamed from setMuted.
(WebCore::MediaStreamPrivate::setMuted): Deleted.

• platform/mediastream/MediaStreamPrivate.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/MediaStream.cpp (modified) (2 diffs)
• platform/mediastream/MediaStreamPrivate.cpp (modified) (3 diffs)
• platform/mediastream/MediaStreamPrivate.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-04-05  Eric Carlson  <eric.carlson@apple.com>
+
+        [MediaStream] Host application should be able to mute and unmute media streams
+        https://bugs.webkit.org/show_bug.cgi?id=170519
+        <rdar://problem/31174326>
+
+        Unreviewed, address review comments missed in the initial checkin.
+
+        * Modules/mediastream/MediaStream.cpp:
+        (WebCore::MediaStream::MediaStream): Mute the private stream if the page doesn't allow
+        capture.
+        (WebCore::MediaStream::pageMutedStateDidChange): setMuted -> setCaptureTracksMuted.
+
+        * platform/mediastream/MediaStreamPrivate.cpp:
+        (WebCore::MediaStreamPrivate::addTrack): Don't track muted state, the capture source already does.
+        (WebCore::MediaStreamPrivate::startProducingData):  Ditto.
+        (WebCore::MediaStreamPrivate::setCaptureTracksMuted): Renamed from setMuted.
+        (WebCore::MediaStreamPrivate::setMuted): Deleted.
+        * platform/mediastream/MediaStreamPrivate.h:
+
 2017-04-05  Eric Carlson  <eric.carlson@apple.com>
 

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

@@ -91 +91 @@
 {
     ASSERT(m_private);
+
     setIsActive(m_private->active());
+    if (document()->page()->isMediaCaptureMuted())
+        m_private->setCaptureTracksMuted(true);
     m_private->addObserver(*this);
     MediaStreamRegistry::shared().registerStream(*this);
@@ -301 +304 @@
         return;
 
-    m_private->setMuted(document->page()->isMediaCaptureMuted());
+    m_private->setCaptureTracksMuted(document->page()->isMediaCaptureMuted());
 }
 

trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp

@@ -135 +135 @@
         return;
 
-    if (m_muted)
-        track->stopProducingData();
-
     track->addObserver(*this);
     m_trackSet.add(track->id(), track);
@@ -166 +163 @@
 void MediaStreamPrivate::startProducingData()
 {
-    if (m_muted)
-        return;
-
     for (auto& track : m_trackSet.values())
         track->startProducingData();
@@ -188 +182 @@
 }
 
-void MediaStreamPrivate::setMuted(bool muted)
-{
-    if (m_muted == muted)
-        return;
-
-    m_muted = muted;
+void MediaStreamPrivate::setCaptureTracksMuted(bool muted)
+{
     for (auto& track : m_trackSet.values()) {
         if (track->isCaptureTrack())

trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h

@@ -96 +96 @@
     bool hasVideo() const;
     bool hasAudio() const;
-
-    void setMuted(bool);
     bool muted() const;
 
     bool hasCaptureVideoSource() const;
     bool hasCaptureAudioSource() const;
+    void setCaptureTracksMuted(bool);
 
     FloatSize intrinsicSize() const;
@@ -137 +136 @@
     HashMap<String, RefPtr<MediaStreamTrackPrivate>> m_trackSet;
     bool m_isActive { false };
-    bool m_muted { false };
 };