[webkit-changes] [214980] trunk/Source/WebCore

Wed, 05 Apr 2017 17:04:04 -0700

Title: [214980] trunk/Source/WebCore
Revision
214980
Author
[email protected]
Date
2017-04-05 17:03:44 -0700 (Wed, 05 Apr 2017)

Log 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:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (214979 => 214980)


--- trunk/Source/WebCore/ChangeLog	2017-04-05 23:59:11 UTC (rev 214979)
+++ trunk/Source/WebCore/ChangeLog	2017-04-06 00:03:44 UTC (rev 214980)
@@ -4,6 +4,26 @@
         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  <[email protected]>
+
+        [MediaStream] Host application should be able to mute and unmute media streams
+        https://bugs.webkit.org/show_bug.cgi?id=170519
+        <rdar://problem/31174326>
+
         Reviewed by Youenn Fablet.
 
         No new tests, fast/mediastream/MediaStream-page-muted.html was updated.

Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (214979 => 214980)


--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp	2017-04-05 23:59:11 UTC (rev 214979)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp	2017-04-06 00:03:44 UTC (rev 214980)
@@ -90,7 +90,10 @@
     , m_activityEventTimer(*this, &MediaStream::activityEventTimerFired)
 {
     ASSERT(m_private);
+
     setIsActive(m_private->active());
+    if (document()->page()->isMediaCaptureMuted())
+        m_private->setCaptureTracksMuted(true);
     m_private->addObserver(*this);
     MediaStreamRegistry::shared().registerStream(*this);
 
@@ -300,7 +303,7 @@
     if (!document)
         return;
 
-    m_private->setMuted(document->page()->isMediaCaptureMuted());
+    m_private->setCaptureTracksMuted(document->page()->isMediaCaptureMuted());
 }
 
 MediaProducer::MediaStateFlags MediaStream::mediaState() const

Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp (214979 => 214980)


--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp	2017-04-05 23:59:11 UTC (rev 214979)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp	2017-04-06 00:03:44 UTC (rev 214980)
@@ -134,9 +134,6 @@
     if (m_trackSet.contains(track->id()))
         return;
 
-    if (m_muted)
-        track->stopProducingData();
-
     track->addObserver(*this);
     m_trackSet.add(track->id(), track);
 
@@ -165,9 +162,6 @@
 
 void MediaStreamPrivate::startProducingData()
 {
-    if (m_muted)
-        return;
-
     for (auto& track : m_trackSet.values())
         track->startProducingData();
 }
@@ -187,12 +181,8 @@
     return false;
 }
 
-void MediaStreamPrivate::setMuted(bool muted)
+void MediaStreamPrivate::setCaptureTracksMuted(bool muted)
 {
-    if (m_muted == muted)
-        return;
-
-    m_muted = muted;
     for (auto& track : m_trackSet.values()) {
         if (track->isCaptureTrack())
             track->setMuted(muted);

Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h (214979 => 214980)


--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h	2017-04-05 23:59:11 UTC (rev 214979)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h	2017-04-06 00:03:44 UTC (rev 214980)
@@ -95,12 +95,11 @@
 
     bool hasVideo() const;
     bool hasAudio() const;
-
-    void setMuted(bool);
     bool muted() const;
 
     bool hasCaptureVideoSource() const;
     bool hasCaptureAudioSource() const;
+    void setCaptureTracksMuted(bool);
 
     FloatSize intrinsicSize() const;
 
@@ -136,7 +135,6 @@
     MediaStreamTrackPrivate* m_activeVideoTrack { nullptr };
     HashMap<String, RefPtr<MediaStreamTrackPrivate>> m_trackSet;
     bool m_isActive { false };
-    bool m_muted { false };
 };
 
 typedef Vector<RefPtr<MediaStreamPrivate>> MediaStreamPrivateVector;

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to