Changeset 247208 in webkit

Timestamp:

Jul 8, 2019 9:25:55 AM (5 years ago)

Author:

youenn@apple.com

Message:

Register a MediaStreamTrack as media producer only if it is a capture track
​https://bugs.webkit.org/show_bug.cgi?id=199566

Reviewed by Eric Carlson.

MediaStreamTrack registration as a media producer is only useful for capture tracks.
Otherwise, the audio/video playing state is computed through HTMLMediaElement.
Do not register MediaStreamTrack as a media producer if it is not a capture track.

Set the muted state of the track before registering it as an audio
producer. Otherwise, it might create unnecessary small change of playing state.
Covered by existing tests.

• Modules/mediastream/MediaStreamTrack.cpp:

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

• Modules/mediastream/MediaStreamTrack.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/MediaStreamTrack.cpp (modified) (2 diffs)
• Modules/mediastream/MediaStreamTrack.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-08  Youenn Fablet  <youenn@apple.com>
+
+        Register a MediaStreamTrack as media producer only if it is a capture track
+        https://bugs.webkit.org/show_bug.cgi?id=199566
+
+        Reviewed by Eric Carlson.
+
+        MediaStreamTrack registration as a media producer is only useful for capture tracks.
+        Otherwise, the audio/video playing state is computed through HTMLMediaElement.
+        Do not register MediaStreamTrack as a media producer if it is not a capture track.
+
+        Set the muted state of the track before registering it as an audio
+        producer. Otherwise, it might create unnecessary small change of playing state.
+        Covered by existing tests.
+
+        * Modules/mediastream/MediaStreamTrack.cpp:
+        (WebCore::MediaStreamTrack::MediaStreamTrack):
+        (WebCore::MediaStreamTrack::~MediaStreamTrack):
+        * Modules/mediastream/MediaStreamTrack.h:
+
 2019-07-08  Antoine Quint  <graouts@apple.com>
 

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

@@ -67 +67 @@
     m_private->addObserver(*this);
 
+    if (!isCaptureTrack())
+        return;
+
     if (auto document = this->document()) {
+        if (document->page() && document->page()->mutedState())
+            setMuted(document->page()->mutedState());
         document->addAudioProducer(*this);
-        if (isCaptureTrack() && document->page() && document->page()->mutedState())
-            setMuted(document->page()->mutedState());
     }
 }
@@ -77 +80 @@
 {
     m_private->removeObserver(*this);
+
+    if (!isCaptureTrack())
+        return;
 
     if (auto document = this->document())

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

@@ -200 +200 @@
 
     bool m_ended { false };
-    bool m_isCaptureTrack { false };
+    const bool m_isCaptureTrack { false };
 };